Merge branch 'dev' into test/v_1_9_14_24

tangyinsheng · tangyinsheng · commit 41d0910c832a · 2022-07-12T19:22:28.000+08:00
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 ## Tinker
 [![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/tinker/blob/master/LICENSE)
-[![Release Version](https://img.shields.io/badge/release-1.9.14.19-red.svg)](https://github.com/Tencent/tinker/releases)
+[![Release Version](https://img.shields.io/badge/release-1.9.14.22-red.svg)](https://github.com/Tencent/tinker/releases)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/tinker/pulls)
-[![WeChat Approved](https://img.shields.io/badge/Wechat_Approved-1.9.14.19-red.svg)](https://github.com/Tencent/tinker/wiki)
+[![WeChat Approved](https://img.shields.io/badge/Wechat_Approved-1.9.14.22-red.svg)](https://github.com/Tencent/tinker/wiki)
 
 [中文说明](https://github.com/Tencent/tinker/wiki)
 
diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,7 @@ ext {
     javaVersion = JavaVersion.VERSION_1_8
 
     GROUP = 'com.tencent.tinker'
-    VERSION_NAME = '1.9.14.22'
+    VERSION_NAME = '1.9.14.23'
 
     POM_DESCRIPTION = 'Tinker is a hot-fix solution library for Android, it supports dex, library and resources update without reinstalling apk.'
     POM_URL = 'https://github.com/Tencent/tinker'
diff --git a/third-party/aosp-dexutils/src/main/java/com/tencent/tinker/android/dx/instruction/InstructionComparator.java b/third-party/aosp-dexutils/src/main/java/com/tencent/tinker/android/dx/instruction/InstructionComparator.java
@@ -261,8 +261,8 @@ private int getPromotedOpCodeOnDemand(InstructionHolder insn) {
     }
 
     public boolean isSameInstruction(int insnAddress1, int insnAddress2) {
-        InstructionHolder insnHolder1 = this.insnHolders1[insnAddress1];
-        InstructionHolder insnHolder2 = this.insnHolders2[insnAddress2];
+        InstructionHolder insnHolder1 = insnAddress1 < this.insnHolders1.length ? this.insnHolders1[insnAddress1] : null;
+        InstructionHolder insnHolder2 = insnAddress2 < this.insnHolders2.length ? this.insnHolders2[insnAddress2] : null;
         return isSameInstruction(insnHolder1, insnHolder2);
     }
 
diff --git a/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/library/TinkerLoadLibrary.java b/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/library/TinkerLoadLibrary.java
@@ -219,6 +219,11 @@ public static boolean installNavitveLibraryABI(Context context, String currentAB
      * @return
      */
     public static boolean installNativeLibraryABIWithoutTinkerInstalled(ApplicationLike appLike, String currentABI) {
+        if (!TinkerApplicationHelper.isTinkerLoadSuccess(appLike)) {
+            ShareTinkerLog.e(TAG, "no loaded patch, skip installation.");
+            return false;
+        }
+
         final String currentVersion = TinkerApplicationHelper.getCurrentVersion(appLike);
         if (ShareTinkerInternals.isNullOrNil(currentVersion)) {
             ShareTinkerLog.e(TAG, "failed to get current patch version.");
diff --git a/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/listener/DefaultPatchListener.java b/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/listener/DefaultPatchListener.java
@@ -134,20 +134,13 @@ protected int patchCheck(String path, String patchMd5) {
                 && loadResult != null && loadResult.useInterpretMode;
 
         if (!repairOptNeeded) {
-            if (manager.isTinkerLoaded() && loadResult != null) {
-                String currentVersion = loadResult.currentVersion;
-                if (patchMd5.equals(currentVersion)) {
-                    return ShareConstants.ERROR_PATCH_ALREADY_APPLY;
-                }
-            }
-
             // Hit if we have already applied patch but main process did not restart.
             final String patchDirectory = manager.getPatchDirectory().getAbsolutePath();
             File patchInfoLockFile = SharePatchFileUtil.getPatchInfoLockFile(patchDirectory);
             File patchInfoFile = SharePatchFileUtil.getPatchInfoFile(patchDirectory);
             try {
                 final SharePatchInfo currInfo = SharePatchInfo.readAndCheckPropertyWithLock(patchInfoFile, patchInfoLockFile);
-                if (currInfo != null && !ShareTinkerInternals.isNullOrNil(currInfo.newVersion) && !currInfo.isRemoveNewVersion) {
+                if (currInfo != null && !ShareTinkerInternals.isNullOrNil(currInfo.newVersion) && !currInfo.newVersion.equals(currInfo.versionToRemove)) {
                     if (patchMd5.equals(currInfo.newVersion)) {
                         return ShareConstants.ERROR_PATCH_ALREADY_APPLY;
                     }
diff --git a/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/patch/DexDiffPatchInternal.java b/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/patch/DexDiffPatchInternal.java
@@ -198,7 +198,8 @@ private static boolean patchDexExtractViaDexDiff(Context context, String patchVe
     }
 
     private static boolean checkClassNDexFiles(final String dexFilePath) {
-       if (patchList.isEmpty() || !isVmArt) {
+        classNDexInfo.clear();
+        if (patchList.isEmpty() || !isVmArt) {
             return false;
         }
         ShareDexDiffPatchInfo testInfo = null;
diff --git a/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/patch/UpgradePatch.java b/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/patch/UpgradePatch.java
@@ -21,13 +21,13 @@
 
 import com.tencent.tinker.lib.service.PatchResult;
 import com.tencent.tinker.lib.tinker.Tinker;
-import com.tencent.tinker.loader.shareutil.ShareTinkerLog;
 import com.tencent.tinker.lib.util.UpgradePatchRetry;
 import com.tencent.tinker.loader.shareutil.ShareConstants;
 import com.tencent.tinker.loader.shareutil.SharePatchFileUtil;
 import com.tencent.tinker.loader.shareutil.SharePatchInfo;
 import com.tencent.tinker.loader.shareutil.ShareSecurityCheck;
 import com.tencent.tinker.loader.shareutil.ShareTinkerInternals;
+import com.tencent.tinker.loader.shareutil.ShareTinkerLog;
 
 import java.io.File;
 import java.io.IOException;
@@ -112,7 +112,7 @@ public boolean tryPatch(Context context, String tempPatchPath, PatchResult patch
 
             final boolean usingInterpret = oldInfo.oatDir.equals(ShareConstants.INTERPRET_DEX_OPTIMIZE_PATH);
 
-            if (!usingInterpret && !ShareTinkerInternals.isNullOrNil(oldInfo.newVersion) && oldInfo.newVersion.equals(patchMd5) && !oldInfo.isRemoveNewVersion) {
+            if (!usingInterpret && !ShareTinkerInternals.isNullOrNil(oldInfo.newVersion) && oldInfo.newVersion.equals(patchMd5) && !oldInfo.newVersion.equals(oldInfo.versionToRemove)) {
                 ShareTinkerLog.e(TAG, "patch already applied, md5: %s", patchMd5);
 
                 // Reset patch apply retry count to let us be able to reapply without triggering
@@ -123,9 +123,22 @@ public boolean tryPatch(Context context, String tempPatchPath, PatchResult patch
             }
             // if it is interpret now, use changing flag to wait main process
             final String finalOatDir = usingInterpret ? ShareConstants.CHANING_DEX_OPTIMIZE_PATH : oldInfo.oatDir;
-            newInfo = new SharePatchInfo(oldInfo.oldVersion, patchMd5, isProtectedApp, false, Build.FINGERPRINT, finalOatDir, false);
+            if (!patchMd5.equals(oldInfo.newVersion) && !oldInfo.newVersion.equals(oldInfo.oldVersion)) {
+                // Currently applied patch is not the same as last applied one and the last applied one is not loaded,
+                // so we can delete the last applied patch to avoid patch artifacts accumulating.
+                final String patchName = SharePatchFileUtil.getPatchVersionDirectory(oldInfo.newVersion);
+                SharePatchFileUtil.deleteDir(new File(patchDirectory, patchName));
+            }
+            final String versionToRemove;
+            if (patchMd5.equals(oldInfo.versionToRemove)) {
+                // If we re-applied a patch that marks to be removed, clear the marker.
+                versionToRemove = "";
+            } else {
+                versionToRemove = oldInfo.versionToRemove;
+            }
+            newInfo = new SharePatchInfo(oldInfo.oldVersion, patchMd5, isProtectedApp, versionToRemove, Build.FINGERPRINT, finalOatDir, false);
         } else {
-            newInfo = new SharePatchInfo("", patchMd5, isProtectedApp, false, Build.FINGERPRINT, ShareConstants.DEFAULT_DEX_OPTIMIZE_PATH, false);
+            newInfo = new SharePatchInfo("", patchMd5, isProtectedApp, "", Build.FINGERPRINT, ShareConstants.DEFAULT_DEX_OPTIMIZE_PATH, false);
         }
 
         // it is a new patch, we first delete if there is any files
diff --git a/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/reporter/DefaultLoadReporter.java b/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/reporter/DefaultLoadReporter.java
@@ -22,13 +22,11 @@
 import com.tencent.tinker.lib.service.TinkerPatchService;
 import com.tencent.tinker.lib.tinker.Tinker;
 import com.tencent.tinker.lib.tinker.TinkerInstaller;
-import com.tencent.tinker.lib.tinker.TinkerLoadResult;
-import com.tencent.tinker.loader.shareutil.ShareTinkerLog;
 import com.tencent.tinker.lib.util.UpgradePatchRetry;
 import com.tencent.tinker.loader.shareutil.ShareConstants;
 import com.tencent.tinker.loader.shareutil.SharePatchFileUtil;
-import com.tencent.tinker.loader.shareutil.SharePatchInfo;
 import com.tencent.tinker.loader.shareutil.ShareTinkerInternals;
+import com.tencent.tinker.loader.shareutil.ShareTinkerLog;
 
 import java.io.File;
 
@@ -304,28 +302,9 @@ public void onLoadPackageCheckFail(File patchFile, int errorCode) {
         checkAndCleanPatch();
     }
 
-    /**
-     * other process may have installed old patch version,
-     * if we try to clean patch, we should kill other process first
-     */
     public void checkAndCleanPatch() {
         Tinker tinker = Tinker.with(context);
-        //only main process can load a new patch
-        if (tinker.isMainProcess()) {
-            TinkerLoadResult tinkerLoadResult = tinker.getTinkerLoadResultIfPresent();
-            //if versionChange and the old patch version is not ""
-            if (tinkerLoadResult.versionChanged) {
-                SharePatchInfo sharePatchInfo = tinkerLoadResult.patchInfo;
-                if (sharePatchInfo != null && !ShareTinkerInternals.isNullOrNil(sharePatchInfo.oldVersion)) {
-                    ShareTinkerLog.w(TAG, "checkAndCleanPatch, oldVersion %s is not null, try kill all other process",
-                        sharePatchInfo.oldVersion);
-
-                    ShareTinkerInternals.killAllOtherProcess(context);
-                }
-            }
-        }
         tinker.cleanPatch();
-
     }
 
     public boolean retryPatch() {
diff --git a/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/tinker/Tinker.java b/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/tinker/Tinker.java
@@ -30,13 +30,12 @@
 import com.tencent.tinker.lib.service.AbstractResultService;
 import com.tencent.tinker.lib.service.DefaultTinkerResultService;
 import com.tencent.tinker.lib.service.TinkerPatchService;
-import com.tencent.tinker.loader.shareutil.ShareTinkerLog;
 import com.tencent.tinker.lib.util.TinkerServiceInternals;
 import com.tencent.tinker.loader.TinkerRuntimeException;
 import com.tencent.tinker.loader.shareutil.ShareConstants;
 import com.tencent.tinker.loader.shareutil.SharePatchFileUtil;
-import com.tencent.tinker.loader.shareutil.SharePatchInfo;
 import com.tencent.tinker.loader.shareutil.ShareTinkerInternals;
+import com.tencent.tinker.loader.shareutil.ShareTinkerLog;
 
 import java.io.File;
 
@@ -256,20 +255,7 @@ public int getTinkerFlags() {
      * clean all patch files
      */
     public void cleanPatch() {
-        if (patchDirectory == null) {
-            return;
-        }
-        final File patchInfoFile = SharePatchFileUtil.getPatchInfoFile(patchDirectory.getAbsolutePath());
-        if (!patchInfoFile.exists()) {
-            ShareTinkerLog.printErrStackTrace(TAG, new Throwable(), "try to clean patch while patch info file does not exist.");
-            return;
-        }
-        final File patchInfoLockFile = SharePatchFileUtil.getPatchInfoLockFile(patchDirectory.getAbsolutePath());
-        final SharePatchInfo patchInfo = SharePatchInfo.readAndCheckPropertyWithLock(patchInfoFile, patchInfoLockFile);
-        if (patchInfo != null) {
-            patchInfo.isRemoveNewVersion = true;
-            SharePatchInfo.rewritePatchInfoFileWithLock(patchInfoFile, patchInfo, patchInfoLockFile);
-        }
+        ShareTinkerInternals.cleanPatch(getContext());
     }
 
     /**
diff --git a/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/tinker/TinkerLoadResult.java b/tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/tinker/TinkerLoadResult.java
@@ -114,7 +114,7 @@ public boolean parseTinkerResult(Context context, Intent intentResult) {
                 resourceFile = new File(resourceDirectory, ShareConstants.RES_NAME);
             }
             final boolean isProtectedApp = ShareIntentUtil.getBooleanExtra(intentResult, ShareIntentUtil.INTENT_IS_PROTECTED_APP, false);
-            patchInfo = new SharePatchInfo(oldVersion, newVersion, isProtectedApp, false, Build.FINGERPRINT, oatDir, false);
+            patchInfo = new SharePatchInfo(oldVersion, newVersion, isProtectedApp, "", Build.FINGERPRINT, oatDir, false);
             versionChanged = !(oldVersion.equals(newVersion));
         }
 
diff --git a/tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/TinkerLoader.java b/tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/TinkerLoader.java
@@ -124,37 +124,57 @@ private void tryLoadPatchFilesInternal(TinkerApplication app, Intent resultInten
         }
 
         boolean mainProcess = ShareTinkerInternals.isInMainProcess(app);
-        boolean isRemoveNewVersion = patchInfo.isRemoveNewVersion;
+        String versionToRemove = patchInfo.versionToRemove;
 
         if (mainProcess) {
-            final String patchName = SharePatchFileUtil.getPatchVersionDirectory(newVersion);
-            // So far new version is not loaded in main process and other processes.
-            // We can remove new version directory safely.
-            if (isRemoveNewVersion) {
-                ShareTinkerLog.w(TAG, "found clean patch mark and we are in main process, delete patch file now.");
-                if (patchName != null) {
-                    // oldVersion.equals(newVersion) means the new version has been loaded at least once
-                    // after it was applied.
-                    final boolean isNewVersionLoadedBefore = oldVersion.equals(newVersion);
-                    if (isNewVersionLoadedBefore) {
-                        // Set oldVersion and newVersion to empty string to clean patch
-                        // if current patch has been loaded before.
-                        oldVersion = "";
+            if (!ShareTinkerInternals.isNullOrNil(versionToRemove)) {
+                if (newVersion.equals(versionToRemove)) {
+                    ShareTinkerLog.w(TAG, "found new version clean patch mark and we are in main process, delete patch file now.");
+                    final String patchName = SharePatchFileUtil.getPatchVersionDirectory(newVersion);
+                    if (patchName != null) {
+                        // oldVersion.equals(newVersion) means the new version has been loaded at least once
+                        // after it was applied.
+                        final boolean isNewVersionLoadedBefore = oldVersion.equals(newVersion);
+                        if (isNewVersionLoadedBefore) {
+                            // Set oldVersion and newVersion to empty string to clean patch
+                            // if current patch has been loaded before.
+                            oldVersion = "";
+                        }
+                        newVersion = oldVersion;
+                        patchInfo.oldVersion = oldVersion;
+                        patchInfo.newVersion = newVersion;
+                        patchInfo.versionToRemove = "";
+                        SharePatchInfo.rewritePatchInfoFileWithLock(patchInfoFile, patchInfo, patchInfoLockFile);
+
+                        String patchVersionDirFullPath = patchDirectoryPath + "/" + patchName;
+                        if (isNewVersionLoadedBefore) {
+                            ShareTinkerInternals.killProcessExceptMain(app);
+                            SharePatchFileUtil.deleteDir(patchVersionDirFullPath);
+                            ShareIntentUtil.setIntentReturnCode(resultIntent, ShareConstants.ERROR_LOAD_PATCH_DIRECTORY_NOT_EXIST);
+                            return;
+                        } else {
+                            // So far new version is not loaded in main process and other processes.
+                            // We can remove new version directory safely.
+                            SharePatchFileUtil.deleteDir(patchVersionDirFullPath);
+                        }
                     }
-                    newVersion = oldVersion;
-                    patchInfo.oldVersion = oldVersion;
-                    patchInfo.newVersion = newVersion;
-                    patchInfo.isRemoveNewVersion = false;
-                    SharePatchInfo.rewritePatchInfoFileWithLock(patchInfoFile, patchInfo, patchInfoLockFile);
-
-                    String patchVersionDirFullPath = patchDirectoryPath + "/" + patchName;
-                    SharePatchFileUtil.deleteDir(patchVersionDirFullPath);
-
-                    if (isNewVersionLoadedBefore) {
+                } else if (oldVersion.equals(versionToRemove)) {
+                    ShareTinkerLog.w(TAG, "found old version clean patch mark and we are in main process, delete patch file now.");
+                    final String patchName = SharePatchFileUtil.getPatchVersionDirectory(oldVersion);
+                    if (patchName != null) {
+                        oldVersion = newVersion;
+                        patchInfo.oldVersion = oldVersion;
+                        patchInfo.newVersion = newVersion;
+                        patchInfo.versionToRemove = "";
+                        SharePatchInfo.rewritePatchInfoFileWithLock(patchInfoFile, patchInfo, patchInfoLockFile);
+
+                        String patchVersionDirFullPath = patchDirectoryPath + "/" + patchName;
                         ShareTinkerInternals.killProcessExceptMain(app);
-                        ShareIntentUtil.setIntentReturnCode(resultIntent, ShareConstants.ERROR_LOAD_PATCH_DIRECTORY_NOT_EXIST);
-                        return;
+                        SharePatchFileUtil.deleteDir(patchVersionDirFullPath);
                     }
+                } else {
+                    patchInfo.versionToRemove = "";
+                    SharePatchInfo.rewritePatchInfoFileWithLock(patchInfoFile, patchInfo, patchInfoLockFile);
                 }
             }
             if (patchInfo.isRemoveInterpretOATDir) {
@@ -165,6 +185,7 @@ private void tryLoadPatchFilesInternal(TinkerApplication app, Intent resultInten
                 patchInfo.isRemoveInterpretOATDir = false;
                 SharePatchInfo.rewritePatchInfoFileWithLock(patchInfoFile, patchInfo, patchInfoLockFile);
                 ShareTinkerInternals.killProcessExceptMain(app);
+                final String patchName = SharePatchFileUtil.getPatchVersionDirectory(newVersion);
                 String patchVersionDirFullPath = patchDirectoryPath + "/" + patchName;
                 SharePatchFileUtil.deleteDir(patchVersionDirFullPath + "/" + ShareConstants.INTERPRET_DEX_OPTIMIZE_PATH);
             }
@@ -302,7 +323,7 @@ private void tryLoadPatchFilesInternal(TinkerApplication app, Intent resultInten
                 // Mark current patch as deleted so that other process will not load patch after reboot.
                 patchInfo.oldVersion = "";
                 patchInfo.newVersion = "";
-                patchInfo.isRemoveNewVersion = false;
+                patchInfo.versionToRemove = "";
                 SharePatchInfo.rewritePatchInfoFileWithLock(patchInfoFile, patchInfo, patchInfoLockFile);
                 ShareTinkerInternals.killProcessExceptMain(app);
 
diff --git a/tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/TinkerResourceLoader.java b/tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/TinkerResourceLoader.java
@@ -62,7 +62,7 @@ public static boolean loadTinkerResources(TinkerApplication application, String
             ShareTinkerLog.i(TAG, "verify resource file:" + resourceFile.getPath() + " md5, use time: " + (System.currentTimeMillis() - start));
         }
         try {
-            TinkerResourcePatcher.monkeyPatchExistingResources(application, resourceString);
+            TinkerResourcePatcher.monkeyPatchExistingResources(application, resourceString, false);
             ShareTinkerLog.i(TAG, "monkeyPatchExistingResources resource file:" + resourceString + ", use time: " + (System.currentTimeMillis() - start));
         } catch (Throwable e) {
             ShareTinkerLog.e(TAG, "install resources failed");
diff --git a/tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/TinkerResourcePatcher.java b/tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/TinkerResourcePatcher.java
diff --git a/tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/shareutil/SharePatchInfo.java b/tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/shareutil/SharePatchInfo.java
diff --git a/tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/shareutil/ShareTinkerInternals.java b/tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/shareutil/ShareTinkerInternals.java
diff --git a/tinker-build/tinker-patch-lib/src/main/java/com/tencent/tinker/build/decoder/ApkDecoder.java b/tinker-build/tinker-patch-lib/src/main/java/com/tencent/tinker/build/decoder/ApkDecoder.java
diff --git a/tinker-build/tinker-patch-lib/src/main/java/com/tencent/tinker/build/util/DexClassesComparator.java b/tinker-build/tinker-patch-lib/src/main/java/com/tencent/tinker/build/util/DexClassesComparator.java

Original file line number	Diff line number	Diff line change
`@@ -261,8 +261,8 @@ private int getPromotedOpCodeOnDemand(InstructionHolder insn) {`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`public boolean isSameInstruction(int insnAddress1, int insnAddress2) {`
`264`		`- InstructionHolder insnHolder1 = this.insnHolders1[insnAddress1];`
`265`		`- InstructionHolder insnHolder2 = this.insnHolders2[insnAddress2];`
	`264`	`+ InstructionHolder insnHolder1 = insnAddress1 < this.insnHolders1.length ? this.insnHolders1[insnAddress1] : null;`
	`265`	`+ InstructionHolder insnHolder2 = insnAddress2 < this.insnHolders2.length ? this.insnHolders2[insnAddress2] : null;`
`266`	`266`	`return isSameInstruction(insnHolder1, insnHolder2);`
`267`	`267`	`}`
`268`	`268`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,8 @@ private static boolean patchDexExtractViaDexDiff(Context context, String patchVe`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`private static boolean checkClassNDexFiles(final String dexFilePath) {`
`201`		`- if (patchList.isEmpty() \|\| !isVmArt) {`
	`201`	`+ classNDexInfo.clear();`
	`202`	`+ if (patchList.isEmpty() \|\| !isVmArt) {`
`202`	`203`	`return false;`
`203`	`204`	`}`
`204`	`205`	`ShareDexDiffPatchInfo testInfo = null;`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public boolean parseTinkerResult(Context context, Intent intentResult) {`
`114`	`114`	`resourceFile = new File(resourceDirectory, ShareConstants.RES_NAME);`
`115`	`115`	`}`
`116`	`116`	`final boolean isProtectedApp = ShareIntentUtil.getBooleanExtra(intentResult, ShareIntentUtil.INTENT_IS_PROTECTED_APP, false);`
`117`		`- patchInfo = new SharePatchInfo(oldVersion, newVersion, isProtectedApp, false, Build.FINGERPRINT, oatDir, false);`
	`117`	`+ patchInfo = new SharePatchInfo(oldVersion, newVersion, isProtectedApp, "", Build.FINGERPRINT, oatDir, false);`
`118`	`118`	`versionChanged = !(oldVersion.equals(newVersion));`
`119`	`119`	`}`
`120`	`120`