diff options
| author | Tony Mak <tonymak@google.com> | 2017-12-28 13:23:10 +0000 |
|---|---|---|
| committer | Tony Mak <tonymak@google.com> | 2018-01-04 13:11:50 +0000 |
| commit | d390ae9c7e2b115c47bee8a9cac924fd76e22c65 (patch) | |
| tree | 10175298357694ed511b1f99da719137a270f5b8 /core/java/android/os/UserManager.java | |
| parent | 7efb442ab4deab0b91d525ea8e9f4fad204bea92 (diff) | |
Adjust permission checking of ensureCanModifyQuietMode
Two changes:
1. Verify caller package matches with calling UID before checking
is it default launcher.
2. If IntentSender is specified, only caller with MANAGED_USERS
can call through it.
Test: run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.QuietModeHostsideTest
Bug: 70212757
Change-Id: Iac118d988eb05097a56f343552c0b8845cf96749
Diffstat (limited to 'core/java/android/os/UserManager.java')
| -rw-r--r-- | core/java/android/os/UserManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index dd9fd93ed472..38993b71a31d 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -2197,7 +2197,8 @@ public class UserManager { /** * Similar to {@link #trySetQuietModeEnabled(boolean, UserHandle)}, except you can specify - * a target to start when user is unlocked. + * a target to start when user is unlocked. If {@code target} is specified, caller must have + * the {@link android.Manifest.permission#MANAGE_USERS} permission. * * @see {@link #trySetQuietModeEnabled(boolean, UserHandle)} * @hide |