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

Commit 7605a4d5 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

Change-Id: If41df9218c8bbb0648cc7b450bb9dd708bea8023
parents a34f970d 823539be

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 {