Merge "Init ARC before init System Audio Mode from AVR" (1e91eaca) · Commits · e / os / android_frameworks_base

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

+14 −2

Original line number	Diff line number	Diff line
		@@ -353,6 +353,10 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
		mService.sendCecCommand(
		HdmiCecMessageBuilder.buildDeviceVendorIdCommand(mAddress, mService.getVendorId()));
		mService.registerTvInputCallback(mTvInputCallback);
		// Some TVs, for example Mi TV, need ARC on before turning System Audio Mode on
		// to request Short Audio Descriptor. Since ARC and SAM are independent,
		// we can turn on ARC anyways when audio system device just boots up.
		initArcOnFromAvr();
		int systemAudioControlOnPowerOnProp =
		SystemProperties.getInt(
		PROPERTY_SYSTEM_AUDIO_CONTROL_ON_POWER_ON,
		@@ -919,8 +923,8 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
		// Since some TVs don't request ARC on with System Audio Mode on request
		if (SystemProperties.getBoolean(Constants.PROPERTY_ARC_SUPPORT, true)
		&& isDirectConnectToTv()) {
		if (newSystemAudioMode && !isArcEnabled()) {
		removeAction(ArcInitiationActionFromAvr.class);
		if (newSystemAudioMode && !isArcEnabled()
		&& !hasAction(ArcInitiationActionFromAvr.class)) {
		addAndStartAction(new ArcInitiationActionFromAvr(this));
		} else if (!newSystemAudioMode && isArcEnabled()) {
		removeAction(ArcTerminationActionFromAvr.class);
		@@ -1096,6 +1100,14 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
		}
		}

		private void initArcOnFromAvr() {
		if (SystemProperties.getBoolean(Constants.PROPERTY_ARC_SUPPORT, true)
		&& isDirectConnectToTv() && !isArcEnabled()) {
		removeAction(ArcInitiationActionFromAvr.class);
		addAndStartAction(new ArcInitiationActionFromAvr(this));
		}
		}

		@Override
		protected void switchInputOnReceivingNewActivePath(int physicalAddress) {
		int port = mService.pathToPortId(physicalAddress);