[tinker] Try performSecondaryDexOpt for 20 times max first, if failure then try registerDexModule next.

Author: tangyinsheng

tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/TinkerDexOptimizer.java

@@ -240,10 +240,10 @@ private static void triggerPMDexOptOnDemand(Context context, String dexPath, Str
             ShareTinkerLog.i(TAG, "[+] Oat file %s should be valid, skip triggering dexopt.", oatPath);
             return;
         }
-        for (int i = 0; i < 5; ++i) {
+        for (int i = 0; i < 20; ++i) {
             if (ShareTinkerInternals.isNewerOrEqualThanVersion(31, true)
-            && !"xiaomi".equalsIgnoreCase(Build.MANUFACTURER) && !"redmi".equalsIgnoreCase(Build.MANUFACTURER)
-            && !"oppo".equalsIgnoreCase(Build.MANUFACTURER) && !"vivo".equalsIgnoreCase(Build.MANUFACTURER)) {
+                    && !"xiaomi".equalsIgnoreCase(Build.MANUFACTURER) && !"redmi".equalsIgnoreCase(Build.MANUFACTURER)
+                    && !"oppo".equalsIgnoreCase(Build.MANUFACTURER) && !"vivo".equalsIgnoreCase(Build.MANUFACTURER)) {
                 try {
                     registerDexModule(context, dexPath);
                     if (SharePatchFileUtil.isLegalFile(oatFile)) {
@@ -280,20 +280,26 @@ private static void triggerPMDexOptOnDemand(Context context, String dexPath, Str
                 ShareTinkerLog.printErrStackTrace(TAG, thr, "[-] Error.");
             }
             SystemClock.sleep(1000);
+        }
+        if (!SharePatchFileUtil.isLegalFile(oatFile)) {
             if ("huawei".equalsIgnoreCase(Build.MANUFACTURER) || "honor".equalsIgnoreCase(Build.MANUFACTURER)) {
-                try {
-                    registerDexModule(context, dexPath);
-                    if (SharePatchFileUtil.isLegalFile(oatFile)) {
-                        break;
+                for (int i = 0; i < 5; ++i) {
+                    try {
+                        registerDexModule(context, dexPath);
+                        if (SharePatchFileUtil.isLegalFile(oatFile)) {
+                            break;
+                        }
+                    } catch (Throwable thr) {
+                        ShareTinkerLog.printErrStackTrace(TAG, thr, "[-] Error.");
                     }
-                } catch (Throwable thr) {
-                    ShareTinkerLog.printErrStackTrace(TAG, thr, "[-] Error.");
+                    SystemClock.sleep(3000);
+                }
+                if (!SharePatchFileUtil.isLegalFile(oatFile)) {
+                    throw new IllegalStateException("No odex file was generated after calling registerDexModule");
                 }
+            } else {
+                throw new IllegalStateException("No odex file was generated after calling performDexOptSecondary");
             }
-            SystemClock.sleep(3000);
-        }
-        if (!SharePatchFileUtil.isLegalFile(oatFile)) {
-            throw new IllegalStateException("No odex file was generated after calling performDexOptSecondary");
         }
     }