Merge "Fix leaks of personal apps in setApplicationHidden" into rvc-dev am:... (7dadf595) · Commits · e / os / android_frameworks_base

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

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -10912,9 +10912,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

	private void enforcePackageIsSystemPackage(String packageName, int userId)		private void enforcePackageIsSystemPackage(String packageName, int userId)
	throws RemoteException {		throws RemoteException {
	if (!isSystemApp(mIPackageManager, packageName, userId)) {		boolean isSystem;
	throw new IllegalArgumentException(		try {
	"The provided package is not a system package");		isSystem = isSystemApp(mIPackageManager, packageName, userId);
			} catch (IllegalArgumentException e) {
			isSystem = false;
			}
			if (!isSystem) {
			throw new IllegalArgumentException("The provided package is not a system package");
	}		}
	}		}