summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-08 12:05:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-08 12:05:20 +0000
commit676cefb0eee79e9246199e93b46f9ee1a786924c (patch)
tree0198c013a8f053e4db3ba75035e7ee465a13f80b
parent64e4cbc1d84c8c710dd10d01064db4150004842c (diff)
parent62044e5099438397e32730cc5ff34fb4d6c4fd1d (diff)
Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545 Change-Id: I3bf51cd6e7046c7e128f1008ed830c5e02603f88 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java9
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 14587053435a..c3e777f584ed 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -8836,6 +8836,15 @@ public class DevicePolicyManager {
* {@link android.os.Build.VERSION_CODES#M} the app-op matching the permission is set to
* {@link android.app.AppOpsManager#MODE_IGNORED}, but the permission stays granted.
*
+ * 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.