diff options
| author | 2020-01-24 20:59:07 +0000 | |
|---|---|---|
| committer | 2020-01-27 10:58:30 +0000 | |
| commit | 169fbf6d5c7d0f3e921c6ac94c06bd4e7f9cd68d (patch) | |
| tree | 23f7a4c29c36c9c7081b3a3ead4e6619dc023f46 | |
| parent | 3f0a9dbf65f4dd239ef15a4a905dd4cd9dc2753f (diff) | |
Add @RequiresPermission annotation to reboot APIs
Test: builds
Bug: 148286076
Fixes: 148286076
Change-Id: If58234a2197655c51b8aa43d6966097046f5030a
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/PowerManager.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index fb7762947c9e..b18d2bcb1234 100644 --- a/api/current.txt +++ b/api/current.txt @@ -35399,7 +35399,7 @@ package android.os { method public boolean isSustainedPerformanceModeSupported(); method public boolean isWakeLockLevelSupported(int); method public android.os.PowerManager.WakeLock newWakeLock(int, String); - method public void reboot(@Nullable String); + method @RequiresPermission(android.Manifest.permission.REBOOT) public void reboot(@Nullable String); method public void removeThermalStatusListener(@NonNull android.os.PowerManager.OnThermalStatusChangedListener); field public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000 field public static final String ACTION_DEVICE_IDLE_MODE_CHANGED = "android.os.action.DEVICE_IDLE_MODE_CHANGED"; diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index febc36cbe47b..68c2764a78d7 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -1409,6 +1409,7 @@ public final class PowerManager { * @throws UnsupportedOperationException if userspace reboot was requested on a device that * doesn't support it. */ + @RequiresPermission(permission.REBOOT) public void reboot(@Nullable String reason) { if (REBOOT_USERSPACE.equals(reason) && !isRebootingUserspaceSupported()) { throw new UnsupportedOperationException( @@ -1428,6 +1429,7 @@ public final class PowerManager { * </p> * @hide */ + @RequiresPermission(permission.REBOOT) public void rebootSafeMode() { try { mService.rebootSafeMode(false, true); |