Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0acb1553 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

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

am: 3e05055a

* commit '3e05055a':
  Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Change-Id: I8e472de1aca491dabd1bd2bfc456560fabc16221
parents 7b7b17ab 3e05055a

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -717,6 +717,11 @@ public final class JobSchedulerService extends com.android.server.SystemService 
     */

     */

    public JobSchedulerService(Context context) {

    public JobSchedulerService(Context context) {

        super(context);

        super(context);

        mHandler = new JobHandler(context.getMainLooper());

        mConstants = new Constants(mHandler);

        mJobSchedulerStub = new JobSchedulerStub();

        mJobs = JobStore.initAndGet(this);



        // Create the controllers.

        // Create the controllers.

        mControllers = new ArrayList<StateController>();

        mControllers = new ArrayList<StateController>();

        mControllers.add(ConnectivityController.get(this));

        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(AppIdleController.get(this));

        mControllers.add(ContentObserverController.get(this));

        mControllers.add(ContentObserverController.get(this));

        mControllers.add(DeviceIdleJobsController.get(this));

        mControllers.add(DeviceIdleJobsController.get(this));



        mHandler = new JobHandler(context.getMainLooper());

        mConstants = new Constants(mHandler);

        mJobSchedulerStub = new JobSchedulerStub();

        mJobs = JobStore.initAndGet(this);

    }

    }





    @Override

    @Override