Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c08393b authored by Jooyung Han's avatar Jooyung Han Committed by Android (Google) Code Review
Browse files

Merge "devicepolicy: use typed List<String> in AIDL" into stage-aosp-master

parents b55a7938 07db6330

core/java/android/app/admin/IDevicePolicyManager.aidl

+6 −6
Original line number Diff line number Diff line
@@ -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);

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+7 −6
Original line number Diff line number Diff line
@@ -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));