diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-10-08 14:07:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-08 14:07:35 +0000 |
commit | 06aa91e2ea9a2c9983f6d74019e4b9a64e65d21a (patch) | |
tree | 7b5437af5023d72dc01cb2130c7877b30fe086b3 | |
parent | 6edc8b7cdaecb616d4805efe3fdd36221660147f (diff) | |
parent | e456e2f66e2c9b3207be68cb86f64133930e03c0 (diff) | |
download | base-06aa91e2ea9a2c9983f6d74019e4b9a64e65d21a.tar.gz |
Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545
Change-Id: I515f8aee139f7ae5973c498c15163fadfb630414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index cbe81ead2ceb..1abbfa352374 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -11032,6 +11032,15 @@ public class DevicePolicyManager { * Attempts by the admin to grant these permissions, when the admin is restricted from doing * so, will be silently ignored (no exception will be thrown). * + * Control over the following permissions are restricted for managed profile owners: + * <ul> + * <li>Manifest.permission.READ_SMS</li> + * </ul> + * <p> + * A managed profile owner may not grant these permissions (i.e. call this method with any of + * the permissions listed above and {@code grantState} of + * {@code #PERMISSION_GRANT_STATE_GRANTED}), but may deny them. + * * @param admin Which profile or device owner this request is associated with. * @param packageName The application to grant or revoke a permission to. * @param permission The permission to grant or revoke. |