From 734819a4100a9513e3f0e529d6fa8a184c0f98b3 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 4 Feb 2019 15:44:28 -0800 Subject: [PATCH] Fix AVRCP volume control from UI volume slider Fix error where volume index rescaling was happening twice in the setStreamVolume code path for AVRCP absolute volume code path. Bug: 123857725 Test: see bug Change-Id: Iadfa664e6eb6298acf712f02f98b892ad2d36d44 --- services/core/java/com/android/server/audio/AudioService.java | 2 +- services/core/java/com/android/server/audio/BtHelper.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 251cb61c3de83..de63d0ef8edf7 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -1710,7 +1710,7 @@ public class AudioService extends IAudioService.Stub Log.d(TAG, "adjustSreamVolume: postSetAvrcpAbsoluteVolumeIndex index=" + newIndex + "stream=" + streamType); } - mDeviceBroker.postSetAvrcpAbsoluteVolumeIndex(newIndex); + mDeviceBroker.postSetAvrcpAbsoluteVolumeIndex(newIndex / 10); } // Check if volume update should be send to Hearing Aid diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java index 95df21e729e42..b63af8a31cd9f 100644 --- a/services/core/java/com/android/server/audio/BtHelper.java +++ b/services/core/java/com/android/server/audio/BtHelper.java @@ -191,8 +191,8 @@ public class BtHelper { Log.i(TAG, "setAvrcpAbsoluteVolumeIndex index=" + index); } AudioService.sVolumeLogger.log(new AudioServiceEvents.VolumeEvent( - AudioServiceEvents.VolumeEvent.VOL_SET_AVRCP_VOL, index / 10)); - mA2dp.setAvrcpAbsoluteVolume(index / 10); + AudioServiceEvents.VolumeEvent.VOL_SET_AVRCP_VOL, index)); + mA2dp.setAvrcpAbsoluteVolume(index); } /*package*/ synchronized int getA2dpCodec(@NonNull BluetoothDevice device) {