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

Commit 66c83609 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 14071582 from 3f2c33f1 to 25Q4-release 

Change-Id: I252f031315ac28ef9c0bdd8e421b8ad2570b94eb
parents 176867e2 3f2c33f1

FF_LEADS_OWNERS

+0 −2
Original line number Diff line number Diff line 
bills@google.com

carmenjackson@google.com

nalini@google.com

nosh@google.com

olilan@google.com

philipcuadra@google.com

apex/jobscheduler/DEVICE_IDLE_OWNERS

+1 −2
Original line number Diff line number Diff line 
suprabh@google.com
 
 No newline at end of file
 
guanxin@google.com
 
 No newline at end of file

apex/jobscheduler/JOB_OWNERS

+1 −2
Original line number Diff line number Diff line 
suprabh@google.com

varunshah@google.com
 
 No newline at end of file
 
guanxin@google.com
 
 No newline at end of file

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+2 −1
Original line number Diff line number Diff line
@@ -2771,8 +2771,9 @@ public class DeviceIdleController extends SystemService 
                mPowerSaveWhitelistChangedIntent = new Intent(

                        PowerManager.ACTION_POWER_SAVE_WHITELIST_CHANGED);

                mPowerSaveWhitelistChangedIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

                //This intent is not exposed in PowerManager, so hardcoding the broadcast string.

                mPowerSaveTempWhitelistChangedIntent = new Intent(

                        PowerManager.ACTION_POWER_SAVE_TEMP_WHITELIST_CHANGED);

                        "android.os.action.POWER_SAVE_TEMP_WHITELIST_CHANGED");

                mPowerSaveTempWhitelistChangedIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

                mPowerSaveWhitelistChangedOptions = mostRecentDeliveryOptions;

                mPowerSaveTempWhilelistChangedOptions = mostRecentDeliveryOptions;

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

+5 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 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.deviceidle.Flags;

import com.android.server.job.JobSchedulerService;

import com.android.server.job.StateControllerProto;

import com.android.server.job.StateControllerProto.DeviceIdleJobsController.TrackedJob;
@@ -103,7 +104,7 @@ public final class DeviceIdleJobsController extends StateController { 
                        }

                    }

                    break;

                case PowerManager.ACTION_POWER_SAVE_TEMP_WHITELIST_CHANGED:

                case "android.os.action.POWER_SAVE_TEMP_WHITELIST_CHANGED":

                    synchronized (mLock) {

                        mPowerSaveTempWhitelistAppIds =

                                mLocalDeviceIdleController.getPowerSaveTempWhitelistAppIds();
@@ -151,7 +152,9 @@ public final class DeviceIdleJobsController extends StateController { 
        filter.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED);

        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);

        if (!Flags.stopPowerSaveTempWhitelistBroadcast()) {

            filter.addAction("android.os.action.POWER_SAVE_TEMP_WHITELIST_CHANGED");

        }

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

    }