Merge "HDMI: Avoid to interrupt standby process by action timeout" into main (9e372f47) · Commits · e / os / android_frameworks_base

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -3768,7 +3768,6 @@ public class HdmiControlService extends SystemService {
		return mWakeUpMessageReceived;
		}

		@VisibleForTesting
		protected boolean isStandbyMessageReceived() {
		return mStandbyMessageReceived;
		}

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		package com.android.server.hdmi;

		import android.hardware.tv.cec.V1_0.SendMessageResult;
		import android.util.Slog;

		import com.android.internal.annotations.VisibleForTesting;

		@@ -23,6 +24,7 @@ import com.android.internal.annotations.VisibleForTesting;
		* Feature action that handles System Audio Mode initiated by AVR devices.
		*/
		public class SystemAudioInitiationActionFromAvr extends HdmiCecFeatureAction {
		private static final String TAG = "SystemAudioInitiationActionFromAvr";

		// State that waits for <Active Source> once send <Request Active Source>.
		private static final int STATE_WAITING_FOR_ACTIVE_SOURCE = 1;
		@@ -115,6 +117,10 @@ public class SystemAudioInitiationActionFromAvr extends HdmiCecFeatureAction {

		private void handleActiveSourceTimeout() {
		HdmiLogger.debug("Cannot get active source.");
		if (audioSystem().mService.isStandbyMessageReceived()) {
		Slog.d(TAG, "Device is going to sleep, avoid to wake it up.");
		return;
		}
		// If not able to find Active Source and the current device has playbcak functionality,
		// claim Active Source and start to query TV system audio mode support.
		if (audioSystem().mService.isPlaybackDevice()) {

services/tests/servicestests/src/com/android/server/hdmi/SystemAudioInitiationActionFromAvrTest.java

+25 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		*/
		package com.android.server.hdmi;

		import static com.android.server.hdmi.HdmiConfig.TIMEOUT_MS;

		import static com.google.common.truth.Truth.assertThat;

		import static org.junit.Assert.assertFalse;
		@@ -60,6 +62,7 @@ public class SystemAudioInitiationActionFromAvrTest {
		private boolean mArcEnabled;
		private boolean mIsPlaybackDevice;
		private boolean mBroadcastActiveSource;
		private boolean mStandbyMessageReceived;

		@Before
		public void SetUp() {
		@@ -135,6 +138,11 @@ public class SystemAudioInitiationActionFromAvrTest {
		int pathToPortId(int path) {
		return -1;
		}

		@Override
		protected boolean isStandbyMessageReceived() {
		return mStandbyMessageReceived;
		}
		};

		Looper looper = mTestLooper.getLooper();
		@@ -286,6 +294,22 @@ public class SystemAudioInitiationActionFromAvrTest {
		assertThat(mHdmiCecLocalDeviceAudioSystem.isSystemAudioActivated()).isTrue();
		}

		@Test
		public void onActionStarted_deviceGoesToSleep_noActiveSourceAfterTimeout() {
		resetTestVariables();

		mStandbyMessageReceived = true;
		mHdmiCecLocalDeviceAudioSystem.addAndStartAction(
		new SystemAudioInitiationActionFromAvr(
		mHdmiCecLocalDeviceAudioSystem));
		mTestLooper.dispatchAll();

		mTestLooper.moveTimeForward(TIMEOUT_MS);
		mTestLooper.dispatchAll();

		assertThat(mBroadcastActiveSource).isFalse();
		}

		private void resetTestVariables() {
		mMsgRequestActiveSourceCount = 0;
		mMsgSetSystemAudioModeCount = 0;
		@@ -295,5 +319,6 @@ public class SystemAudioInitiationActionFromAvrTest {
		mBroadcastActiveSource = false;
		mHdmiCecLocalDeviceAudioSystem.getActiveSource().physicalAddress =
		Constants.INVALID_PHYSICAL_ADDRESS;
		mStandbyMessageReceived = false;
		}
		}