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

Merge "Fix CDM device disconnected callback immediately triggering "device disappeared"" into sc-dev am: 4fd089549e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13819012

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf76c516165eb9b8b85bb46d6cfb366f162d2730
This commit is contained in:
Eugene Susla
2021-03-10 21:14:37 +00:00
committed by Automerger Merge Worker
parent 9d6d67c25e 4fd089549e
commit e68540ac92
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -804,6 +804,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
.get(association.getPackageName());
if (serviceConnector != null) {
serviceConnector.unbind();
restartBleScan();
}
}
}
@@ -1106,11 +1107,19 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
}
void onDeviceDisconnected(String address) {
Slog.d(LOG_TAG, "onDeviceConnected(address = " + address + ")");
Slog.d(LOG_TAG, "onDeviceDisconnected(address = " + address + ")");
mCurrentlyConnectedDevices.remove(address);
onDeviceDisappeared(address);
Date lastSeen = mDevicesLastNearby.get(address);
if (isDeviceDisappeared(lastSeen)) {
onDeviceDisappeared(address);
}
}
private boolean isDeviceDisappeared(Date lastSeen) {
return lastSeen == null || System.currentTimeMillis() - lastSeen.getTime()
>= DEVICE_DISAPPEARED_UNBIND_TIMEOUT_MS;
}
private ServiceConnector<ICompanionDeviceService> getDeviceListenerServiceConnector(
@@ -1211,8 +1220,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
String address = mDevicesLastNearby.keyAt(i);
Date lastNearby = mDevicesLastNearby.valueAt(i);
if (System.currentTimeMillis() - lastNearby.getTime()
>= DEVICE_DISAPPEARED_UNBIND_TIMEOUT_MS) {
if (isDeviceDisappeared(lastNearby)) {
for (Association association : getAllAssociations(address)) {
if (association.isNotifyOnDeviceNearby()) {
getDeviceListenerServiceConnector(association).unbind();