summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-01-08 13:02:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-08 13:02:02 +0000
commit639e6eb5cfd041e652ba9284076efd56bf64118c (patch)
tree9b4b72c8e0091f8a66322f57e30b6fb787deca1b
parentfe39a927b58ea563f567f94bd252fd490024df5f (diff)
parente88250ddfabec58fd19696e94ff725fc91635782 (diff)
Merge "Grant shell MANAGE_PROFILE_AND_DEVICE_OWNERS permission" am: 945be59043 am: e88250ddfa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530318 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0d1357ca43af78e20ce09ce8fbb727cdcd9a5bad
-rw-r--r--packages/Shell/AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 88eef6ab109a..741a6803a1e3 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -120,6 +120,7 @@
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
<uses-permission android:name="android.permission.CREATE_USERS" />
<uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
+ <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" />
<uses-permission android:name="android.permission.ACCESS_LOWPAN_STATE"/>
<uses-permission android:name="android.permission.CHANGE_LOWPAN_STATE"/>
<uses-permission android:name="android.permission.READ_LOWPAN_CREDENTIAL"/>