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

Merge "Dont throw an exception for non-system apps when enabling system apps."

Browse Source
This commit is contained in:
Nicolas Prevot
2015-02-11 14:27:47 +00:00
committed by Android (Google) Code Review
parent 97a366f9d7 0413046f12
commit 8b0c8ffb2d
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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(packageName, userId);
} else {
Slog.d(LOG_TAG, "Not enabling " + packageName + " since is not a"
+ " system app");
}
numberOfAppsInstalled++;
pm.installExistingPackageAsUser(info.activityInfo.packageName, userId);
}
}
}