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

Commit 118c274b authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Fix disavowal check when app installed in work profile only." am: 852804a5 am: 2a1c400f 

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



Change-Id: I8f9462c6c0b92f73bb3f1e6ae71dc636bdd7518d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 37a22d63 2a1c400f

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

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.bluetooth.BluetoothUtils.USER_HANDLE_NULL; 
import static android.content.PermissionChecker.PERMISSION_HARD_DENIED;

import static android.content.PermissionChecker.PID_UNKNOWN;

import static android.content.pm.PackageManager.GET_PERMISSIONS;

import static android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.os.PowerExemptionManager.TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_ALLOWED;
@@ -588,7 +589,8 @@ public final class Utils { 
        PackageManager pm = context.getPackageManager();

        try {

            // TODO(b/183478032): Cache PackageInfo for use here.

            PackageInfo pkgInfo = pm.getPackageInfo(packageName, GET_PERMISSIONS);

            PackageInfo pkgInfo =

                    pm.getPackageInfo(packageName, GET_PERMISSIONS | MATCH_UNINSTALLED_PACKAGES);

            for (int i = 0; i < pkgInfo.requestedPermissions.length; i++) {

                if (pkgInfo.requestedPermissions[i].equals(BLUETOOTH_SCAN)) {

                    return (pkgInfo.requestedPermissionsFlags[i]