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

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

Merge "hide RECOVERY permission from L preview -- DO NOT MERGE" into lmp-preview-dev

parents 554f5406 c302e4d3

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,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";

core/java/android/os/PowerManager.java

+0 −5
Original line number Diff line number Diff line
@@ -314,11 +314,6 @@ public final class PowerManager { 
     * The value to pass as the 'reason' argument to reboot() to

     * reboot into recovery mode (for applying system updates, doing

     * factory resets, etc.).

     * <p>

     * Requires the {@link android.Manifest.permission#RECOVERY}

     * permission (in addition to

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

     * </p>

     */

    public static final String REBOOT_RECOVERY = "recovery";

core/res/AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -1746,8 +1746,10 @@ 
        android:label="@string/permlab_manageCaCertificates"

        android:description="@string/permdesc_manageCaCertificates" />



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

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

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

         needed for 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"