Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d4b55cf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix avrcp volume asynchronous" am: 48c5f56f am: a20bce59 am: 2fb5407f 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1942801

Change-Id: Id99ee0bdf215e7cfd94616fecd3b1decd6931781
parents 9d5ac4b2 2fb5407f

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

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ class AvrcpVolumeManager extends AudioDeviceCallback { 


    void setVolume(@NonNull BluetoothDevice device, int avrcpVolume) {

        int deviceVolume =

                (int) Math.floor((double) avrcpVolume * sDeviceMaxVolume / AVRCP_MAX_VOL);

                (int) Math.round((double) avrcpVolume * sDeviceMaxVolume / AVRCP_MAX_VOL);

        mVolumeEventLogger.logd(DEBUG, TAG, "setVolume:"

                        + " device=" + device

                        + " avrcpVolume=" + avrcpVolume
@@ -194,7 +194,7 @@ class AvrcpVolumeManager extends AudioDeviceCallback { 
            return;

        }

        int avrcpVolume =

                (int) Math.floor((double) deviceVolume * AVRCP_MAX_VOL / sDeviceMaxVolume);

                (int) Math.round((double) deviceVolume * AVRCP_MAX_VOL / sDeviceMaxVolume);

        if (avrcpVolume > 127) avrcpVolume = 127;

        mVolumeEventLogger.logd(DEBUG, TAG, "sendVolumeChanged:"

                        + " device=" + device