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

Merge "Need to check isManagedByCompanionApp before calling getMacAddress()"

Browse Source
This commit is contained in:
Evan Chen
2021-11-05 05:31:30 +00:00
committed by Android (Google) Code Review
parent efa0f1cdb6 8377f912d6
commit c8231b405d
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -775,12 +775,14 @@ public class CompanionDeviceManagerService extends SystemService {
exemptFromAutoRevoke(packageInfo.packageName, packageInfo.applicationInfo.uid);
if (mCurrentlyConnectedDevices.contains(association.getDeviceMacAddress())) {
grantDeviceProfile(association);
}
if (!association.isManagedByCompanionApp()) {
if (mCurrentlyConnectedDevices.contains(association.getDeviceMacAddress())) {
grantDeviceProfile(association);
}
if (association.isNotifyOnDeviceNearby()) {
restartBleScan();
if (association.isNotifyOnDeviceNearby()) {
restartBleScan();
}
}
}
@@ -1217,6 +1219,9 @@ public class CompanionDeviceManagerService extends SystemService {
ArrayList<ScanFilter> result = new ArrayList<>();
ArraySet<String> addressesSeen = new ArraySet<>();
for (AssociationInfo association : getAllAssociations()) {
if (association.isManagedByCompanionApp()) {
continue;
}
String address = association.getDeviceMacAddress();
if (addressesSeen.contains(address)) {
continue;