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

Commit 76745199 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Use UserHandle created context to check package name." into tm-qpr-dev am: 676d5233 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20618386



Change-Id: Idef9d648d31ec126f4eb67ef6ecc9803a4739345
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8498e526 676d5233

android/app/src/com/android/bluetooth/Utils.java

+4 −1
Original line number Diff line number Diff line
@@ -373,9 +373,12 @@ public final class Utils { 
     */

    public static boolean isPackageNameAccurate(Context context, String callingPackage,

            int callingUid) {

        UserHandle callingUser = UserHandle.getUserHandleForUid(callingUid);



        // Verifies the integrity of the calling package name

        try {

            int packageUid = context.getPackageManager().getPackageUid(callingPackage, 0);

            int packageUid = context.createContextAsUser(callingUser, 0)

                    .getPackageManager().getPackageUid(callingPackage, 0);

            if (packageUid != callingUid) {

                Log.e(TAG, "isPackageNameAccurate: App with package name " + callingPackage

                        + " is UID " + packageUid + " but caller is " + callingUid);