From 2601f8da10db7f07fcca6a7184ccfbf6c79fbec1 Mon Sep 17 00:00:00 2001
From: Donghyun Cho <donghyun@google.com>
Date: Fri, 25 Mar 2016 20:18:06 +0900
Subject: [PATCH] Enable/disable system audio mode by changing the setting
 value

Detect a change of a setting value, Global#HDMI_SYSTEM_AUDIO_ENABLED, in
order to let the system audio mode enabled or disabled according to the
changed value. It allows to enable/disable the system audio mode using
adb.

Bug: 26981641
Change-Id: Iea320c44a3ea7a5aa4d5eb89f001db27312f1223
(cherry picked from commit 1e5703a6a5441c2a118a4635ec7cb6c26496c5b8)
---
 .../java/com/android/server/hdmi/HdmiControlService.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index fc86d68cea7b8..89b10acd43a30 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -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;