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

Commit 7e3ab781 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 am: 5bddee5d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7967cc8c972f5d141ba83a7e2cb882ddb529c663
parents 559fd17e 5bddee5d

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -3077,6 +3077,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 -->

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