Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devicepolicy: use typed List<String> in AIDL

Browse Source 
Bug: 192615532
Test: m
Merged-In: I0ea1c35f7ce4dd6f6bde02874e02ed190fa2e904
Change-Id: I0ea1c35f7ce4dd6f6bde02874e02ed190fa2e904
(cherry picked from commit 57fe5105df)
This commit is contained in:
Jooyung Han
2021-08-19 15:40:16 +09:00
parent c1a5b99f86
commit 07db6330cb
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/app/admin/IDevicePolicyManager.aidl
View File

@@ -236,14 +236,14 @@ interface IDevicePolicyManager {
void addCrossProfileIntentFilter(in ComponentName admin, in IntentFilter filter, int flags); void addCrossProfileIntentFilter(in ComponentName admin, in IntentFilter filter, int flags);
void clearCrossProfileIntentFilters(in ComponentName admin); void clearCrossProfileIntentFilters(in ComponentName admin);
boolean setPermittedAccessibilityServices(in ComponentName admin,in List packageList); boolean setPermittedAccessibilityServices(in ComponentName admin,in List<String> packageList);
List getPermittedAccessibilityServices(in ComponentName admin); List<String> getPermittedAccessibilityServices(in ComponentName admin);
List getPermittedAccessibilityServicesForUser(int userId); List<String> getPermittedAccessibilityServicesForUser(int userId);
boolean isAccessibilityServicePermittedByAdmin(in ComponentName admin, String packageName, int userId); boolean isAccessibilityServicePermittedByAdmin(in ComponentName admin, String packageName, int userId);
boolean setPermittedInputMethods(in ComponentName admin,in List packageList, boolean parent); boolean setPermittedInputMethods(in ComponentName admin,in List<String> packageList, boolean parent);
List getPermittedInputMethods(in ComponentName admin, boolean parent); List<String> getPermittedInputMethods(in ComponentName admin, boolean parent);
List getPermittedInputMethodsForCurrentUser(); List<String> getPermittedInputMethodsForCurrentUser();
boolean isInputMethodPermittedByAdmin(in ComponentName admin, String packageName, int userId, boolean parent); boolean isInputMethodPermittedByAdmin(in ComponentName admin, String packageName, int userId, boolean parent);
boolean setPermittedCrossProfileNotificationListeners(in ComponentName admin, in List<String> packageList); boolean setPermittedCrossProfileNotificationListeners(in ComponentName admin, in List<String> packageList);

13
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -10094,7 +10094,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
} }
@Override @Override
public boolean setPermittedAccessibilityServices(ComponentName who, List packageList) { public boolean setPermittedAccessibilityServices(ComponentName who, List<String> packageList) {
if (!mHasFeature) { if (!mHasFeature) {
return false; return false;
} }
@@ -10146,7 +10146,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
} }
@Override @Override
public List getPermittedAccessibilityServices(ComponentName who) { public List<String> getPermittedAccessibilityServices(ComponentName who) {
if (!mHasFeature) { if (!mHasFeature) {
return null; return null;
} }
@@ -10161,7 +10161,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
} }
@Override @Override
public List getPermittedAccessibilityServicesForUser(int userId) { public List<String> getPermittedAccessibilityServicesForUser(int userId) {
if (!mHasFeature) { if (!mHasFeature) {
return null; return null;
} }
@@ -10247,7 +10247,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
} }
@Override @Override
public boolean setPermittedInputMethods(ComponentName who, List packageList, public boolean setPermittedInputMethods(ComponentName who, List<String> packageList,
boolean calledOnParentInstance) { boolean calledOnParentInstance) {
if (!mHasFeature) { if (!mHasFeature) {
return false; return false;
@@ -10311,7 +10311,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
} }
@Override @Override
public List getPermittedInputMethods(ComponentName who, boolean calledOnParentInstance) { public List<String> getPermittedInputMethods(ComponentName who,
boolean calledOnParentInstance) {
if (!mHasFeature) { if (!mHasFeature) {
return null; return null;
} }
@@ -10332,7 +10333,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
} }
@Override @Override
public List getPermittedInputMethodsForCurrentUser() { public List<String> getPermittedInputMethodsForCurrentUser() {
final CallerIdentity caller = getCallerIdentity(); final CallerIdentity caller = getCallerIdentity();
Preconditions.checkCallAuthorization(canManageUsers(caller)); Preconditions.checkCallAuthorization(canManageUsers(caller));