Merge "Fix SystemAudioAutoInitiationAction not started" (e6bebf94) · Commits · e / os / android_frameworks_base

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

+8 −12

Original line number	Diff line number	Diff line
		@@ -619,11 +619,9 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		}
		}

		if (!mService.isPowerStandbyOrTransient()) {
		addAndStartAction(new NewDeviceAction(this, activeSource.logicalAddress,
		activeSource.physicalAddress, deviceType));
		}
		}

		private boolean handleNewDeviceAtTheTailOfActivePath(int path) {
		// Seq #22
		@@ -798,7 +796,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		@ServiceThreadOnly
		void onNewAvrAdded(HdmiDeviceInfo avr) {
		assertRunOnServiceThread();
		if (!mService.isPowerStandbyOrTransient()) {
		addAndStartAction(new SystemAudioAutoInitiationAction(this, avr.getLogicalAddress()));
		if (!isDirectConnectAddress(avr.getPhysicalAddress())) {
		startArcAction(false);
		@@ -807,7 +804,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		startArcAction(true);
		}
		}
		}

		// Clear all device info.
		@ServiceThreadOnly