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

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

View File

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