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

Commit 58a717f2 authored by Piyush Singhania's avatar Piyush Singhania Committed by Android (Google) Code Review
Browse files

Merge changes I1979085b,Ie08ea59a into main 

* changes:
  Eliminate the ACTION_POWER_SAVE_TEMP_WHITELIST_CHANGED broadcast
  Remove registration for ACTION_POWER_SAVE_TEMP_WHITELIST_CHANGED broadcast.
parents bfaccfe3 31bead79

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

    }

core/java/android/os/PowerManager.java

+0 −8
Original line number Diff line number Diff line
@@ -3598,14 +3598,6 @@ public final class PowerManager { 
    public static final String ACTION_POWER_SAVE_WHITELIST_CHANGED

            = "android.os.action.POWER_SAVE_WHITELIST_CHANGED";



    /**

     * @hide Intent that is broadcast when the set of temporarily allowlisted apps has changed.

     * This broadcast is only sent to registered receivers.

     */

    @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_POWER_SAVE_TEMP_WHITELIST_CHANGED

            = "android.os.action.POWER_SAVE_TEMP_WHITELIST_CHANGED";



    /**

     * Intent that is broadcast when Low Power Standby is enabled or disabled.

     * This broadcast is only sent to registered receivers and receivers holding