Merge "HDMI: Cancel standby delay runnable on one touch play" into main (9d7b90ed) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -3178,6 +3178,10 @@ public class HdmiControlService extends SystemService {
		HdmiCecLocalDeviceSource source = playback();
		if (source == null) {
		source = audioSystem();
		} else {
		// Cancel an existing timer to send the device to sleep since OTP was triggered.
		playback().mDelayedStandbyOnActiveSourceLostHandler
		.removeCallbacksAndMessages(null);
		}

		if (source == null) {

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

+55 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.hardware.hdmi.HdmiDeviceInfo;
		import android.hardware.hdmi.HdmiPortInfo;
		import android.hardware.hdmi.IHdmiControlCallback;
		import android.hardware.tv.cec.V1_0.SendMessageResult;
		import android.os.IBinder;
		import android.os.Looper;
		import android.os.RemoteException;
		import android.os.test.TestLooper;
		@@ -2675,6 +2676,60 @@ public class HdmiCecLocalDevicePlaybackTest {
		assertThat(mPowerManager.isInteractive()).isTrue();
		}

		@Test
		public void onActiveSourceLost_oneTouchPlay_noStandbyAfterTimeout() {
		mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
		HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST,
		HdmiControlManager.POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST_STANDBY_NOW);
		mHdmiCecLocalDevicePlayback.setActiveSource(mPlaybackLogicalAddress,
		mPlaybackPhysicalAddress, "HdmiCecLocalDevicePlaybackTest");
		mPowerManager.setInteractive(true);
		mNativeWrapper.clearResultMessages();
		mTestLooper.dispatchAll();

		HdmiCecMessage activeSourceFromTv =
		HdmiCecMessageBuilder.buildActiveSource(ADDR_TV, 0x0000);
		HdmiCecMessage activeSourceFromPlayback =
		HdmiCecMessageBuilder.buildActiveSource(mPlaybackLogicalAddress,
		mPlaybackPhysicalAddress);

		assertThat(mHdmiCecLocalDevicePlayback.handleActiveSource(activeSourceFromTv))
		.isEqualTo(Constants.HANDLED);
		assertThat(mHdmiCecLocalDevicePlayback.getActiveSource().logicalAddress).isEqualTo(ADDR_TV);
		mTestLooper.dispatchAll();

		// Pop-up is triggered.
		mTestLooper.moveTimeForward(POPUP_AFTER_ACTIVE_SOURCE_LOST_DELAY_MS);
		mTestLooper.dispatchAll();
		// RequestActiveSourceAction is triggered and TV confirms active source.
		mNativeWrapper.onCecMessage(activeSourceFromTv);
		mTestLooper.dispatchAll();

		assertThat(mIsOnActiveSourceLostPopupActive).isTrue();
		mHdmiControlService.oneTouchPlay(new IHdmiControlCallback() {
		@Override
		public void onComplete(int result) throws RemoteException {
		}

		@Override
		public IBinder asBinder() {
		return null;
		}
		});
		mTestLooper.dispatchAll();

		assertThat(mIsOnActiveSourceLostPopupActive).isFalse();
		assertThat(mNativeWrapper.getResultMessages().contains(activeSourceFromPlayback)).isTrue();
		assertThat(mHdmiCecLocalDevicePlayback.getActiveSource().logicalAddress)
		.isEqualTo(mPlaybackLogicalAddress);
		assertThat(mHdmiCecLocalDevicePlayback.getActiveSource().physicalAddress)
		.isEqualTo(mPlaybackPhysicalAddress);
		mTestLooper.moveTimeForward(STANDBY_AFTER_ACTIVE_SOURCE_LOST_DELAY_MS);
		mTestLooper.dispatchAll();

		assertThat(mPowerManager.isInteractive()).isTrue();
		}

		@Test
		public void handleRoutingChange_addressNotAllocated_removeActiveSourceAction() {
		long allocationDelay = TimeUnit.SECONDS.toMillis(60);