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

Commit 84d99ea7 authored Mar 29, 2023 by Kholoud Mohamed Committed by Automerger Merge Worker Mar 29, 2023

Merge "Add parameter callerPackage to setApplicationExemptions for metrics...

Merge "Add parameter callerPackage to setApplicationExemptions for metrics test" into udc-dev am: 342bac9d

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

Change-Id: I91e4e7813000c4b53ee7f89cb2b9354b4a603e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 746a5ce7 342bac9d

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15775,7 +15775,7 @@ public class DevicePolicyManager {
	throwIfParentInstance("setApplicationExemptions");		throwIfParentInstance("setApplicationExemptions");
	if (mService != null) {		if (mService != null) {
	try {		try {
	mService.setApplicationExemptions(packageName,		mService.setApplicationExemptions(mContext.getPackageName(), packageName,
	ArrayUtils.convertToIntArray(new ArraySet<>(exemptions)));		ArrayUtils.convertToIntArray(new ArraySet<>(exemptions)));
	} catch (ServiceSpecificException e) {		} catch (ServiceSpecificException e) {
	switch (e.errorCode) {		switch (e.errorCode) {

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

+1 −1

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

	List<UserHandle> getPolicyManagedProfiles(in UserHandle userHandle);		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);		int[] getApplicationExemptions(String packageName);

	void setMtePolicy(int flag, String callerPackageName);		void setMtePolicy(int flag, String callerPackageName);

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

+3 −2

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

	@Override		@Override
	public void setApplicationExemptions(String packageName, int[] exemptions) {		public void setApplicationExemptions(String callerPackage, String packageName,
			int[] exemptions) {
	if (!mHasFeature) {		if (!mHasFeature) {
	return;		return;
	}		}
	@@ -19665,7 +19666,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
	Preconditions.checkCallAuthorization(		Preconditions.checkCallAuthorization(
	hasCallingOrSelfPermission(permission.MANAGE_DEVICE_POLICY_APP_EXEMPTIONS));		hasCallingOrSelfPermission(permission.MANAGE_DEVICE_POLICY_APP_EXEMPTIONS));

	final CallerIdentity caller = getCallerIdentity();		final CallerIdentity caller = getCallerIdentity(callerPackage);
	final ApplicationInfo packageInfo;		final ApplicationInfo packageInfo;
	packageInfo = getPackageInfoWithNullCheck(packageName, caller);		packageInfo = getPackageInfoWithNullCheck(packageName, caller);