commit 2c0a2a9d575ed708df356c13c9a8355abed48f6e
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Mon Oct 21 22:13:03 2019 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Mon Oct 21 22:13:03 2019 +0000
tree 8dfdffeec12b6e22ea51fd092bdf334de188223e
parent cae07e5040cbd5b3fc3edf6eefb89194684fa6e1
parent 4555d909e9cb6657d46ce2bcbbc789235454a848

Snap for 5955448 from 4555d909e9cb6657d46ce2bcbbc789235454a848 to q-keystone-qcom-release

Change-Id: I655b509144802c16e3b7eaabd878b2e25f780ec3

src/com/android/bluetooth/a2dp/A2dpService.java

diff --git a/src/com/android/bluetooth/a2dp/A2dpService.java b/src/com/android/bluetooth/a2dp/A2dpService.java
index 5c4c23c..6751a14 100644
--- a/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/src/com/android/bluetooth/a2dp/A2dpService.java
@@ -891,16 +891,6 @@
                 }
                 // Make sure the Audio Manager knows the previous Active device is disconnected,
                 // and the new Active device is connected.
-                // Also, mute and unmute the output during the switch to avoid audio glitches.
-                boolean wasMuted = false;
-                if (previousActiveDevice != null && !tws_switch) {
-                    if (mAudioManager != null && !mAudioManager.isStreamMute(AudioManager.STREAM_MUSIC)) {
-                        mAudioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC,
-                                                     AudioManager.ADJUST_MUTE,
-                                                     mAudioManager.FLAG_BLUETOOTH_ABS_VOLUME);
-                        wasMuted = true;
-                    }
-                }
 
                 if (!isBAActive && mAudioManager != null) {
                 // Make sure the Audio Manager knows the previous
@@ -929,13 +919,6 @@
                 } else {
                     Log.e(TAG,"adapterService is null");
                 }
-
-
-                if (wasMuted && mAudioManager != null) {
-                    mAudioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC,
-                                              AudioManager.ADJUST_UNMUTE,
-                                              mAudioManager.FLAG_BLUETOOTH_ABS_VOLUME);
-                }
             }
             if (mAvrcp_ext != null && !tws_switch) {
                 mAvrcp_ext.setAbsVolumeFlag(device);