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

Commit d1087e74 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 5b65be96: am 370c27c7: am 705ba960: Merge "Qualify the uid with the userId... 

am 5b65be96: am 370c27c7: am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev

* commit '5b65be96':
  Qualify the uid with the userId when granting permissions
parents a7bdd2f9 5b65be96

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

+1 −1
Original line number Diff line number Diff line
@@ -3383,7 +3383,7 @@ public class PackageManagerService extends IPackageManager.Stub { 














            enforceDeclaredAsUsedAndRuntimePermission(pkg, bp);



























            uid = pkg.applicationInfo.uid;













            uid = UserHandle.getUid(userId, pkg.applicationInfo.uid);















            sb = (SettingBase) pkg.mExtras;















            if (sb == null) {















                throw new IllegalArgumentException("Unknown package: " + packageName);