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

Commit 823539be authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "CDM isDeviceAssociatedForWifiConnection returns false if no devices associated" into rvc-dev

parents 02082010 d3133ebf

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 {