Merge "Need to check isManagedByCompanionApp before calling getMacAddress()" (c8231b40) · Commits · e / os / android_frameworks_base

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

+10 −5

Original line number	Diff line number	Diff line
		@@ -775,6 +775,7 @@ public class CompanionDeviceManagerService extends SystemService {

		exemptFromAutoRevoke(packageInfo.packageName, packageInfo.applicationInfo.uid);

		if (!association.isManagedByCompanionApp()) {
		if (mCurrentlyConnectedDevices.contains(association.getDeviceMacAddress())) {
		grantDeviceProfile(association);
		}
		@@ -783,6 +784,7 @@ public class CompanionDeviceManagerService extends SystemService {
		restartBleScan();
		}
		}
		}

		private void exemptFromAutoRevoke(String packageName, int uid) {
		try {
		@@ -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;