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

Merge "Fix caller validation on secondary user." into nyc-dev

Browse Source 
am: d51b363c0d

* commit 'd51b363c0dff6bad46093db474ae314db33d0157':
  Fix caller validation on secondary user.
This commit is contained in:
Makoto Onuki
2016-03-11 18:06:02 +00:00
committed by android-build-merger
parent 0408672bcb d51b363c0d
commit a9e752f401
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/LauncherAppsService.java
View File

@@ -194,9 +194,10 @@ public class LauncherAppsService extends SystemService {
void verifyCallingPackage(String callingPackage) { void verifyCallingPackage(String callingPackage) {
int packageUid = -1; int packageUid = -1;
try { try {
packageUid = mPm.getPackageUid(callingPackage, packageUid = mPm.getPackageUidAsUser(callingPackage,
PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE
| PackageManager.MATCH_UNINSTALLED_PACKAGES); | PackageManager.MATCH_UNINSTALLED_PACKAGES,
UserHandle.getUserId(getCallingUid()));
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
Log.e(TAG, "Package not found: " + callingPackage); Log.e(TAG, "Package not found: " + callingPackage);
} }