Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CDM isDeviceAssociatedForWifiConnection returns false if no devices associated" into rvc-dev am: 823539be20

Browse Source 
Change-Id: If41df9218c8bbb0648cc7b450bb9dd708bea8023
This commit is contained in:
Automerger Merge Worker
2020-02-29 04:52:43 +00:00
parent a34f970d7a 823539be20
commit 7605a4d57e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -369,10 +369,13 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
boolean bypassMacPermission = getContext().getPackageManager().checkPermission( boolean bypassMacPermission = getContext().getPackageManager().checkPermission(
android.Manifest.permission.COMPANION_APPROVE_WIFI_CONNECTIONS, packageName) android.Manifest.permission.COMPANION_APPROVE_WIFI_CONNECTIONS, packageName)
== PackageManager.PERMISSION_GRANTED; == PackageManager.PERMISSION_GRANTED;
if (bypassMacPermission) {
return true;
}
return CollectionUtils.any( return CollectionUtils.any(
readAllAssociations(userId, packageName), readAllAssociations(userId, packageName),
a -> bypassMacPermission || Objects.equals(a.deviceAddress, macAddress)); a -> Objects.equals(a.deviceAddress, macAddress));
} }
private void checkCanCallNotificationApi(String callingPackage) throws RemoteException { private void checkCanCallNotificationApi(String callingPackage) throws RemoteException {