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

Commit 9c25216c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "devicepolicy: use typed List<String> in AIDL" into sc-dev-plus-aosp am:... 

Merge "devicepolicy: use typed List<String> in AIDL" into sc-dev-plus-aosp am: 233890d7 am: b8838ca0 am: 3dc8021c

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

Change-Id: I911a015ce5ff3ee2b35bf26783960864a3f2631c
parents 7058a51d 3dc8021c

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
@@ -10110,7 +10110,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;















        }










@@ -10162,7 +10162,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













    }





























    @Override













    public List getPermittedAccessibilityServices(ComponentName who) {













    public List<String> getPermittedAccessibilityServices(ComponentName who) {















        if (!mHasFeature) {















            return null;















        }









@@ -10177,7 +10177,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













    }





























    @Override













    public List getPermittedAccessibilityServicesForUser(int userId) {













    public List<String> getPermittedAccessibilityServicesForUser(int userId) {















        if (!mHasFeature) {















            return null;















        }










@@ -10263,7 +10263,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;










@@ -10327,7 +10327,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;















        }









@@ -10348,7 +10349,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













    }





























    @Override













    public List getPermittedInputMethodsForCurrentUser() {













    public List<String> getPermittedInputMethodsForCurrentUser() {















        final CallerIdentity caller = getCallerIdentity();















        Preconditions.checkCallAuthorization(canManageUsers(caller));