Merge "Dont throw an exception for non-system apps when enabling system apps." (8b0c8ffb) · Commits · e / os / android_frameworks_base

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

+7 −8

Original line number	Diff line number	Diff line
		@@ -5045,15 +5045,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		if (activitiesToEnable != null) {
		for (ResolveInfo info : activitiesToEnable) {
		if (info.activityInfo != null) {

		if (!isSystemApp(pm, info.activityInfo.packageName, primaryUser.id)) {
		throw new IllegalArgumentException(
		"Only system apps can be enabled this way.");
		}


		String packageName = info.activityInfo.packageName;
		if (isSystemApp(pm, packageName, primaryUser.id)) {
		numberOfAppsInstalled++;
		pm.installExistingPackageAsUser(info.activityInfo.packageName, userId);
		pm.installExistingPackageAsUser(packageName, userId);
		} else {
		Slog.d(LOG_TAG, "Not enabling " + packageName + " since is not a"
		+ " system app");
		}
		}
		}
		}