Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am: 3e05055af7 am: 0acb155338" into nyc-mr1-dev-plus-aosp

Browse Source 
am: 2726da7c96

* commit '2726da7c96df40b7eef9151391b4f5a43b1d01b7':
  Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Change-Id: Ic4bff1a6e8f2fc0a41904e5da3c786b569079787
This commit is contained in:
Dianne Hackborn
2016-06-02 00:16:16 +00:00
committed by android-build-merger
parent f15cbf3a8d 2726da7c96
commit 8f8e74dd90
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/job/JobSchedulerService.java
View File

@@ -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