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

Merge "Add @RequiresPermission annotation to reboot APIs" am: 147863d9fc am: dab92d5611

Browse Source 
Change-Id: I6d1bd40becf31ddf274c79dd34b38c90f5f83cbe
This commit is contained in:
Automerger Merge Worker
2020-01-28 11:04:18 +00:00
parent cfc5bfc703 dab92d5611
commit f613e166f2
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -35400,7 +35400,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";

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

@@ -1350,6 +1350,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(
@@ -1369,6 +1370,7 @@ public final class PowerManager {
* </p>
* @hide
*/
@RequiresPermission(permission.REBOOT)
public void rebootSafeMode() {
try {
mService.rebootSafeMode(false, true);