Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f613e166 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add @RequiresPermission annotation to reboot APIs" am: 147863d9 am: dab92d56 

Change-Id: I6d1bd40becf31ddf274c79dd34b38c90f5f83cbe
parents cfc5bfc7 dab92d56

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -35400,7 +35400,7 @@ package android.os { 
    method public boolean isSustainedPerformanceModeSupported();

    method public boolean isSustainedPerformanceModeSupported();

    method public boolean isWakeLockLevelSupported(int);

    method public boolean isWakeLockLevelSupported(int);

    method public android.os.PowerManager.WakeLock newWakeLock(int, String);

    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);

    method public void removeThermalStatusListener(@NonNull android.os.PowerManager.OnThermalStatusChangedListener);

    field public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000

    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";

    field public static final String ACTION_DEVICE_IDLE_MODE_CHANGED = "android.os.action.DEVICE_IDLE_MODE_CHANGED";

core/java/android/os/PowerManager.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -1350,6 +1350,7 @@ public final class PowerManager { 
     * @throws UnsupportedOperationException if userspace reboot was requested on a device that

     * @throws UnsupportedOperationException if userspace reboot was requested on a device that

     *                                       doesn't support it.

     *                                       doesn't support it.

     */

     */

    @RequiresPermission(permission.REBOOT)

    public void reboot(@Nullable String reason) {

    public void reboot(@Nullable String reason) {

        if (REBOOT_USERSPACE.equals(reason) && !isRebootingUserspaceSupported()) {

        if (REBOOT_USERSPACE.equals(reason) && !isRebootingUserspaceSupported()) {

            throw new UnsupportedOperationException(

            throw new UnsupportedOperationException(
@@ -1369,6 +1370,7 @@ public final class PowerManager { 
     * </p>

     * </p>

     * @hide

     * @hide

     */

     */

    @RequiresPermission(permission.REBOOT)

    public void rebootSafeMode() {

    public void rebootSafeMode() {

        try {

        try {

            mService.rebootSafeMode(false, true);

            mService.rebootSafeMode(false, true);