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

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

Browse Source
This commit is contained in:
Kholoud Mohamed
2023-03-29 12:32:06 +00:00
committed by Android (Google) Code Review
parent 33a026ae3c 0956ffd338
commit 342bac9df9
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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) {

2
core/java/android/app/admin/IDevicePolicyManager.aidl
View File

@@ -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);

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

@@ -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);