Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1b8a1e5 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

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

am: a9e752f4

* commit 'a9e752f4':
  Fix caller validation on secondary user.
parents 94ae1241 a9e752f4

services/core/java/com/android/server/pm/LauncherAppsService.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

            }