commit 3e05055af775f9539d832b1191ae2ee9bc4acf21
author Dianne Hackborn <hackbod@google.com> Wed Jun 01 19:26:07 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 01 19:26:09 2016 +0000
tree d81ded4543fce46d4dad39562f97248a220609ec
parent 42621023cfac084b8c74fd4d362bc2c64d61674e
parent 970e3f412d34cbeae3706de5cb1de0b3ca741f87

Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev

services/core/java/com/android/server/job/JobSchedulerService.java

diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java
index 5e212b0..899aada 100644
--- a/services/core/java/com/android/server/job/JobSchedulerService.java
+++ b/services/core/java/com/android/server/job/JobSchedulerService.java
@@ -717,6 +717,11 @@
      */
     public JobSchedulerService(Context context) {
         super(context);
+        mHandler = new JobHandler(context.getMainLooper());
+        mConstants = new Constants(mHandler);
+        mJobSchedulerStub = new JobSchedulerStub();
+        mJobs = JobStore.initAndGet(this);
+
         // Create the controllers.
         mControllers = new ArrayList<StateController>();
         mControllers.add(ConnectivityController.get(this));
@@ -726,11 +731,6 @@
         mControllers.add(AppIdleController.get(this));
         mControllers.add(ContentObserverController.get(this));
         mControllers.add(DeviceIdleJobsController.get(this));
-
-        mHandler = new JobHandler(context.getMainLooper());
-        mConstants = new Constants(mHandler);
-        mJobSchedulerStub = new JobSchedulerStub();
-        mJobs = JobStore.initAndGet(this);
     }
 
     @Override