Merge "Fix onStandby() in HdmiControlService" (0f511ed6) · Commits · e / os / android_frameworks_base

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

+14 −3

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

		@VisibleForTesting
		boolean isStandbyMessageReceived() {
		return mStandbyMessageReceived;
		}

		@ServiceThreadOnly
		private void onWakeUp() {
		assertRunOnServiceThread();
		@@ -2098,17 +2103,23 @@ public class HdmiControlService extends SystemService {
		}

		@ServiceThreadOnly
		private void onStandby(final int standbyAction) {
		@VisibleForTesting
		protected void onStandby(final int standbyAction) {
		assertRunOnServiceThread();
		mPowerStatus = HdmiControlManager.POWER_STATUS_TRANSIENT_TO_STANDBY;
		invokeVendorCommandListenersOnControlStateChanged(false,
		HdmiControlManager.CONTROL_STATE_CHANGED_REASON_STANDBY);
		if (!canGoToStandby()) {

		final List<HdmiCecLocalDevice> devices = getAllLocalDevices();

		if (!isStandbyMessageReceived() && !canGoToStandby()) {
		mPowerStatus = HdmiControlManager.POWER_STATUS_STANDBY;
		for (HdmiCecLocalDevice device : devices) {
		device.onStandby(mStandbyMessageReceived, standbyAction);
		}
		return;
		}

		final List<HdmiCecLocalDevice> devices = getAllLocalDevices();
		disableDevices(new PendingActionClearedCallback() {
		@Override
		public void onCleared(HdmiCecLocalDevice device) {

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

0 → 100644

+162 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.server.hdmi;

		import static android.hardware.hdmi.HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM;
		import static android.hardware.hdmi.HdmiDeviceInfo.DEVICE_PLAYBACK;
		import static com.android.server.hdmi.HdmiControlService.INITIATED_BY_ENABLE_CEC;
		import static junit.framework.Assert.assertFalse;
		import static junit.framework.Assert.assertTrue;

		import android.os.Looper;
		import android.os.test.TestLooper;
		import android.support.test.filters.SmallTest;
		import java.util.ArrayList;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.junit.runners.JUnit4;

		/**
		* Tests for {@link HdmiControlService} class.
		*/
		@SmallTest
		@RunWith(JUnit4.class)
		public class HdmiControlServiceTest {

		private class HdmiCecLocalDeviceMyDevice extends HdmiCecLocalDevice {

		private boolean mCanGoToStandby;
		private boolean mIsStandby;
		private boolean mIsDisabled;

		protected HdmiCecLocalDeviceMyDevice(HdmiControlService service, int deviceType) {
		super(service, deviceType);
		}

		@Override
		protected void onAddressAllocated(int logicalAddress, int reason) {

		}

		@Override
		protected int getPreferredAddress() {
		return 0;
		}

		@Override
		protected void setPreferredAddress(int addr) {

		}

		@Override
		protected boolean canGoToStandby() {
		return mCanGoToStandby;
		}

		@Override
		protected void disableDevice(boolean initiatedByCec,
		final PendingActionClearedCallback originalCallback) {
		mIsDisabled = true;
		originalCallback.onCleared(this);
		}

		@Override
		protected void onStandby(boolean initiatedByCec, int standbyAction) {
		mIsStandby = true;
		}

		protected boolean isStandby() {
		return mIsStandby;
		}

		protected boolean isDisabled() {
		return mIsDisabled;
		}

		protected void setCanGoToStandby(boolean canGoToStandby) {
		mCanGoToStandby = canGoToStandby;
		}
		}

		private static final String TAG = "HdmiControlServiceTest";
		private HdmiControlService mHdmiControlService;
		private HdmiCecController mHdmiCecController;
		private HdmiCecLocalDeviceMyDevice mMyAudioSystemDevice;
		private HdmiCecLocalDeviceMyDevice mMyPlaybackDevice;
		private FakeNativeWrapper mNativeWrapper;
		private Looper mMyLooper;
		private TestLooper mTestLooper = new TestLooper();
		private ArrayList<HdmiCecLocalDevice> mLocalDevices = new ArrayList<>();
		private boolean mStandbyMessageReceived;

		@Before
		public void SetUp() {
		mHdmiControlService = new HdmiControlService(null) {
		@Override
		boolean isStandbyMessageReceived() {
		return mStandbyMessageReceived;
		}
		};
		mMyLooper = mTestLooper.getLooper();

		mMyAudioSystemDevice = new HdmiCecLocalDeviceMyDevice(
		mHdmiControlService, DEVICE_AUDIO_SYSTEM);
		mMyPlaybackDevice = new HdmiCecLocalDeviceMyDevice(
		mHdmiControlService, DEVICE_PLAYBACK);
		mMyAudioSystemDevice.init();
		mMyPlaybackDevice.init();

		mHdmiControlService.setIoLooper(mMyLooper);

		mNativeWrapper = new FakeNativeWrapper();
		mHdmiCecController = HdmiCecController.createWithNativeWrapper(
		mHdmiControlService, mNativeWrapper);
		mHdmiControlService.setCecController(mHdmiCecController);
		mHdmiControlService.setHdmiMhlController(HdmiMhlControllerStub.create(mHdmiControlService));
		mHdmiControlService.setMessageValidator(new HdmiCecMessageValidator(mHdmiControlService));

		mLocalDevices.add(mMyAudioSystemDevice);
		mLocalDevices.add(mMyPlaybackDevice);
		mHdmiControlService.initPortInfo();
		mHdmiControlService.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC);

		mTestLooper.dispatchAll();
		}

		@Test
		public void onStandby_notByCec_cannotGoToStandby() {
		mStandbyMessageReceived = false;
		mMyPlaybackDevice.setCanGoToStandby(false);

		mHdmiControlService.onStandby(HdmiControlService.STANDBY_SCREEN_OFF);
		assertTrue(mMyPlaybackDevice.isStandby());
		assertTrue(mMyAudioSystemDevice.isStandby());
		assertFalse(mMyPlaybackDevice.isDisabled());
		assertFalse(mMyAudioSystemDevice.isDisabled());
		}

		@Test
		public void onStandby_byCec() {
		mStandbyMessageReceived = true;

		mHdmiControlService.onStandby(HdmiControlService.STANDBY_SCREEN_OFF);
		assertTrue(mMyPlaybackDevice.isStandby());
		assertTrue(mMyAudioSystemDevice.isStandby());
		assertTrue(mMyPlaybackDevice.isDisabled());
		assertTrue(mMyAudioSystemDevice.isDisabled());
		}
		}