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

Commit b000ad63 authored by Oli Lan's avatar Oli Lan
Browse files

Fix disavowal check when app installed in work profile only. 

This fixes an issue with the permission disavowal check that meant
that it failed when initiated from an app installed to the work
profile only.

Bug: 209586419
Test: manual - installed test app to work only and attempted scan
Change-Id: I36c249179ec159a684d4569e945f8f4404d76f0f
parent 5251d18a

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]