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

Commit 63ec6b91 authored by Jakub Tyszkowski's avatar Jakub Tyszkowski Committed by Automerger Merge Worker
Browse files

Merge "BleAudioVolume: Fix calculation for the activated device" am:... 

Merge "BleAudioVolume: Fix calculation for the activated device" am: b1066b67 am: 8263df52 am: da47696f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2226717



Change-Id: I85584ccf681a56794e3a3adc65911cabc08d0dd5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f74b6585 da47696f

services/core/java/com/android/server/audio/AudioDeviceInventory.java

+2 −1
Original line number Diff line number Diff line
@@ -377,7 +377,8 @@ public class AudioDeviceInventory { 
                        makeLeAudioDeviceUnavailable(address, btInfo.mAudioSystemDevice);

                    } else if (switchToAvailable) {

                        makeLeAudioDeviceAvailable(address, BtHelper.getName(btInfo.mDevice),

                                streamType, btInfo.mVolume, btInfo.mAudioSystemDevice,

                                streamType, btInfo.mVolume == -1 ? -1 : btInfo.mVolume * 10,

                                btInfo.mAudioSystemDevice,

                                "onSetBtActiveDevice");

                    }

                    break;

services/core/java/com/android/server/audio/AudioService.java

+3 −4
Original line number Diff line number Diff line
@@ -3857,7 +3857,7 @@ public class AudioService extends IAudioService.Stub 
        }

    }













    private void setLeAudioVolumeOnModeUpdate(int mode) {













    private void setLeAudioVolumeOnModeUpdate(int mode, int streamType, int device) {















        switch (mode) {















            case AudioSystem.MODE_IN_COMMUNICATION:















            case AudioSystem.MODE_IN_CALL:









@@ -3871,8 +3871,6 @@ public class AudioService extends IAudioService.Stub













                return;















        }



























        int streamType = getBluetoothContextualVolumeStream(mode);



























        // Currently, DEVICE_OUT_BLE_HEADSET is the only output type for LE_AUDIO profile.















        // (See AudioDeviceBroker#createBtDeviceInfo())















        int index = mStreamStates[streamType].getIndex(AudioSystem.DEVICE_OUT_BLE_HEADSET);









@@ -3883,6 +3881,7 @@ public class AudioService extends IAudioService.Stub













                    + index + " maxIndex=" + maxIndex + " streamType=" + streamType);















        }















        mDeviceBroker.postSetLeAudioVolumeIndex(index, maxIndex, streamType);













        mDeviceBroker.postApplyVolumeOnDevice(streamType, device, "setLeAudioVolumeOnModeUpdate");















    }





























    private void setStreamVolume(int streamType, int index, int flags, String callingPackage,










@@ -5259,7 +5258,7 @@ public class AudioService extends IAudioService.Stub



























                // Forcefully set LE audio volume as a workaround, since the value of 'device'















                // is not DEVICE_OUT_BLE_* even when BLE is connected.













                setLeAudioVolumeOnModeUpdate(mode);













                setLeAudioVolumeOnModeUpdate(mode, streamType, device);





























                // when entering RINGTONE, IN_CALL or IN_COMMUNICATION mode, clear all SCO















                // connections not started by the application changing the mode when pid changes