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

Merge "Fix CDM logcat spam when device is nearby" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-22 21:48:39 +00:00
committed by Android (Google) Code Review
parent 6b8c61c8fc 9b55151a54
commit 562ed3ad70
1 changed files with 5 additions and 15 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

@@ -1205,8 +1205,6 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
} }
public void schedule() { public void schedule() {
Slog.d(LOG_TAG,
"TriggerDeviceDisappearedRunnable.schedule(address = " + mAddress + ")");
mMainHandler.removeCallbacks(this); mMainHandler.removeCallbacks(this);
mMainHandler.postDelayed(this, this, DEVICE_DISAPPEARED_TIMEOUT_MS); mMainHandler.postDelayed(this, this, DEVICE_DISAPPEARED_TIMEOUT_MS);
} }
@@ -1244,8 +1242,6 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
} }
private void onDeviceNearby(String address) { private void onDeviceNearby(String address) {
Slog.i(LOG_TAG, "onDeviceNearby(address = " + address + ")");
Date timestamp = new Date(); Date timestamp = new Date();
Date oldTimestamp = mDevicesLastNearby.put(address, timestamp); Date oldTimestamp = mDevicesLastNearby.put(address, timestamp);
@@ -1259,13 +1255,11 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
boolean justAppeared = oldTimestamp == null boolean justAppeared = oldTimestamp == null
|| timestamp.getTime() - oldTimestamp.getTime() >= DEVICE_DISAPPEARED_TIMEOUT_MS; || timestamp.getTime() - oldTimestamp.getTime() >= DEVICE_DISAPPEARED_TIMEOUT_MS;
if (justAppeared) { if (justAppeared) {
Slog.i(LOG_TAG, "onDeviceNearby(justAppeared, address = " + address + ")");
for (Association association : getAllAssociations(address)) { for (Association association : getAllAssociations(address)) {
if (association.isNotifyOnDeviceNearby()) { if (association.isNotifyOnDeviceNearby()) {
if (DEBUG) { Slog.i(LOG_TAG,
Slog.i(LOG_TAG, "Device " + address "Sending onDeviceAppeared to " + association.getPackageName() + ")");
+ " managed by " + association.getPackageName()
+ " is nearby on " + timestamp);
}
getDeviceListenerServiceConnector(association).run( getDeviceListenerServiceConnector(association).run(
service -> service.onDeviceAppeared(association.getDeviceMacAddress())); service -> service.onDeviceAppeared(association.getDeviceMacAddress()));
} }
@@ -1279,12 +1273,8 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
boolean hasDeviceListeners = false; boolean hasDeviceListeners = false;
for (Association association : getAllAssociations(address)) { for (Association association : getAllAssociations(address)) {
if (association.isNotifyOnDeviceNearby()) { if (association.isNotifyOnDeviceNearby()) {
if (DEBUG) { Slog.i(LOG_TAG,
Slog.i(LOG_TAG, "Device " + address "Sending onDeviceDisappeared to " + association.getPackageName() + ")");
+ " managed by " + association.getPackageName()
+ " disappeared; last seen on " + mDevicesLastNearby.get(address));
}
getDeviceListenerServiceConnector(association).run( getDeviceListenerServiceConnector(association).run(
service -> service.onDeviceDisappeared(address)); service -> service.onDeviceDisappeared(address));
hasDeviceListeners = true; hasDeviceListeners = true;