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

Commit b2f460a4 authored by Xin Guan's avatar Xin Guan Committed by Android (Google) Code Review
Browse files

Merge "JobScheduler: Cleanup FLAG_DEVICEIDLEJOBCONTROLLER_OFF_MAIN_THREAD" into main

parents c192bfc0 3ec3e1cd

apex/jobscheduler/service/aconfig/job.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -80,16 +80,6 @@ flag { 
    }

}



flag {

    name: "deviceidlejobcontroller_off_main_thread"

    namespace: "backstage_power"

    description: "Move the broadcast receiver in DeviceIdleJobController off the main thread."

    bug: "414140833"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "fix_deadline_delay_job_stall"

    namespace: "backstage_power"

apex/jobscheduler/service/java/com/android/server/job/controllers/DeviceIdleJobsController.java

+1 −4
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.internal.util.ArrayUtils; 
import com.android.server.AppSchedulingModuleThread;

import com.android.server.DeviceIdleInternal;

import com.android.server.LocalServices;

import com.android.server.job.Flags;

import com.android.server.job.JobSchedulerService;

import com.android.server.job.StateControllerProto;

import com.android.server.job.StateControllerProto.DeviceIdleJobsController.TrackedJob;
@@ -153,9 +152,7 @@ public final class DeviceIdleJobsController extends StateController { 
        filter.addAction(PowerManager.ACTION_LIGHT_DEVICE_IDLE_MODE_CHANGED);

        filter.addAction(PowerManager.ACTION_POWER_SAVE_WHITELIST_CHANGED);

        filter.addAction(PowerManager.ACTION_POWER_SAVE_TEMP_WHITELIST_CHANGED);

        mContext.registerReceiverAsUser(

                mBroadcastReceiver, UserHandle.ALL, filter, null,

                Flags.deviceidlejobcontrollerOffMainThread() ? mHandler : null);

        mContext.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter, null, mHandler);

    }



    void updateIdleMode(boolean enabled) {