summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorkholoud mohamed <kholoudm@google.com>2021-11-21 15:19:46 +0000
committerkholoud mohamed <kholoudm@google.com>2021-11-30 17:06:43 +0000
commit2f2bf87a6e0afdb99a555f2de328c31bf71bb014 (patch)
tree4a57916163af50511e778004a502d54a2af1523f /core/java
parent8620e8a4f9621724ba07345892d8b6a92e6b70f1 (diff)
Add QUERY_ADMIN_POLICY to some DevicePolicyManaged APIs
Allowed holders of QUERY_ADMIN_POLICY to access the following APIs: * getPermittedAccessibilityServices * getPermittedInputMethodsForCurrentUser Test: manual testing Bug: 188410712 Bug: 205707885 Bug: 206107027 Change-Id: I76b86313cadd23b51d486f76a3e8b52196d23c5f
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 5cfe09e98d2d..563299110f83 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -9140,7 +9140,9 @@ public class DevicePolicyManager {
* @hide
*/
@SystemApi
- @RequiresPermission(android.Manifest.permission.MANAGE_USERS)
+ @RequiresPermission(anyOf = {
+ android.Manifest.permission.MANAGE_USERS,
+ android.Manifest.permission.QUERY_ADMIN_POLICY})
public @Nullable List<String> getPermittedAccessibilityServices(int userId) {
throwIfParentInstance("getPermittedAccessibilityServices");
if (mService != null) {
@@ -9277,7 +9279,9 @@ public class DevicePolicyManager {
* @hide
*/
@SystemApi
- @RequiresPermission(android.Manifest.permission.MANAGE_USERS)
+ @RequiresPermission(anyOf = {
+ android.Manifest.permission.MANAGE_USERS,
+ android.Manifest.permission.QUERY_ADMIN_POLICY})
public @Nullable List<String> getPermittedInputMethodsForCurrentUser() {
throwIfParentInstance("getPermittedInputMethodsForCurrentUser");
if (mService != null) {