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

Merge "Fix system crash when unpair app" into sc-dev

Browse Source
This commit is contained in:
Evan Chen
2021-06-21 17:02:21 +00:00
committed by Android (Google) Code Review
parent 8f21448a7a 5f9987a5c0
commit 891f3034ea
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -753,9 +753,19 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
} }
return notMatch; return notMatch;
})); }));
restartBleScan();
} }
void onAssociationPreRemove(Association association) { void onAssociationPreRemove(Association association) {
if (association.isNotifyOnDeviceNearby()) {
ServiceConnector<ICompanionDeviceService> serviceConnector =
mDeviceListenerServiceConnectors.forUser(association.getUserId())
.get(association.getPackageName());
if (serviceConnector != null) {
serviceConnector.unbind();
}
}
String deviceProfile = association.getDeviceProfile(); String deviceProfile = association.getDeviceProfile();
if (deviceProfile != null) { if (deviceProfile != null) {
Association otherAssociationWithDeviceProfile = find( Association otherAssociationWithDeviceProfile = find(
@@ -787,16 +797,6 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
} }
} }
} }
if (association.isNotifyOnDeviceNearby()) {
ServiceConnector<ICompanionDeviceService> serviceConnector =
mDeviceListenerServiceConnectors.forUser(association.getUserId())
.get(association.getPackageName());
if (serviceConnector != null) {
serviceConnector.unbind();
restartBleScan();
}
}
} }
private void updateSpecialAccessPermissionForAssociatedPackage(Association association) { private void updateSpecialAccessPermissionForAssociatedPackage(Association association) {