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

Commit d3918a12 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "CDM isDeviceAssociatedForWifiConnection returns false if no devices... 

Merge "CDM isDeviceAssociatedForWifiConnection returns false if no devices associated" into rvc-dev am: 823539be am: 7605a4d5 am: cbd37356

Change-Id: Idb2fc6026f4727e84584449b890c98665ac23005
parents d6eb3fa7 cbd37356

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -369,10 +369,13 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
            boolean bypassMacPermission = getContext().getPackageManager().checkPermission(

                    android.Manifest.permission.COMPANION_APPROVE_WIFI_CONNECTIONS, packageName)

                    == PackageManager.PERMISSION_GRANTED;

            if (bypassMacPermission) {

                return true;

            }



            return CollectionUtils.any(

                    readAllAssociations(userId, packageName),

                    a -> bypassMacPermission || Objects.equals(a.deviceAddress, macAddress));

                    a -> Objects.equals(a.deviceAddress, macAddress));

        }



        private void checkCanCallNotificationApi(String callingPackage) throws RemoteException {