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

Commit 5bddee5d authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3e32e5e7fdc894bf2ce92fe955c92207e4d0fb4
parents 8f2b5071 5eeae4c7

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -3070,6 +3070,11 @@ 
    <permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"

        android:protectionLevel="signature|privileged" />



    <!-- Allows an application to set, update and remove the credential management app.

         @hide -->

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

        android:protectionLevel="signature" />



    <!-- ========================================= -->

    <!-- Permissions for special development tools -->

    <!-- ========================================= -->