Merge "Enable/disable system audio mode by changing the setting value"

This commit is contained in:
Donghyun Cho
2017-03-13 02:41:25 +00:00
committed by Android (Google) Code Review

View File

@@ -486,6 +486,7 @@ public final class HdmiControlService extends SystemService {
Global.HDMI_CONTROL_ENABLED,
Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED,
Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED,
Global.HDMI_SYSTEM_AUDIO_ENABLED,
Global.MHL_INPUT_SWITCHING_ENABLED,
Global.MHL_POWER_CHARGE_ENABLED
};
@@ -524,6 +525,11 @@ public final class HdmiControlService extends SystemService {
}
// No need to propagate to HAL.
break;
case Global.HDMI_SYSTEM_AUDIO_ENABLED:
if (isTvDeviceEnabled() && tv().isSystemAudioActivated() != enabled) {
tv().changeSystemAudioMode(enabled, null);
}
break;
case Global.MHL_INPUT_SWITCHING_ENABLED:
setMhlInputChangeEnabled(enabled);
break;