From bc2aab3e0fc8b32478ac07ea6ea8ec267232ca04 Mon Sep 17 00:00:00 2001
From: Shubang <shubang@google.com>
Date: Thu, 19 Jul 2018 16:41:17 -0700
Subject: [PATCH] Reuse setSystemAudioMode() in terminateSystemAudioMode()

Bug: 80296770
Test: atest com.android.server.hdmi
Change-Id: I12244fd8bdd8b0a15f5abde498f9b6ae2831a03a
---
 .../hdmi/HdmiCecLocalDeviceAudioSystem.java   | 36 +++++--------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
index c77cd8e19ec1f..b796abd8ea7b2 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
@@ -66,11 +66,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice {
                     Constants.PROPERTY_LAST_SYSTEM_AUDIO_CONTROL,
                     mSystemAudioActivated ? "true" : "false");
         }
-        if (setSystemAudioMode(false)) {
-            mService.sendCecCommand(
-                    HdmiCecMessageBuilder.buildSetSystemAudioMode(
-                            mAddress, Constants.ADDR_BROADCAST, false));
-        }
+        terminateSystemAudioMode();
     }
 
     @Override
@@ -335,31 +331,15 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice {
     protected void terminateSystemAudioMode() {
         // remove pending initiation actions
         removeAction(SystemAudioInitiationActionFromAvr.class);
-
-        synchronized (mLock) {
-            if (!mSystemAudioActivated) {
-                return;
-            }
+        if (!isSystemAudioActivated()) {
+            return;
         }
 
-        // send <Set System Audio Mode> [“Off”]
-        mService.sendCecCommand(
-                HdmiCecMessageBuilder.buildSetSystemAudioMode(
-                        mAddress, Constants.ADDR_BROADCAST, false));
-
-        // mute speaker
-        if (!mService.getAudioManager().isStreamMute(AudioManager.STREAM_MUSIC)) {
-            mService.getAudioManager()
-                    .adjustStreamVolume(
-                            AudioManager.STREAM_MUSIC,
-                            AudioManager.ADJUST_MUTE,
-                            0);
-        }
-
-        mSystemAudioSource = null;
-        synchronized (mLock) {
-            mSystemAudioActivated = false;
-            mService.announceSystemAudioModeChange(false);
+        if (setSystemAudioMode(false)) {
+            // send <Set System Audio Mode> [“Off”]
+            mService.sendCecCommand(
+                    HdmiCecMessageBuilder.buildSetSystemAudioMode(
+                            mAddress, Constants.ADDR_BROADCAST, false));
         }
     }