diff options
| author | 2022-10-08 14:08:37 +0000 | |
|---|---|---|
| committer | 2022-10-08 14:08:37 +0000 | |
| commit | fe2c3c269b47b0c33b95dae1d22245c3575ac2e0 (patch) | |
| tree | 88ed254861ec044f5f1f43ba8c177dae8f3484fa | |
| parent | ce4b0d45ac34f0a5a125490d744d4b5e544574eb (diff) | |
| parent | e456e2f66e2c9b3207be68cb86f64133930e03c0 (diff) | |
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: I4cb1023e1b292806706574119291a2480bed2fe7
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 141a4fcce29c..a4158d207f51 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -11053,6 +11053,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. |