summaryrefslogtreecommitdiff
path: root/core/res
diff options
context:
space:
mode:
authorRubin Xu <rubinxu@google.com>2021-02-17 23:17:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-17 23:17:40 +0000
commit5bddee5dda26bcf6b9cb1a71c3d23627800ad19b (patch)
tree0122dff885455f75ee3a93782ff1a1355fd28f2c /core/res
parent8f2b5071b318621638fe55b4217b72382a3e8896 (diff)
parent5eeae4c716725be34b29ad019cfd0955288dc508 (diff)
Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c716
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571063 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib3e32e5e7fdc894bf2ce92fe955c92207e4d0fb4
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index c5eb185b135a..d1e6111dc35f 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -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 -->
<!-- ========================================= -->