Merge "Don't send onDeviceDisappeared when device is connected" into sc-dev (3eb77b2f) · Commits · e / os / android_frameworks_base

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

+13 −1

Original line number	Diff line number	Diff line
		@@ -1078,6 +1078,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
		Date lastSeen = mDevicesLastNearby.get(address);
		if (isDeviceDisappeared(lastSeen)) {
		onDeviceDisappeared(address);
		unscheduleTriggerDeviceDisappearedRunnable(address);
		}
		}

		@@ -1213,9 +1214,20 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
		@Override
		public void run() {
		Slog.d(LOG_TAG, "TriggerDeviceDisappearedRunnable.run(address = " + mAddress + ")");
		if (!mCurrentlyConnectedDevices.contains(mAddress)) {
		onDeviceDisappeared(mAddress);
		}
		}
		}

		private void unscheduleTriggerDeviceDisappearedRunnable(String address) {
		Runnable r = mTriggerDeviceDisappearedRunnables.get(address);
		if (r != null) {
		Slog.d(LOG_TAG,
		"unscheduling TriggerDeviceDisappearedRunnable(address = " + address + ")");
		mMainHandler.removeCallbacks(r);
		}
		}

		private Set<Association> getAllAssociations(String deviceAddress) {
		List<UserInfo> aliveUsers = mUserManager.getAliveUsers();