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

Commit ea4f17d0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Deprecate PowerWhitelistManager." into sc-dev am: f26cbdfa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13842209

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cb1b096387796602ed898a6ad97d76ee3d5215d
parents ab5f4e50 f26cbdfa

apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class DeviceIdleManager { 
     * @return package names the system has white-listed to opt out of power save restrictions,

     * except for device idle mode.

     *

     * @hide Should be migrated to PowerWhitelistManager

     * @hide Should be migrated to PowerExemptionManager

     */

    @TestApi

    public @NonNull String[] getSystemPowerWhitelistExceptIdle() {
@@ -80,7 +80,7 @@ public class DeviceIdleManager { 
     * @return package names the system has white-listed to opt out of power save restrictions for

     * all modes.

     *

     * @hide Should be migrated to PowerWhitelistManager

     * @hide Should be migrated to PowerExemptionManager

     */

    @TestApi

    public @NonNull String[] getSystemPowerWhitelist() {

apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ interface IDeviceIdleController { 
    boolean isPowerSaveWhitelistExceptIdleApp(String name);

    boolean isPowerSaveWhitelistApp(String name);

    @UnsupportedAppUsage(maxTargetSdk = 30,

     publicAlternatives = "Use SystemApi {@code PowerWhitelistManager#whitelistAppTemporarily(String, int, String)}.")

     publicAlternatives = "Use SystemApi {@code PowerExemptionManager#addToTemporaryAllowList(String, int, int, String)}.")

    void addPowerSaveTempWhitelistApp(String name, long duration, int userId, int reasonCode, String reason);

    long addPowerSaveTempWhitelistAppForMms(String name, int userId, int reasonCode, String reason);

    long addPowerSaveTempWhitelistAppForSms(String name, int userId, int reasonCode, String reason);

apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java

+123 −236

File changed.

Preview size limit exceeded, changes collapsed.

core/api/system-current.txt

+17 −18
Original line number Diff line number Diff line
@@ -2173,7 +2173,6 @@ package android.content { 
    field public static final String OEM_LOCK_SERVICE = "oem_lock";

    field public static final String PERMISSION_SERVICE = "permission";

    field public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";

    field public static final String POWER_EXEMPTION_SERVICE = "power_exemption";

    field public static final String REBOOT_READINESS_SERVICE = "reboot_readiness";

    field public static final String ROLLBACK_SERVICE = "rollback";

    field public static final String SEARCH_UI_SERVICE = "search_ui";
@@ -8224,25 +8223,25 @@ package android.os { 
    field public static final int USER_ACTIVITY_FLAG_NO_CHANGE_LIGHTS = 1; // 0x1

  }













  public class PowerWhitelistManager {













    method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void addToWhitelist(@NonNull String);













    method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void addToWhitelist(@NonNull java.util.List<java.lang.String>);













    method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void removeFromWhitelist(@NonNull String);













    method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void whitelistAppTemporarily(@NonNull String, long, int, @Nullable String);













  @Deprecated public class PowerWhitelistManager {













    method @Deprecated @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void addToWhitelist(@NonNull String);













    method @Deprecated @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void addToWhitelist(@NonNull java.util.List<java.lang.String>);













    method @Deprecated @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void removeFromWhitelist(@NonNull String);













    method @Deprecated @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void whitelistAppTemporarily(@NonNull String, long, int, @Nullable String);















    method @Deprecated @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void whitelistAppTemporarily(@NonNull String, long);















    method @Deprecated @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public long whitelistAppTemporarilyForEvent(@NonNull String, int, @Nullable String);













    method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public long whitelistAppTemporarilyForEvent(@NonNull String, int, int, @Nullable String);













    field public static final int EVENT_MMS = 2; // 0x2













    field public static final int EVENT_SMS = 1; // 0x1













    field public static final int EVENT_UNSPECIFIED = 0; // 0x0













    field public static final int REASON_ACTIVITY_RECOGNITION = 103; // 0x67













    field public static final int REASON_GEOFENCING = 100; // 0x64













    field public static final int REASON_OTHER = 1; // 0x1













    field public static final int REASON_PUSH_MESSAGING = 101; // 0x65













    field public static final int REASON_PUSH_MESSAGING_OVER_QUOTA = 102; // 0x66













    field public static final int REASON_UNKNOWN = 0; // 0x0













    field public static final int TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED = 0; // 0x0













    field public static final int TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED = 1; // 0x1













    method @Deprecated @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public long whitelistAppTemporarilyForEvent(@NonNull String, int, int, @Nullable String);













    field @Deprecated public static final int EVENT_MMS = 2; // 0x2













    field @Deprecated public static final int EVENT_SMS = 1; // 0x1













    field @Deprecated public static final int EVENT_UNSPECIFIED = 0; // 0x0













    field @Deprecated public static final int REASON_ACTIVITY_RECOGNITION = 103; // 0x67













    field @Deprecated public static final int REASON_GEOFENCING = 100; // 0x64













    field @Deprecated public static final int REASON_OTHER = 1; // 0x1













    field @Deprecated public static final int REASON_PUSH_MESSAGING = 101; // 0x65













    field @Deprecated public static final int REASON_PUSH_MESSAGING_OVER_QUOTA = 102; // 0x66













    field @Deprecated public static final int REASON_UNKNOWN = 0; // 0x0













    field @Deprecated public static final int TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED = 0; // 0x0













    field @Deprecated public static final int TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED = 1; // 0x1















  }





























  public class RecoverySystem {

























core/api/test-current.txt



+2
−1




























Original line number
Diff line number
Diff line








@@ -699,7 +699,8 @@ package android.content {













    field public static final String DEVICE_IDLE_CONTROLLER = "deviceidle";















    field public static final String DREAM_SERVICE = "dream";















    field public static final String FONT_SERVICE = "font";













    field public static final String POWER_WHITELIST_MANAGER = "power_whitelist";













    field public static final String POWER_EXEMPTION_SERVICE = "power_exemption";













    field @Deprecated public static final String POWER_WHITELIST_MANAGER = "power_whitelist";















    field public static final String TEST_NETWORK_SERVICE = "test_network";















  }