diff --git a/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java b/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java index 4ffcf8ab60764..4b4fb9623ba09 100644 --- a/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java +++ b/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java @@ -80,27 +80,22 @@ public class PowerWhitelistManager { } /** - * Add the specified package to the power save whitelist. - * - * @return true if the package was successfully added to the whitelist + * Add the specified package to the permanent power save whitelist. */ @RequiresPermission(android.Manifest.permission.DEVICE_POWER) - public boolean addToWhitelist(@NonNull String packageName) { - return addToWhitelist(Collections.singletonList(packageName)) == 1; + public void addToWhitelist(@NonNull String packageName) { + addToWhitelist(Collections.singletonList(packageName)); } /** - * Add the specified packages to the power save whitelist. - * - * @return the number of packages that were successfully added to the whitelist + * Add the specified packages to the permanent power save whitelist. */ @RequiresPermission(android.Manifest.permission.DEVICE_POWER) - public int addToWhitelist(@NonNull List packageNames) { + public void addToWhitelist(@NonNull List packageNames) { try { - return mService.addPowerSaveWhitelistApps(packageNames); + mService.addPowerSaveWhitelistApps(packageNames); } catch (RemoteException e) { e.rethrowFromSystemServer(); - return 0; } } diff --git a/api/system-current.txt b/api/system-current.txt index 67f4ec5720806..fbb4e3cfb173c 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8839,8 +8839,8 @@ package android.os { } public class PowerWhitelistManager { - method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public boolean addToWhitelist(@NonNull String); - method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public int addToWhitelist(@NonNull java.util.List); + 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); method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void whitelistAppTemporarily(@NonNull String, long); method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public long whitelistAppTemporarilyForEvent(@NonNull String, int, @NonNull String); field public static final int EVENT_MMS = 2; // 0x2 diff --git a/api/test-current.txt b/api/test-current.txt index c83555a75ddfb..b5a7cb60faa5b 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2451,8 +2451,8 @@ package android.os { } public class PowerWhitelistManager { - method @RequiresPermission("android.permission.DEVICE_POWER") public boolean addToWhitelist(@NonNull String); - method @RequiresPermission("android.permission.DEVICE_POWER") public int addToWhitelist(@NonNull java.util.List); + method @RequiresPermission("android.permission.DEVICE_POWER") public void addToWhitelist(@NonNull String); + method @RequiresPermission("android.permission.DEVICE_POWER") public void addToWhitelist(@NonNull java.util.List); method @RequiresPermission("android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST") public void whitelistAppTemporarily(@NonNull String, long); method @RequiresPermission("android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST") public long whitelistAppTemporarilyForEvent(@NonNull String, int, @NonNull String); field public static final int EVENT_MMS = 2; // 0x2