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

Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev

Browse Source
This commit is contained in:
Jessica Hummel
2014-09-19 14:22:42 +00:00
committed by Android (Google) Code Review
parent 7bfa35742a dd31a10c7f
commit ccfa1a9799
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
package com.android.server.devicepolicy;
import static android.Manifest.permission.MANAGE_CA_CERTIFICATES;
import static android.content.pm.PackageManager.GET_UNINSTALLED_PACKAGES;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.accounts.AccountManager;
@@ -4801,19 +4802,19 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
long id = Binder.clearCallingIdentity();
try {
UserManager um = UserManager.get(mContext);
if (!um.getUserInfo(userId).isManagedProfile()) {
throw new IllegalStateException(
"Only call this method from a managed profile.");
}
UserInfo primaryUser = um.getProfileParent(userId);
if (DBG) {
Slog.v(LOG_TAG, "installing " + packageName + " for "
+ userId);
}
UserManager um = UserManager.get(mContext);
UserInfo primaryUser = um.getProfileParent(userId);
// Call did not come from a managed profile
if (primaryUser == null) {
primaryUser = um.getUserInfo(userId);
}
IPackageManager pm = AppGlobals.getPackageManager();
if (!isSystemApp(pm, packageName, primaryUser.id)) {
throw new IllegalArgumentException("Only system apps can be enabled this way.");
@@ -4847,13 +4848,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
try {
UserManager um = UserManager.get(mContext);
if (!um.getUserInfo(userId).isManagedProfile()) {
throw new IllegalStateException(
"Only call this method from a managed profile.");
}
UserInfo primaryUser = um.getProfileParent(userId);
// Call did not come from a managed profile.
if (primaryUser == null) {
primaryUser = um.getUserInfo(userId);
}
IPackageManager pm = AppGlobals.getPackageManager();
List<ResolveInfo> activitiesToEnable = pm.queryIntentActivities(intent,
intent.resolveTypeIfNeeded(mContext.getContentResolver()),
@@ -4890,7 +4891,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
private boolean isSystemApp(IPackageManager pm, String packageName, int userId)
throws RemoteException {
ApplicationInfo appInfo = pm.getApplicationInfo(packageName, 0, userId);
ApplicationInfo appInfo = pm.getApplicationInfo(packageName, GET_UNINSTALLED_PACKAGES,
userId);
return (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) > 0;
}