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

1 files changed, 5 insertions, 5 deletions

diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java
index 5e212b0ef663..899aada9d496 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 final class JobSchedulerService extends com.android.server.SystemService
      */
     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 @@ public final class JobSchedulerService extends com.android.server.SystemService
         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