From c8cdc593227638fdefbb9dbf2644fb8e4bf31fe6 Mon Sep 17 00:00:00 2001 From: Hongwei Wang Date: Thu, 7 Jun 2018 12:35:08 -0700 Subject: [PATCH 1/2] Comply with the volume callback change Bug: 109841417 Test: m -j Change-Id: I43a139b97f89a666088db39579b068dc76babd56 --- .../src/com/android/systemui/volume/CarVolumeDialogImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java index bf962b8189971..dc086cf6f7b61 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java @@ -527,7 +527,7 @@ public class CarVolumeDialogImpl implements VolumeDialog { private final ICarVolumeCallback mVolumeChangeCallback = new ICarVolumeCallback.Stub() { @Override - public void onGroupVolumeChanged(int groupId) { + public void onGroupVolumeChanged(int groupId, int flags) { VolumeItem volumeItem = mAvailableVolumeItems.get(groupId); int value = getSeekbarValue(mCarAudioManager, groupId); // Do not update the progress if it is the same as before. When car audio manager sets its @@ -541,7 +541,7 @@ public class CarVolumeDialogImpl implements VolumeDialog { } @Override - public void onMasterMuteChanged() { + public void onMasterMuteChanged(int flags) { // ignored } }; From f37d0ebe8cb4a81e4f13ece2b3bb519c215208dd Mon Sep 17 00:00:00 2001 From: Lin Guo Date: Thu, 7 Jun 2018 17:08:30 -0700 Subject: [PATCH 2/2] Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set Bug: 109841417 Test: manual Change-Id: Icc803a4b22ceccff7d3e788b9164975a8e395a3b --- .../src/com/android/systemui/volume/CarVolumeDialogImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java index dc086cf6f7b61..d7fad67c7f09a 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java @@ -38,6 +38,7 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.PixelFormat; import android.graphics.drawable.Drawable; import android.media.AudioAttributes; +import android.media.AudioManager; import android.os.Debug; import android.os.Handler; import android.os.IBinder; @@ -536,7 +537,9 @@ public class CarVolumeDialogImpl implements VolumeDialog { if (value != volumeItem.progress) { volumeItem.listItem.setProgress(value); volumeItem.progress = value; - show(Events.SHOW_REASON_VOLUME_CHANGED); + if ((flags & AudioManager.FLAG_SHOW_UI) != 0) { + show(Events.SHOW_REASON_VOLUME_CHANGED); + } } }