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

Fix system crash when unpair app

Browse Source 
No need to restartBleScan after each unbind serviceSelector
restart ble scan after update the associations
Also, move unbind serviceSelector before the permission revoke since
permission revoking caused app crashed.

Fix: 190506983
Test: Manual test
Change-Id: Icc2a19f56295be4000155a4ccd6650a30e7c9b66
This commit is contained in:
Evan Chen
2021-06-08 17:17:19 +00:00
parent e6fb6087aa
commit 5f9987a5c0
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

@@ -759,9 +759,19 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
}
return notMatch;
}));
restartBleScan();
}
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();
if (deviceProfile != null) {
Association otherAssociationWithDeviceProfile = find(
@@ -793,16 +803,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) {