[enhancement] protect get main process from appinfo

chsj1 · Nov 9, 2017 · d0fe056 · d0fe056
1 parent acd0742
commit d0fe056
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...ndroid-loader/src/main/java/com/tencent/tinker/loader/shareutil/ShareTinkerInternals.java b/...ndroid-loader/src/main/java/com/tencent/tinker/loader/shareutil/ShareTinkerInternals.java
@@ -326,8 +326,14 @@ public static boolean isTinkerEnabledAll(int flag) {
     }
 
     public static boolean isInMainProcess(Context context) {
+        String mainProcessName = null;
         ApplicationInfo applicationInfo = context.getApplicationInfo();
-        String mainProcessName = applicationInfo.processName;
+        if (applicationInfo != null) {
+            mainProcessName = applicationInfo.processName;
+        }
+        if (isNullOrNil(mainProcessName)) {
+            mainProcessName = context.getPackageName();
+        }
         String processName = getProcessName(context);
         if (processName == null || processName.length() == 0) {
             processName = "";

diff --git a/tinker-sample-android/gradle.properties b/tinker-sample-android/gradle.properties
@@ -17,5 +17,5 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-TINKER_VERSION=1.9.0
+TINKER_VERSION=1.9.1
 GRADLE_3=true