Merge "CEC: Prevent overwriting volume control Settings" into rvc-dev (58fd58de) · Commits · e / os / android_frameworks_base

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

+1 −1

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

		setHdmiCecVolumeControlEnabled(false);
		mHdmiCecVolumeControlEnabled = false;
		// Call the vendor handler before the service is disabled.
		invokeVendorCommandListenersOnControlStateChanged(false,
		HdmiControlManager.CONTROL_STATE_CHANGED_REASON_SETTING);

+13 −0

Original line number	Diff line number	Diff line
		@@ -263,6 +263,19 @@ public class HdmiControlServiceTest {
		assertThat(mHdmiControlService.isHdmiCecVolumeControlEnabled()).isTrue();
		}

		@Test
		public void disableAndReenableCec_volumeControlReturnsToOriginalValue() {
		boolean volumeControlEnabled = true;
		mHdmiControlService.setHdmiCecVolumeControlEnabled(volumeControlEnabled);

		mHdmiControlService.setControlEnabled(false);
		assertThat(mHdmiControlService.isHdmiCecVolumeControlEnabled()).isFalse();

		mHdmiControlService.setControlEnabled(true);
		assertThat(mHdmiControlService.isHdmiCecVolumeControlEnabled()).isEqualTo(
		volumeControlEnabled);
		}

		@Test
		public void addHdmiCecVolumeControlFeatureListener_emitsCurrentState_enabled() {
		mHdmiControlService.setHdmiCecVolumeControlEnabled(true);