From 6561845b560bdedfcc1ba6edfbdecd6122c02e00 Mon Sep 17 00:00:00 2001
From: Donghyun Cho <donghyun@google.com>
Date: Fri, 23 Dec 2016 18:30:37 +0900
Subject: CEC: Ignore audio status update when system audio mode is off

Bug: 32052505
Test: Simulate receiving <Report Audio Status> while SAM is off
Change-Id: I9121928fc5a588f412b392fcfe76608391d92ad4
(cherry picked from commit 46b86aada358947869365ba9b06adcecbbc83c0f)
---
 services/core/java/com/android/server/hdmi/HdmiControlService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 18f1b6c0513c..9cb54e6e451b 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -967,6 +967,9 @@ public final class HdmiControlService extends SystemService {
     }
 
     void setAudioStatus(boolean mute, int volume) {
+        if (!isTvDeviceEnabled() || !tv().isSystemAudioActivated()) {
+            return;
+        }
         AudioManager audioManager = getAudioManager();
         boolean muted = audioManager.isStreamMute(AudioManager.STREAM_MUSIC);
         if (mute) {
-- 
cgit v1.2.3-59-g8ed1b