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" into sc-dev-plus-aosp am: 233890d702

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15623884

Change-Id: I5da0698d0cc1571092f477b44de3f3e731f1c317
This commit is contained in:
TreeHugger Robot
2021-08-24 00:22:05 +00:00
committed by Automerger Merge Worker
parent 7ef03428d0 233890d702
commit b8838ca0e6
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 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, boolean parent);
List getPermittedInputMethods(in ComponentName admin, boolean parent);
List getPermittedInputMethodsForCurrentUser();
boolean setPermittedInputMethods(in ComponentName admin,in List<String> packageList, boolean parent);
List<String> getPermittedInputMethods(in ComponentName admin, boolean parent);
List<String> getPermittedInputMethodsForCurrentUser();
boolean isInputMethodPermittedByAdmin(in ComponentName admin, String packageName, int userId, boolean parent);
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
public boolean setPermittedAccessibilityServices(ComponentName who, List packageList) {
public boolean setPermittedAccessibilityServices(ComponentName who, List<String> packageList) {
if (!mHasFeature) {
return false;
}
@@ -10146,7 +10146,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
@Override
public List getPermittedAccessibilityServices(ComponentName who) {
public List<String> getPermittedAccessibilityServices(ComponentName who) {
if (!mHasFeature) {
return null;
}
@@ -10161,7 +10161,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
@Override
public List getPermittedAccessibilityServicesForUser(int userId) {
public List<String> getPermittedAccessibilityServicesForUser(int userId) {
if (!mHasFeature) {
return null;
}
@@ -10247,7 +10247,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
@Override
public boolean setPermittedInputMethods(ComponentName who, List packageList,
public boolean setPermittedInputMethods(ComponentName who, List<String> packageList,
boolean calledOnParentInstance) {
if (!mHasFeature) {
return false;
@@ -10311,7 +10311,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
@Override
public List getPermittedInputMethods(ComponentName who, boolean calledOnParentInstance) {
public List<String> getPermittedInputMethods(ComponentName who,
boolean calledOnParentInstance) {
if (!mHasFeature) {
return null;
}
@@ -10332,7 +10333,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
@Override
public List getPermittedInputMethodsForCurrentUser() {
public List<String> getPermittedInputMethodsForCurrentUser() {
final CallerIdentity caller = getCallerIdentity();
Preconditions.checkCallAuthorization(canManageUsers(caller));