Refactor: minor fix.

Tuber-art · Mar 16, 2019 · cef2cdd · cef2cdd
1 parent c089d6a
commit cef2cdd
Showing 1 changed file with 36 additions and 14 deletions.
diff --git a/library/src/main/java/me/weishu/reflection/Reflection.java b/library/src/main/java/me/weishu/reflection/Reflection.java
@@ -3,11 +3,14 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.os.Build;
 import android.util.Log;
 
 import java.lang.reflect.Method;
 
+import static android.os.Build.VERSION.PREVIEW_SDK_INT;
+import static android.os.Build.VERSION.SDK_INT;
+import static android.os.Build.VERSION_CODES.P;
+
 /**
  * @author weishu
  * @date 2018/6/7.
@@ -44,11 +47,16 @@ public class Reflection {
     private static int unsealed = UNKNOWN;
 
     public static int unseal(Context context) {
-        if (Build.VERSION.SDK_INT < 28) {
+        if (SDK_INT < 28) {
             // Below Android P, ignore
             return 0;
         }
 
+        // try exempt API first.
+        if (exemptAll()) {
+            return 0;
+        }
+
         if (context == null) {
             return -10;
         }
@@ -57,25 +65,37 @@ public static int unseal(Context context) {
         int targetSdkVersion = applicationInfo.targetSdkVersion;
 
         synchronized (Reflection.class) {
-            if (unsealed == UNKNOWN) {
-                unsealed = unsealNative(targetSdkVersion);
-                if (unsealed >= 0) {
-                    try {
-                        @SuppressLint("PrivateApi") Method setHiddenApiEnforcementPolicy = ApplicationInfo.class
-                                .getDeclaredMethod("setHiddenApiEnforcementPolicy", int.class);
-                        setHiddenApiEnforcementPolicy.invoke(applicationInfo, 0);
-                    } catch (Throwable e) {
-                        e.printStackTrace();
-                        unsealed = ERROR_SET_APPLICATION_FAILED;
-                    }
-                }
+            if (unsealed != UNKNOWN) {
+                return unsealed;
+            }
+
+            unsealed = unsealNative(targetSdkVersion);
+            if (unsealed < 0) {
+                return unsealed;
+            }
+
+            if ((SDK_INT == P && PREVIEW_SDK_INT > 0) || SDK_INT > P) {
+                return unsealed;
+            }
+
+            // Android P, we need to sync the flags with ApplicationInfo
+            // We needn't to this on Android Q.
+            try {
+                @SuppressLint("PrivateApi") Method setHiddenApiEnforcementPolicy = ApplicationInfo.class
+                        .getDeclaredMethod("setHiddenApiEnforcementPolicy", int.class);
+                setHiddenApiEnforcementPolicy.invoke(applicationInfo, 0);
+            } catch (Throwable e) {
+                e.printStackTrace();
+                unsealed = ERROR_SET_APPLICATION_FAILED;
             }
         }
+
         return unsealed;
     }
 
     /**
      * make the method exempted from hidden API check.
+     *
      * @param method the method signature prefix.
      * @return true if success.
      */
@@ -85,6 +105,7 @@ public static boolean exempt(String method) {
 
     /**
      * make specific methods exempted from hidden API check.
+     *
      * @param methods the method signature prefix, such as "Ldalvik/system", "Landroid" or even "L"
      * @return true if success
      */
@@ -103,6 +124,7 @@ public static boolean exempt(String... methods) {
 
     /**
      * Make all hidden API exempted.
+     *
      * @return true if success.
      */
     public static boolean exemptAll() {