Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unnecessary permission check." into sc-dev

Browse Source
This commit is contained in:
Kweku Adams
2021-02-22 16:55:01 +00:00
committed by Android (Google) Code Review
parent d7eae488be e57d5ac376
commit 0c89d4b843
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -8580,7 +8580,7 @@ package android.os {
method @RequiresPermission(allOf={android.Manifest.permission.READ_DREAM_STATE, android.Manifest.permission.WRITE_DREAM_STATE}) public void dream(long);
method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public boolean forceSuspend();
method @NonNull public android.os.BatterySaverPolicyConfig getFullPowerSavePolicy();
method @RequiresPermission(android.Manifest.permission.POWER_SAVER) public int getPowerSaveModeTrigger();
method public int getPowerSaveModeTrigger();
method @RequiresPermission(android.Manifest.permission.READ_DREAM_STATE) public boolean isAmbientDisplayAvailable();
method @RequiresPermission(android.Manifest.permission.READ_DREAM_STATE) public boolean isAmbientDisplaySuppressed();
method @RequiresPermission(android.Manifest.permission.READ_DREAM_STATE) public boolean isAmbientDisplaySuppressedForToken(@NonNull String);

5
core/java/android/os/PowerManager.java
View File

@@ -1881,6 +1881,10 @@ public final class PowerManager {
* Returns the current battery saver control mode. Values it may return are defined in
* AutoPowerSaveModeTriggers. Note that this is a global device state, not a per user setting.
*
* <p>Note: Prior to Android version {@link Build.VERSION_CODES#S}, any app calling this method
* was required to hold the {@link android.Manifest.permission#POWER_SAVER} permission. Starting
* from Android version {@link Build.VERSION_CODES#S}, that permission is no longer required.
*
* @return The current value power saver mode for the system.
*
* @see AutoPowerSaveModeTriggers
@@ -1889,7 +1893,6 @@ public final class PowerManager {
*/
@AutoPowerSaveModeTriggers
@SystemApi
@RequiresPermission(android.Manifest.permission.POWER_SAVER)
public int getPowerSaveModeTrigger() {
try {
return mService.getPowerSaveModeTrigger();

1
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -5121,7 +5121,6 @@ public final class PowerManagerService extends SystemService
@Override // Binder call
public int getPowerSaveModeTrigger() {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.POWER_SAVER, null);
final long ident = Binder.clearCallingIdentity();
try {
return Settings.Global.getInt(mContext.getContentResolver(),