From d1851e6e4e49b6a45d9e013de2e1384711975328 Mon Sep 17 00:00:00 2001
From: Sungsoo Lim <sungsoo@google.com>
Date: Wed, 24 Dec 2014 17:30:00 +0900
Subject: [PATCH] Make mute/unmute work

Bug: 18844550
Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb
---
 .../com/android/server/media/MediaSessionService.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index 82be1bbb158f9..a72cc8df390b5 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -836,7 +836,9 @@ public class MediaSessionService extends SystemService implements Monitor {
                             mAudioService.setMasterMute(!isMasterMute, flags, packageName, mICallback);
                         } else {
                             mAudioService.adjustMasterVolume(direction, flags, packageName);
-                            if (isMasterMute) {
+                            // Do not call setStreamMute when direction = 0 which is just to show
+                            // UI.
+                            if (isMasterMute && direction != 0) {
                                 mAudioService.setMasterMute(false, flags, packageName, mICallback);
                             }
                         }
@@ -847,7 +849,9 @@ public class MediaSessionService extends SystemService implements Monitor {
                         } else {
                             mAudioService.adjustSuggestedStreamVolume(direction, suggestedStream,
                                     flags, packageName);
-                            if (isStreamMute) {
+                            // Do not call setStreamMute when direction = 0 which is just to show
+                            // UI.
+                            if (isStreamMute && direction != 0) {
                                 mAudioService.setStreamMute(suggestedStream, false, mICallback);
                             }
                         }