From 67ed2e96a2118769d6da3f6433d56609ef7770ab Mon Sep 17 00:00:00 2001
From: "Shuichi.Noguchi" <Shuichi.Noguchi@jp.sony.com>
Date: Mon, 27 Nov 2017 18:57:56 +0900
Subject: [PATCH] Fix <Report Audio Status> update

Even if the "SystemAudioMode" is OFF, when television device receives
<Report Audio Status> notification from AVR, the volume of the
television device will be changed.

Ignore <Report Audio Status> when the "SystemAudioMode" is OFF
to avoid unnecessary audio service's update.

Test: Send <Report Audio Status> command from source device such as
      AVR when the "SystemAudioMode" is off.

Change-Id: I2e5414390870f0db38973abce9cb69136b686112
---
 .../java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index a50ec49f644bb..da7321f29d0d5 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -1003,6 +1003,9 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
     }
 
     void setAudioStatus(boolean mute, int volume) {
+        if (!isSystemAudioActivated()) {
+            return;
+        }
         synchronized (mLock) {
             mSystemAudioMute = mute;
             mSystemAudioVolume = volume;