diff options
| author | 2021-08-19 15:40:16 +0900 | |
|---|---|---|
| committer | 2021-08-24 09:11:54 +0900 | |
| commit | 4d9fc0aea9fe66e5283bd8444c8f3b1439b1195c (patch) | |
| tree | 2b46fe6df82cc5615f02842c4c7edcb7e6b3e8ba | |
| parent | 5a76779d3afeb4b5c1431511dcc6a4e5b2fd0eb8 (diff) | |
devicepolicy: use typed List<String> in AIDL
Bug: 192615532
Test: m
Merged-In: I0ea1c35f7ce4dd6f6bde02874e02ed190fa2e904
Change-Id: I0ea1c35f7ce4dd6f6bde02874e02ed190fa2e904
| -rw-r--r-- | core/java/android/app/admin/IDevicePolicyManager.aidl | 12 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 3ad8b4b5294f..d28e489c885c 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -223,14 +223,14 @@ interface IDevicePolicyManager { void addCrossProfileIntentFilter(in ComponentName admin, in IntentFilter filter, int flags); void clearCrossProfileIntentFilters(in ComponentName admin); - boolean setPermittedAccessibilityServices(in ComponentName admin,in List packageList); - List getPermittedAccessibilityServices(in ComponentName admin); - List getPermittedAccessibilityServicesForUser(int userId); + boolean setPermittedAccessibilityServices(in ComponentName admin,in List<String> packageList); + List<String> getPermittedAccessibilityServices(in ComponentName admin); + List<String> getPermittedAccessibilityServicesForUser(int userId); boolean isAccessibilityServicePermittedByAdmin(in ComponentName admin, String packageName, int userId); - boolean setPermittedInputMethods(in ComponentName admin,in List packageList); - List getPermittedInputMethods(in ComponentName admin); - List getPermittedInputMethodsForCurrentUser(); + boolean setPermittedInputMethods(in ComponentName admin,in List<String> packageList); + List<String> getPermittedInputMethods(in ComponentName admin); + List<String> getPermittedInputMethodsForCurrentUser(); boolean isInputMethodPermittedByAdmin(in ComponentName admin, String packageName, int userId); boolean setPermittedCrossProfileNotificationListeners(in ComponentName admin, in List<String> packageList); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index d90894502ea1..5dfa86ea3709 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -10314,7 +10314,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } @Override - public boolean setPermittedAccessibilityServices(ComponentName who, List packageList) { + public boolean setPermittedAccessibilityServices(ComponentName who, List<String> packageList) { if (!mHasFeature) { return false; } @@ -10367,7 +10367,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } @Override - public List getPermittedAccessibilityServices(ComponentName who) { + public List<String> getPermittedAccessibilityServices(ComponentName who) { if (!mHasFeature) { return null; } @@ -10381,7 +10381,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } @Override - public List getPermittedAccessibilityServicesForUser(int userId) { + public List<String> getPermittedAccessibilityServicesForUser(int userId) { if (!mHasFeature) { return null; } @@ -10465,7 +10465,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } @Override - public boolean setPermittedInputMethods(ComponentName who, List packageList) { + public boolean setPermittedInputMethods(ComponentName who, List<String> packageList) { if (!mHasFeature) { return false; } @@ -10505,7 +10505,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } @Override - public List getPermittedInputMethods(ComponentName who) { + public List<String> getPermittedInputMethods(ComponentName who) { if (!mHasFeature) { return null; } @@ -10519,7 +10519,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } @Override - public List getPermittedInputMethodsForCurrentUser() { + public List<String> getPermittedInputMethodsForCurrentUser() { enforceManageUsers(); final int callingUserId = mInjector.userHandleGetCallingUserId(); |