Merge "HDMI: Avoid creating multiple DeviceDiscoveryActions for a local device" into main (cc4af8be) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1117,6 +1117,7 @@ abstract class HdmiCecLocalDevice extends HdmiLocalDevice {
		}

		// Returns all actions matched with given class type.
		@VisibleForTesting
		@ServiceThreadOnly
		<T extends HdmiCecFeatureAction> List<T> getActions(final Class<T> clazz) {
		assertRunOnServiceThread();

+4 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,10 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
		private void launchDeviceDiscovery() {
		assertRunOnServiceThread();
		clearDeviceInfoList();
		if (hasAction(DeviceDiscoveryAction.class)) {
		Slog.i(TAG, "Device Discovery Action is in progress. Restarting.");
		removeAction(DeviceDiscoveryAction.class);
		}
		DeviceDiscoveryAction action = new DeviceDiscoveryAction(this,
		new DeviceDiscoveryAction.DeviceDiscoveryCallback() {
		@Override

+12 −0

Original line number	Diff line number	Diff line
		@@ -1773,6 +1773,18 @@ public class HdmiCecLocalDevicePlaybackTest {
		assertThat(mNativeWrapper.getResultMessages()).contains(givePhysicalAddress);
		}

		@Test
		public void wakeUp_hotPlugIn_invokesDeviceDiscoveryOnce() {
		mNativeWrapper.setPollAddressResponse(Constants.ADDR_PLAYBACK_2, SendMessageResult.SUCCESS);
		mHdmiControlService.onWakeUp(HdmiControlService.WAKE_UP_SCREEN_ON);
		mTestLooper.dispatchAll();

		mNativeWrapper.onHotplugEvent(1, true);
		mTestLooper.dispatchAll();

		assertThat(mHdmiCecLocalDevicePlayback.getActions(DeviceDiscoveryAction.class)).hasSize(1);
		}

		@Test
		public void hotplugDetectionAction_addDevice() {
		int otherPlaybackLogicalAddress = mPlaybackLogicalAddress == Constants.ADDR_PLAYBACK_2