summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-08 15:39:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-08 15:39:16 +0000
commit45ee517849761ef5390c3f6f04ad9cc3532960af (patch)
tree91f15f8ceb0a25c7c29e8290d15a97c08a6d6447
parent5bc2c3a0a4a94f5fc1c1a911f3e261885a433a05 (diff)
parent4e8fadf947d6151e2ac4e03399fd125aebafb0fc (diff)
Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e am: fe2c3c269b am: e7253363d2 am: 4e8fadf947
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545 Change-Id: I0ee23dd054e2e2a0ce52b36860baa463a6a052d7 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 34c91c360dbe..8e09939f6805 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -12150,6 +12150,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.