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

Commit 8f42d3f5 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 am: 63ec6b91

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



Change-Id: I6424cad5cf423bc8c5e81f35b493eac5ca355ff6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fffe3da1 63ec6b91

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

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

                        makeLeAudioDeviceUnavailable(address, btInfo.mAudioSystemDevice);

                    } else if (switchToAvailable) {

                    } else if (switchToAvailable) {

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

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

                                streamType, btInfo.mVolume, btInfo.mAudioSystemDevice,

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

                                btInfo.mAudioSystemDevice,

                                "onSetBtActiveDevice");

                                "onSetBtActiveDevice");

                    }

                    }

                    break;

                    break;

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

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

        }

    }

    }

















    private void setLeAudioVolumeOnModeUpdate(int mode) {







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











        switch (mode) {







        switch (mode) {











            case AudioSystem.MODE_IN_COMMUNICATION:







            case AudioSystem.MODE_IN_COMMUNICATION:











            case AudioSystem.MODE_IN_CALL:







            case AudioSystem.MODE_IN_CALL:









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









                return;







                return;











        }







        }



























        int streamType = getBluetoothContextualVolumeStream(mode);



























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







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











        // (See AudioDeviceBroker#createBtDeviceInfo())







        // (See AudioDeviceBroker#createBtDeviceInfo())











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







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









@@ -4037,6 +4035,7 @@ public class AudioService extends IAudioService.Stub









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







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











        }







        }











        mDeviceBroker.postSetLeAudioVolumeIndex(index, maxIndex, streamType);







        mDeviceBroker.postSetLeAudioVolumeIndex(index, maxIndex, streamType);














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











    }







    }



























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







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










@@ -5417,7 +5416,7 @@ public class AudioService extends IAudioService.Stub

























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







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











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







                // 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







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











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







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