commit b45ee91ac9aa67c81c25f9433854bc03fddf9db9
author Treehugger Robot <android-build-prod@system.gserviceaccount.com> Tue Sep 24 06:02:10 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 24 06:02:10 2019 +0000
tree de64e8d1eec97122f55da553e731620e4d635ce6
parent 6501da335d6791b339d5c0c7d7ea83894262067e
parent d59342daaae6c23a012836cb3185740b6a14465d

Merge "AVRCP: Remove READ_MEDIA_AUDIO permission" into q-keystone-qcom-dev

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 b11ae58..cc2de60 100644
--- a/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/src/com/android/bluetooth/a2dp/A2dpService.java
@@ -1317,10 +1317,13 @@
         // Inform the Audio Service about the codec configuration change,
         // so the Audio Service can reset accordingly the audio feeding
         // parameters in the Audio HAL to the Bluetooth stack.
+        int rememberedVolume = -1;
         if (isActiveDevice(device) && !sameAudioFeedingParameters) {
+            if (mAvrcp_ext != null)
+                rememberedVolume = mAvrcp_ext.getVolume(device);
             mAudioManager.handleBluetoothA2dpActiveDeviceChange(device,
                     BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP,
-                    true, -1);
+                    true, rememberedVolume);
         }
     }
     void updateTwsChannelMode(int state, BluetoothDevice device) {