Fix over-eager locking of volume dialog's primary stream.

Bug: 3427027

Don't lock in the active stream if visual feedback was not requested.
This fixes a transient problem after the notification volume was modified
by an API call.

Change-Id: I2227d8fdf6cc565713d9bbcc66748805e04ae163

1 files changed, 3 insertions, 4 deletions

diff --git a/core/java/android/view/VolumePanel.java b/core/java/android/view/VolumePanel.java
index a67ce170a701..89b7aaadd2d8 100644
--- a/core/java/android/view/VolumePanel.java
+++ b/core/java/android/view/VolumePanel.java
@@ -342,11 +342,10 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie
 
         if (LOGD) Log.d(TAG, "onVolumeChanged(streamType: " + streamType + ", flags: " + flags + ")");
 
-        if (mActiveStreamType == -1) {
-            reorderSliders(streamType);
-        }
-
         if ((flags & AudioManager.FLAG_SHOW_UI) != 0) {
+            if (mActiveStreamType == -1) {
+                reorderSliders(streamType);
+            }
             onShowVolumeChanged(streamType, flags);
         }