Merge branch 'dev_1_9_14_25_2' into dev

# Conflicts:
#	build.gradle

Author: tangyinsheng

build.gradle

@@ -36,7 +36,7 @@ ext {
     javaVersion = JavaVersion.VERSION_1_8
 
     GROUP = 'com.tencent.tinker'
-    VERSION_NAME = '1.9.14.26-dev'
+    VERSION_NAME = '1.9.14.25.2'
 
     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'

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

@@ -92,7 +92,6 @@ private void tryLoadPatchFilesInternal(TinkerApplication app, Intent resultInten
 
         //tinker/patch.info
         File patchInfoFile = SharePatchFileUtil.getPatchInfoFile(patchDirectoryPath);
-
         //check patch info file whether exist
         if (!patchInfoFile.exists()) {
             ShareTinkerLog.w(TAG, "tryLoadPatchFiles:patch info not exist:" + patchInfoFile.getAbsolutePath());
@@ -102,7 +101,6 @@ private void tryLoadPatchFilesInternal(TinkerApplication app, Intent resultInten
         //old = 641e634c5b8f1649c75caf73794acbdf
         //new = 2c150d8560334966952678930ba67fa8
         File patchInfoLockFile = SharePatchFileUtil.getPatchInfoLockFile(patchDirectoryPath);
-
         patchInfo = SharePatchInfo.readAndCheckPropertyWithLock(patchInfoFile, patchInfoLockFile);
         if (patchInfo == null) {
             ShareIntentUtil.setIntentReturnCode(resultIntent, ShareConstants.ERROR_LOAD_PATCH_INFO_CORRUPTED);
@@ -173,7 +171,7 @@ private void tryLoadPatchFilesInternal(TinkerApplication app, Intent resultInten
 
                         String patchVersionDirFullPath = patchDirectoryPath + "/" + patchName;
                         ShareTinkerInternals.killProcessExceptMain(app);
-                        SharePatchFileUtil.deleteDir(patchVersionDirFullPath);
+                        SharePatchFileUtil.deleteDirAsync(patchVersionDirFullPath);
                     }
                 } else {
                     patchInfo.versionToRemove = "";
@@ -244,7 +242,6 @@ private void tryLoadPatchFilesInternal(TinkerApplication app, Intent resultInten
         }
 
         ShareSecurityCheck securityCheck = new ShareSecurityCheck(app);
-
         int returnCode = ShareTinkerInternals.checkTinkerPackage(app, tinkerFlag, patchVersionFile, securityCheck);
         if (returnCode != ShareConstants.ERROR_PACKAGE_CHECK_OK) {
             ShareTinkerLog.w(TAG, "tryLoadPatchFiles:checkTinkerPackage");