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

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

Merge "Use UserHandle created context to check package name." am: 8e270d76 am: f11c2e64 

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



Change-Id: I0dd90b1d9423eaa832937a243e91288ef0230131
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18dcde20 f11c2e64

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

+4 −1
Original line number Diff line number Diff line
@@ -372,9 +372,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);