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

RESTRICT AUTOMERGE Relax security exception for backport

Browse Source 
The original backport for this bug threw an exception when the caller
didn't hold the INTERACT_ACROSS_USERS permission; even when it queried
for its own packages.

Now, we simply ignore the request to match any user.

Bug: 77821568
Test: manual
Change-Id: I5716b50a7fb18def20323b872ddef06fa9723b13
This commit is contained in:
Todd Kennedy
2018-07-18 06:57:33 -07:00
parent e43837e258
commit a2405766db
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4475,9 +4475,19 @@ public class PackageManagerService extends IPackageManager.Stub
if ((flags & PackageManager.MATCH_ANY_USER) != 0) {
// require the permission to be held; the calling uid and given user id referring
// to the same user is not sufficient
enforceCrossUserPermission(Binder.getCallingUid(), userId, false, false, true,
"MATCH_ANY_USER flag requires INTERACT_ACROSS_USERS permission at "
+ Debug.getCallers(5));
try {
enforceCrossUserPermission(Binder.getCallingUid(), userId, false, false, true,
"MATCH_ANY_USER flag requires INTERACT_ACROSS_USERS permission at "
+ Debug.getCallers(5));
} catch (SecurityException se) {
// For compatibility reasons, we can't throw a security exception here if we're
// looking for applications in our own user id. Instead, unset the MATCH_ANY_USER
// flag and move on.
if (userId != UserHandle.getCallingUserId()) {
throw se;
}
flags &= ~PackageManager.MATCH_ANY_USER;
}
} else if ((flags & PackageManager.MATCH_UNINSTALLED_PACKAGES) != 0 && isCallerSystemUser
&& sUserManager.hasManagedProfile(UserHandle.USER_SYSTEM)) {
// If the caller wants all packages and has a restricted profile associated with it,