Merge branch 'dev' of https://github.com/Tencent/tinker

Author: tys282000

gradle.properties

@@ -16,5 +16,5 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME_PREFIX=1.9.2
+VERSION_NAME_PREFIX=1.9.5
 VERSION_NAME_SUFFIX=

gradle/android-artifacts.gradle

@@ -83,6 +83,26 @@ publishing {
             // Tell maven to prepare the generated "*.aar" file for publishing
             artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
             artifact androidJavadocsJar
+            pom.withXml {
+                def dependenciesNode = asNode().appendNode('dependencies')
+                configurations.compile.allDependencies.each {
+                    if (it.group != null && it.name != null) {
+                        def dependencyNode = dependenciesNode.appendNode('dependency')
+                        dependencyNode.appendNode('groupId', it.group)
+                        dependencyNode.appendNode('artifactId', it.name)
+                        dependencyNode.appendNode('version', it.version)
+
+                        if (it.excludeRules.size() > 0) {
+                            def exclusionsNode = dependencyNode.appendNode('exclusions')
+                            it.excludeRules.each { rule ->
+                                def exclusionNode = exclusionsNode.appendNode('exclusion')
+                                exclusionNode.appendNode('groupId', rule.group)
+                                exclusionNode.appendNode('artifactId', rule.module)
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 }

tinker-android/tinker-android-lib/src/main/AndroidManifest.xml

@@ -2,17 +2,24 @@
           xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
+
         <service
-            android:name=".service.TinkerPatchService"
+            android:name=".service.TinkerPatchService$IntentServiceRunner"
             android:exported="false"
             android:process=":patch"/>
         <service
-            android:name=".service.TinkerPatchService$InnerService"
+            android:name=".service.TinkerPatchService$IntentServiceRunner$InnerService"
+            android:exported="false"
+            android:process=":patch"/>
+        <service
+            android:name=".service.TinkerPatchService$JobServiceRunner"
+            android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false"
             android:process=":patch"/>
         <service
             android:name=".service.DefaultTinkerResultService"
             android:exported="false"/>
+
     </application>
 
 </manifest>

tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/library/TinkerLoadLibrary.java

@@ -59,8 +59,9 @@
 public class DexDiffPatchInternal extends BasePatchInternal {
     protected static final String TAG = "Tinker.DexDiffPatchInternal";
 
-    protected static final int WAIT_ASYN_OAT_TIME = 15 * 1000;
-    protected static final int MAX_WAIT_COUNT     = 30;
+    protected static final int WAIT_ASYN_OAT_TIME = 10 * 1000;
+    protected static final int MAX_WAIT_COUNT     = 120;
+
 
     private static ArrayList<File>                      optFiles      = new ArrayList<>();
     private static ArrayList<ShareDexDiffPatchInfo>     patchList     = new ArrayList<>();
@@ -93,7 +94,7 @@ protected static boolean waitAndCheckDexOptFile(File patchFile, Tinker manager)
             return true;
         }
         // should use patch list size
-        int size = patchList.size() * 8;
+        int size = patchList.size() * 30;
         if (size > MAX_WAIT_COUNT) {
             size = MAX_WAIT_COUNT;
         }
@@ -271,7 +272,7 @@ private static boolean mergeClassNDexFiles(final Context context, final File pat
                     }
                 } else {
                     TinkerZipEntry dexZipEntry = new TinkerZipEntry(info.rawName);
-                    TinkerZipUtil.extractLargeModifyFile(dexZipEntry, dexFile, Long.parseLong(info.newDexCrC), out);
+                    TinkerZipUtil.extractLargeModifyFile(dexZipEntry, dexFile, Long.parseLong(info.newOrPatchedDexCrC), out);
                 }
 
             }

tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/patch/DexDiffPatchInternal.java

@@ -16,14 +16,23 @@
 
 package com.tencent.tinker.lib.service;
 
+import android.annotation.TargetApi;
 import android.app.IntentService;
 import android.app.Notification;
 import android.app.Service;
+import android.app.job.JobInfo;
+import android.app.job.JobParameters;
+import android.app.job.JobScheduler;
+import android.app.job.JobService;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.os.AsyncTask;
 import android.os.Build;
 import android.os.IBinder;
+import android.os.PersistableBundle;
 import android.os.SystemClock;
+import android.support.annotation.Nullable;
 
 import com.tencent.tinker.lib.patch.AbstractPatch;
 import com.tencent.tinker.lib.tinker.Tinker;
@@ -33,11 +42,12 @@
 import com.tencent.tinker.loader.shareutil.ShareIntentUtil;
 
 import java.io.File;
+import java.lang.ref.WeakReference;
 
 /**
  * Created by zhangshaowen on 16/3/14.
  */
-public class TinkerPatchService extends IntentService {
+public class TinkerPatchService {
     private static final String TAG = "Tinker.TinkerPatchService";
 
     private static final String        PATCH_PATH_EXTRA      = "patch_path_extra";
@@ -47,19 +57,27 @@ public class TinkerPatchService extends IntentService {
     private static       int                                    notificationId       = ShareConstants.TINKER_PATCH_SERVICE_NOTIFICATION;
     private static       Class<? extends AbstractResultService> resultServiceClass   = null;
 
-    /**
-     * Creates an IntentService.  Invoked by your subclass's constructor.
-     */
-    public TinkerPatchService() {
-        super(TinkerPatchService.class.getSimpleName());
-    }
-
     public static void runPatchService(Context context, String path) {
         try {
-            Intent intent = new Intent(context, TinkerPatchService.class);
-            intent.putExtra(PATCH_PATH_EXTRA, path);
-            intent.putExtra(RESULT_CLASS_EXTRA, resultServiceClass.getName());
-            context.startService(intent);
+            if (Build.VERSION.SDK_INT < 21) {
+                Intent intent = new Intent(context, IntentServiceRunner.class);
+                intent.putExtra(PATCH_PATH_EXTRA, path);
+                intent.putExtra(RESULT_CLASS_EXTRA, resultServiceClass.getName());
+                context.startService(intent);
+            } else {
+                final JobInfo.Builder jobInfoBuilder = new JobInfo.Builder(
+                        1, new ComponentName(context, JobServiceRunner.class)
+                );
+                final PersistableBundle extras = new PersistableBundle();
+                extras.putString(PATCH_PATH_EXTRA, path);
+                extras.putString(RESULT_CLASS_EXTRA, resultServiceClass.getName());
+                jobInfoBuilder.setExtras(extras);
+                jobInfoBuilder.setMinimumLatency(1);
+                final JobScheduler jobScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
+                if (jobScheduler.schedule(jobInfoBuilder.build()) != JobScheduler.RESULT_SUCCESS) {
+                    TinkerLog.e(TAG, "start patch job service fail.");
+                }
+            }
         } catch (Throwable throwable) {
             TinkerLog.e(TAG, "start patch service fail, exception:" + throwable);
         }
@@ -90,6 +108,14 @@ public static String getPatchResultExtra(Intent intent) {
         return ShareIntentUtil.getStringExtra(intent, RESULT_CLASS_EXTRA);
     }
 
+    public static Class<? extends Service> getRealRunnerClass() {
+        if (Build.VERSION.SDK_INT < 21) {
+            return IntentServiceRunner.class;
+        } else {
+            return JobServiceRunner.class;
+        }
+    }
+
     /**
      * set the tinker notification id you want
      * @param id
@@ -98,9 +124,7 @@ public static void setTinkerNotificationId(int id) {
         notificationId = id;
     }
 
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        final Context context = getApplicationContext();
+    private static void doApplyPatch(Context context, Intent intent) {
         Tinker tinker = Tinker.with(context);
         tinker.getPatchReporter().onPatchServiceStart(intent);
 
@@ -120,7 +144,6 @@ protected void onHandleIntent(Intent intent) {
         long cost;
         Throwable e = null;
 
-        increasingPriority();
         PatchResult patchResult = new PatchResult();
         try {
             if (upgradePatchProcessor == null) {
@@ -143,57 +166,134 @@ protected void onHandleIntent(Intent intent) {
         patchResult.e = e;
 
         AbstractResultService.runResultService(context, patchResult, getPatchResultExtra(intent));
-
     }
 
-    private void increasingPriority() {
+    public static class IntentServiceRunner extends IntentService {
+
+        public IntentServiceRunner() {
+            super("TinkerPatchService");
+        }
+
+        @Override
+        protected void onHandleIntent(@Nullable Intent intent) {
+            increasingPriority();
+            doApplyPatch(getApplicationContext(), intent);
+        }
+
+        private void increasingPriority() {
 //        if (Build.VERSION.SDK_INT > 24) {
 //            TinkerLog.i(TAG, "for Android 7.1, we just ignore increasingPriority job");
 //            return;
 //        }
-        TinkerLog.i(TAG, "try to increase patch process priority");
-        try {
-            Notification notification = new Notification();
-            if (Build.VERSION.SDK_INT < 18) {
-                startForeground(notificationId, notification);
-            } else {
-                startForeground(notificationId, notification);
-                // start InnerService
-                startService(new Intent(this, InnerService.class));
+            if (Build.VERSION.SDK_INT >= 26) {
+                TinkerLog.i(TAG, "for system version >= Android O, we just ignore increasingPriority "
+                        + "job to avoid crash or toasts.");
+                return;
             }
-        } catch (Throwable e) {
-            TinkerLog.i(TAG, "try to increase patch process priority error:" + e);
-        }
-    }
 
-    /**
-     * I don't want to do this, believe me
-     */
-    //InnerService
-    public static class InnerService extends Service {
-        @Override
-        public void onCreate() {
-            super.onCreate();
+            if ("ZUK".equals(Build.MANUFACTURER)) {
+                TinkerLog.i(TAG, "for ZUK device, we just ignore increasingPriority "
+                        + "job to avoid crash.");
+                return;
+            }
+
+            TinkerLog.i(TAG, "try to increase patch process priority");
             try {
-                startForeground(notificationId, new Notification());
+                Notification notification = new Notification();
+                if (Build.VERSION.SDK_INT < 18) {
+                    startForeground(notificationId, notification);
+                } else {
+                    startForeground(notificationId, notification);
+                    // start InnerService
+                    startService(new Intent(this, InnerService.class));
+                }
             } catch (Throwable e) {
-                TinkerLog.e(TAG, "InnerService set service for push exception:%s.", e);
+                TinkerLog.i(TAG, "try to increase patch process priority error:" + e);
             }
-            // kill
-            stopSelf();
         }
 
+        /**
+         * I don't want to do this, believe me
+         */
+        //InnerService
+        public static class InnerService extends Service {
+            @Override
+            public void onCreate() {
+                super.onCreate();
+                try {
+                    startForeground(notificationId, new Notification());
+                } catch (Throwable e) {
+                    TinkerLog.e(TAG, "InnerService set service for push exception:%s.", e);
+                }
+                // kill
+                stopSelf();
+            }
+
+            @Override
+            public void onDestroy() {
+                stopForeground(true);
+                super.onDestroy();
+            }
+
+            @Override
+            public IBinder onBind(Intent intent) {
+                return null;
+            }
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public static class JobServiceRunner extends JobService {
+        private JobAsyncTask mTask = null;
+
         @Override
-        public void onDestroy() {
-            stopForeground(true);
-            super.onDestroy();
+        public boolean onStartJob(JobParameters params) {
+            mTask = new JobAsyncTask(this);
+            mTask.execute(params);
+            return true;
         }
 
         @Override
-        public IBinder onBind(Intent intent) {
-            return null;
+        public boolean onStopJob(JobParameters params) {
+            TinkerLog.w(TAG, "Stopping TinkerPatchJob service.");
+            if (mTask != null) {
+                mTask.cancel(true);
+                mTask = null;
+            }
+            return false;
         }
-    }
 
+        private static class JobAsyncTask extends AsyncTask<JobParameters, Void, Void> {
+            private final WeakReference<JobService> mHolderRef;
+
+            JobAsyncTask(JobService holder) {
+                mHolderRef = new WeakReference<>(holder);
+            }
+
+            @Override
+            protected Void doInBackground(JobParameters... paramsList) {
+                final JobParameters params = paramsList[0];
+                final PersistableBundle extras = params.getExtras();
+                final Intent paramIntent = new Intent();
+                paramIntent.putExtra(PATCH_PATH_EXTRA, extras.getString(PATCH_PATH_EXTRA));
+                paramIntent.putExtra(RESULT_CLASS_EXTRA, extras.getString(RESULT_CLASS_EXTRA));
+                final JobService holder = mHolderRef.get();
+                if (holder == null) {
+                    TinkerLog.e(TAG, "unexpected case: holder job service is null.");
+                    return null;
+                }
+                doApplyPatch(holder.getApplicationContext(), paramIntent);
+                notifyFinished(params);
+                return null;
+            }
+
+            private void notifyFinished(JobParameters params) {
+                final JobService holder = mHolderRef.get();
+                if (holder != null) {
+                    holder.jobFinished(params, false);
+                }
+            }
+        }
+    }
 }