[tinker] Avoid using registerDexModule to trigger dex2oat on system b…

…elow Android S.
864282291 · Dec 7, 2021 · 10595b9 · 10595b9
1 parent 59e838e
commit 10595b9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/...oid/tinker-android-loader/src/main/java/com/tencent/tinker/loader/TinkerDexOptimizer.java b/...oid/tinker-android-loader/src/main/java/com/tencent/tinker/loader/TinkerDexOptimizer.java
@@ -217,14 +217,19 @@ private static void triggerPMDexOptOnDemand(Context context, String dexPath, Str
                 } catch (Throwable thr) {
                     ShareTinkerLog.printErrStackTrace(TAG, thr, "[-] Fail to call reconcileSecondaryDexFiles.");
                 }
-                try {
-                    registerDexModule(context, dexPath);
-                } catch (Throwable thr) {
-                    ShareTinkerLog.printErrStackTrace(TAG, thr, "[-] Fail to call registerDexModule.");
-                }
-                if (oatFile.exists()) {
-                    ShareTinkerLog.i(TAG, "[+] Dexopt was triggered by registerDexModule successfully.");
-                    return;
+                if (ShareTinkerInternals.isNewerOrEqualThanVersion(31 /* Android S */, true)) {
+                    // registerDexModule will force classloader context change into VariableClassLoaderContext,
+                    // which makes ART skip caching class verification info on Android Q and R. The running
+                    // performance of patched app will have no improvement.
+                    try {
+                        registerDexModule(context, dexPath);
+                    } catch (Throwable thr) {
+                        ShareTinkerLog.printErrStackTrace(TAG, thr, "[-] Fail to call registerDexModule.");
+                    }
+                    if (oatFile.exists()) {
+                        ShareTinkerLog.i(TAG, "[+] Dexopt was triggered by registerDexModule successfully.");
+                        return;
+                    }
                 }
                 try {
                     performDexOptSecondary(context);
@@ -285,7 +290,8 @@ private static void performDexOptSecondary(Context context) throws IllegalStateE
                 "compile",
                 "-f",
                 "--secondary-dex",
-                "-m", "speed-profile",
+                "-m", ShareTinkerInternals.isNewerOrEqualThanVersion(31 /* Android S */, true)
+                        ? "verify" : "speed-profile",
                 context.getPackageName()
         };
         executePMSShellCommand(context, args);

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
@@ -620,6 +620,15 @@ private static boolean isVmJitInternal() {
         return false;
     }
 
+    public static boolean isNewerOrEqualThanVersion(int apiLevel, boolean includePreviewVer) {
+        if (includePreviewVer && Build.VERSION.SDK_INT >= 23) {
+            return Build.VERSION.SDK_INT >= apiLevel
+                    || ((Build.VERSION.SDK_INT == apiLevel - 1) && Build.VERSION.PREVIEW_SDK_INT > 0);
+        } else {
+            return Build.VERSION.SDK_INT >= apiLevel;
+        }
+    }
+
     public static String getExceptionCauseString(final Throwable ex) {
         if (ex == null) return "";