VolumeDialogController : Ignore inactive stream volume updates

CYNGNOS-2259

Change-Id: I87eee4b76c2618b5bbe29385b1cd9b431367e239

1 files changed, 7 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
index 7279d1f..9494e27 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
@@ -974,6 +974,13 @@ public class VolumeDialogController {
 
         @Override
         public void onRemoteVolumeChanged(Token token, int flags) {
+            // If an inactive session changed the remoteVolume, bail
+            // since we don't have any active streams to update
+            if (!mRemoteStreams.containsKey(token)) {
+                Log.i(TAG, "onRemoteVolumeChanged called on inactive" +
+                        "stream. Ignoring");
+                return;
+            }
             final int stream = mRemoteStreams.get(token);
             final boolean showUI = (flags & AudioManager.FLAG_SHOW_UI) != 0;
             boolean changed = updateActiveStreamW(stream);