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

Merge "devicepolicy: use typed List<String> in AIDL"

Browse Source
This commit is contained in:
Treehugger Robot
2021-08-31 09:16:30 +00:00
committed by Gerrit Code Review
parent 54beaf2012 4d9fc0aea9
commit c2cbf5d420
2 changed files with 12 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

@@ -223,14 +223,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 setPermittedInputMethods(in ComponentName admin,in List<String> packageList);
List getPermittedInputMethods(in ComponentName admin); List<String> getPermittedInputMethods(in ComponentName admin);
List getPermittedInputMethodsForCurrentUser(); List<String> getPermittedInputMethodsForCurrentUser();
boolean isInputMethodPermittedByAdmin(in ComponentName admin, String packageName, int userId); boolean isInputMethodPermittedByAdmin(in ComponentName admin, String packageName, int userId);
boolean setPermittedCrossProfileNotificationListeners(in ComponentName admin, in List<String> packageList); boolean setPermittedCrossProfileNotificationListeners(in ComponentName admin, in List<String> packageList);

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

@@ -10314,7 +10314,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;
} }
@@ -10367,7 +10367,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;
} }
@@ -10381,7 +10381,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;
} }
@@ -10465,7 +10465,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
} }
@Override @Override
public boolean setPermittedInputMethods(ComponentName who, List packageList) { public boolean setPermittedInputMethods(ComponentName who, List<String> packageList) {
if (!mHasFeature) { if (!mHasFeature) {
return false; return false;
} }
@@ -10505,7 +10505,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
} }
@Override @Override
public List getPermittedInputMethods(ComponentName who) { public List<String> getPermittedInputMethods(ComponentName who) {
if (!mHasFeature) { if (!mHasFeature) {
return null; return null;
} }
@@ -10519,7 +10519,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
} }
@Override @Override
public List getPermittedInputMethodsForCurrentUser() { public List<String> getPermittedInputMethodsForCurrentUser() {
enforceManageUsers(); enforceManageUsers();
final int callingUserId = mInjector.userHandleGetCallingUserId(); final int callingUserId = mInjector.userHandleGetCallingUserId();