commit 159a1d9b70b11ac0b8ac36b50a12e37ed787533c
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 20 20:09:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 20 20:09:14 2021 +0000
tree 4522d78e3bb88781dcd5cf592f34929486052100
parent c2ab664a3916a4a630de9e600d2d395b6f095a88
parent 046847bf579832144d3544de995fbba81c3b9fae

Merge "AbsoluteVolume change custom call to official API"

src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java

diff --git a/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java b/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java
index c834a5f..39f1f14 100644
--- a/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java
+++ b/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java
@@ -22,6 +22,7 @@
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.media.AudioDeviceAttributes;
 import android.media.AudioDeviceCallback;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
@@ -76,7 +77,11 @@
     private void switchVolumeDevice(@NonNull BluetoothDevice device) {
         // Inform the audio manager that the device has changed
         d("switchVolumeDevice: Set Absolute volume support to " + mDeviceMap.get(device));
-        mAudioManager.avrcpSupportsAbsoluteVolume(device.getAddress(), mDeviceMap.get(device));
+        mAudioManager.setDeviceVolumeBehavior(new AudioDeviceAttributes(
+                    AudioDeviceAttributes.ROLE_OUTPUT, AudioDeviceInfo.TYPE_BLUETOOTH_A2DP,
+                    device.getAddress()),
+                 mDeviceMap.get(device) ? AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE
+                 : AudioManager.DEVICE_VOLUME_BEHAVIOR_VARIABLE);
 
         // Get the current system volume and try to get the preference volume
         int savedVolume = getVolume(device, sNewDeviceVolume);