Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CEC: Prevent overwriting volume control Settings" into rvc-dev am: 58fd58dea7 am: 79b501a94d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859734

Change-Id: Ibe27c3a50a60c312287674d83d44ce868037e25a
This commit is contained in:
TreeHugger Robot
2020-06-18 14:32:55 +00:00
committed by Automerger Merge Worker
parent bafb66fa27 79b501a94d
commit b32186dde6
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -3142,7 +3142,7 @@ public class HdmiControlService extends SystemService {
return; return;
} }
setHdmiCecVolumeControlEnabled(false); mHdmiCecVolumeControlEnabled = false;
// Call the vendor handler before the service is disabled. // Call the vendor handler before the service is disabled.
invokeVendorCommandListenersOnControlStateChanged(false, invokeVendorCommandListenersOnControlStateChanged(false,
HdmiControlManager.CONTROL_STATE_CHANGED_REASON_SETTING); HdmiControlManager.CONTROL_STATE_CHANGED_REASON_SETTING);

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

@@ -263,6 +263,19 @@ public class HdmiControlServiceTest {
assertThat(mHdmiControlService.isHdmiCecVolumeControlEnabled()).isTrue(); 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 @Test
public void addHdmiCecVolumeControlFeatureListener_emitsCurrentState_enabled() { public void addHdmiCecVolumeControlFeatureListener_emitsCurrentState_enabled() {
mHdmiControlService.setHdmiCecVolumeControlEnabled(true); mHdmiControlService.setHdmiCecVolumeControlEnabled(true);