From 7a18cb5672127bf12c8edac8a327f9b706b79ff7 Mon Sep 17 00:00:00 2001
From: RoboErik <epastern@google.com>
Date: Tue, 2 Sep 2014 15:04:27 -0700
Subject: [PATCH] Don't play a sound when adjusting volume while telephony is
 active

bug:17106215
Change-Id: I54f156d91440ce777e5a4d473cdd47927479d084
---
 .../core/java/com/android/server/media/MediaSessionRecord.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java
index 0da2cfa8e19f7..b936130dbc154 100644
--- a/services/core/java/com/android/server/media/MediaSessionRecord.java
+++ b/services/core/java/com/android/server/media/MediaSessionRecord.java
@@ -231,7 +231,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
      * @param direction The direction to adjust volume in.
      */
     public void adjustVolume(int direction, int flags, String packageName, int uid) {
-        if (isPlaybackActive(false)) {
+        if (isPlaybackActive(false) || hasFlag(MediaSession.FLAG_EXCLUSIVE_GLOBAL_PRIORITY)) {
             flags &= ~AudioManager.FLAG_PLAY_SOUND;
         }
         if (direction > 1) {