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

Commit 102f5632 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add permission necessary to use RecoverableKeyStoreLoader API."

parents 5daccec8 f9a89c18

api/system-current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -3125,6 +3125,12 @@ 
    <permission android:name="android.permission.BACKUP"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows application to manage RecoverableKeyStoreLoader.

    <p>Not for use by third-party applications.

         @hide -->

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

        android:protectionLevel="signature|privileged" />



    <!-- Allows a package to launch the secure full-backup confirmation UI.

         ONLY the system process may hold this permission.

         @hide -->