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

Merge "Allow system process to call getApplicationBlockedAsUser"

Browse Source
This commit is contained in:
Adam Connors
2014-06-05 11:20:15 +00:00
committed by Android (Google) Code Review
parent 138a7aea27 1a910ef2b4
commit d5259c8ea5
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -7829,13 +7829,9 @@ public class PackageManagerService extends IPackageManager.Stub {
@Override
public boolean getApplicationBlockedSettingAsUser(String packageName, int userId) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USERS, null);
enforceCrossUserPermission(Binder.getCallingUid(), userId, true,
"getApplicationBlocked for user " + userId);
PackageSetting pkgSetting;
final int uid = Binder.getCallingUid();
if (UserHandle.getUserId(uid) != userId) {
mContext.enforceCallingPermission(
android.Manifest.permission.INTERACT_ACROSS_USERS_FULL,
"getApplicationBlocked for user " + userId);
}
long callingId = Binder.clearCallingIdentity();
try {
// writer