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

Commit f0433e50 authored by Doug Zongker's avatar Doug Zongker Committed by Android (Google) Code Review
Browse files

Merge "@hide RECOVERY permission" into lmp-dev

parents f3076330 183415e5

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ package android { 
    field public static final java.lang.String RECEIVE_SMS = "android.permission.RECEIVE_SMS";

    field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";

    field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO";

    field public static final java.lang.String RECOVERY = "android.permission.RECOVERY";

    field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS";

    field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";

    field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";
@@ -22810,7 +22809,6 @@ package android.os { 
    field public static final deprecated int FULL_WAKE_LOCK = 26; // 0x1a

    field public static final int ON_AFTER_RELEASE = 536870912; // 0x20000000

    field public static final int PARTIAL_WAKE_LOCK = 1; // 0x1

    field public static final java.lang.String REBOOT_RECOVERY = "recovery";

    field public static final deprecated int SCREEN_BRIGHT_WAKE_LOCK = 10; // 0xa

    field public static final deprecated int SCREEN_DIM_WAKE_LOCK = 6; // 0x6

  }

core/java/android/os/PowerManager.java

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ public final class PowerManager { 
     * permission (in addition to

     * {@link android.Manifest.permission#REBOOT}).

     * </p>

     * @hide

     */

    public static final String REBOOT_RECOVERY = "recovery";

core/java/android/os/RecoverySystem.java

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ public class RecoverySystem { 


        // Having written the command file, go ahead and reboot

        PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);

        pm.reboot("recovery");

        pm.reboot(PowerManager.REBOOT_RECOVERY);



        throw new IOException("Reboot failed (no permissions?)");

    }

core/res/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -1852,7 +1852,8 @@ 
        android:description="@string/permdesc_manageCaCertificates" />



    <!-- @SystemApi Allows an application to do certain operations needed for

         interacting with the recovery (system update) system. -->

         interacting with the recovery (system update) system.

         @hide -->

    <permission android:name="android.permission.RECOVERY"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="signature|system"