From eb971133ac2480bba42903cb96694037f4751a7e Mon Sep 17 00:00:00 2001
From: Agatha Man <agathaman@google.com>
Date: Mon, 11 May 2020 14:50:29 -0700
Subject: [PATCH] Initialize mVolumeDialogComponent onMasterMuteChanged in
 VolumeUI

Bug: 156273758
Test: make CarSystemUI
Change-Id: I71952aca1f8290978086aba7e8f23b1abc396765
---
 .../com/android/systemui/car/volume/VolumeUI.java  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/CarSystemUI/src/com/android/systemui/car/volume/VolumeUI.java b/packages/CarSystemUI/src/com/android/systemui/car/volume/VolumeUI.java
index 2bdb85ff9acc2..03b61e076c734 100644
--- a/packages/CarSystemUI/src/com/android/systemui/car/volume/VolumeUI.java
+++ b/packages/CarSystemUI/src/com/android/systemui/car/volume/VolumeUI.java
@@ -52,6 +52,15 @@ public class VolumeUI extends SystemUI {
             new CarAudioManager.CarVolumeCallback() {
                 @Override
                 public void onGroupVolumeChanged(int zoneId, int groupId, int flags) {
+                    initVolumeDialogComponent();
+                }
+
+                @Override
+                public void onMasterMuteChanged(int zoneId, int flags) {
+                    initVolumeDialogComponent();
+                }
+
+                private void initVolumeDialogComponent() {
                     if (mVolumeDialogComponent == null) {
                         mMainHandler.post(() -> {
                             mVolumeDialogComponent = mVolumeDialogComponentLazy.get();
@@ -60,11 +69,6 @@ public class VolumeUI extends SystemUI {
                         mCarAudioManager.unregisterCarVolumeCallback(mVolumeChangeCallback);
                     }
                 }
-
-                @Override
-                public void onMasterMuteChanged(int zoneId, int flags) {
-                    // ignored
-                }
             };
 
     private boolean mEnabled;