Merge "Improve API signature."

This commit is contained in:
Kweku Adams
2020-02-13 17:13:42 +00:00
committed by Android (Google) Code Review
3 changed files with 10 additions and 15 deletions

View File

@@ -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<String> packageNames) {
public void addToWhitelist(@NonNull List<String> packageNames) {
try {
return mService.addPowerSaveWhitelistApps(packageNames);
mService.addPowerSaveWhitelistApps(packageNames);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
return 0;
}
}

View File

@@ -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<java.lang.String>);
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.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

View File

@@ -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<java.lang.String>);
method @RequiresPermission("android.permission.DEVICE_POWER") public void addToWhitelist(@NonNull String);
method @RequiresPermission("android.permission.DEVICE_POWER") public void addToWhitelist(@NonNull java.util.List<java.lang.String>);
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