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

Commit 342bac9d authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "Add parameter callerPackage to setApplicationExemptions for metrics test" into udc-dev

parents 33a026ae 0956ffd3

core/java/android/app/admin/DevicePolicyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -15775,7 +15775,7 @@ public class DevicePolicyManager { 
        throwIfParentInstance("setApplicationExemptions");

        if (mService != null) {

            try {

                mService.setApplicationExemptions(packageName,

                mService.setApplicationExemptions(mContext.getPackageName(), packageName,

                        ArrayUtils.convertToIntArray(new ArraySet<>(exemptions)));

            } catch (ServiceSpecificException e) {

                switch (e.errorCode) {

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

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ interface IDevicePolicyManager { 


    List<UserHandle> getPolicyManagedProfiles(in UserHandle userHandle);



    void setApplicationExemptions(String packageName, in int[]exemptions);

    void setApplicationExemptions(String callerPackage, String packageName, in int[]exemptions);

    int[] getApplicationExemptions(String packageName);



    void setMtePolicy(int flag, String callerPackageName);

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

+3 −2
Original line number Diff line number Diff line
@@ -19654,7 +19654,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    }















    @Override













    public void setApplicationExemptions(String packageName, int[] exemptions) {













    public void setApplicationExemptions(String callerPackage, String packageName,













            int[] exemptions) {















        if (!mHasFeature) {















            return;















        }









@@ -19665,7 +19666,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        Preconditions.checkCallAuthorization(















                hasCallingOrSelfPermission(permission.MANAGE_DEVICE_POLICY_APP_EXEMPTIONS));



























        final CallerIdentity caller = getCallerIdentity();













        final CallerIdentity caller = getCallerIdentity(callerPackage);















        final ApplicationInfo packageInfo;















        packageInfo = getPackageInfoWithNullCheck(packageName, caller);