Make isStreamMute correctly handle master volume devices

isStreamMute should return the master mute value if mUseMasterVolume
is true. This adds that check.

Change-Id: I6d5f5552c480028972e69ff9d670e10c4e496d05

1 files changed, 5 insertions, 1 deletions

diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index f448dc2..cb4498e 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -1191,7 +1191,11 @@ public class AudioManager {
     public boolean isStreamMute(int streamType) {
         IAudioService service = getService();
         try {
-            return service.isStreamMute(streamType);
+            if (mUseMasterVolume) {
+                return service.isMasterMute();
+            } else {
+                return service.isStreamMute(streamType);
+            }
         } catch (RemoteException e) {
             Log.e(TAG, "Dead object in isStreamMute", e);
             return false;