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

Commit 04e4c3dc authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

Merge "VolumeControl: Apply remote volume to Android" into main am: 0cfacee8 

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



Change-Id: I7009db44f052617940036cabb2b651c9db489c99
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc99edd3 0cfacee8

android/app/src/com/android/bluetooth/vc/VolumeControlService.java

+34 −13
Original line number Diff line number Diff line
@@ -714,6 +714,29 @@ public class VolumeControlService extends ProfileService { 
        }

    }



    void updateGroupCacheAndAudioSystem(int groupId, int volume, boolean mute) {

        Log.d(

                TAG,

                " updateGroupCacheAndAudioSystem: groupId: "

                        + groupId

                        + ", vol: "

                        + volume

                        + ", mute: "

                        + mute);



        mGroupVolumeCache.put(groupId, volume);

        mGroupMuteCache.put(groupId, mute);



        int streamType = getBluetoothContextualVolumeStream();

        int flags = AudioManager.FLAG_SHOW_UI | AudioManager.FLAG_BLUETOOTH_ABS_VOLUME;

        mAudioManager.setStreamVolume(streamType, getDeviceVolume(streamType, volume), flags);



        if (mAudioManager.isStreamMute(streamType) != mute) {

            int adjustment = mute ? AudioManager.ADJUST_MUTE : AudioManager.ADJUST_UNMUTE;

            mAudioManager.adjustStreamVolume(streamType, adjustment, flags);

        }

    }



    void handleVolumeControlChanged(BluetoothDevice device, int groupId,

                                    int volume, boolean mute, boolean isAutonomous) {
@@ -739,6 +762,15 @@ public class VolumeControlService extends ProfileService { 
        int groupVolume = getGroupVolume(groupId);

        Boolean groupMute = getGroupMute(groupId);



        if (groupVolume == IBluetoothVolumeControl.VOLUME_CONTROL_UNKNOWN_VOLUME) {

            /* We are here, because system was just started and LeAudio device just connected.

             * In such case, we take Volume stored on remote device and apply it to our cache and

             * audio system.

             */

            updateGroupCacheAndAudioSystem(groupId, volume, mute);

            return;

        }



        if (!isAutonomous) {

            /* If the change is triggered by Android device, the stream is already changed.

             * However it might be called with isAutonomous, one the first read of after
@@ -762,8 +794,7 @@ public class VolumeControlService extends ProfileService { 
                    }

                }



                if (can_change_volume && (groupVolume != volume) && (groupVolume

                            != IBluetoothVolumeControl.VOLUME_CONTROL_UNKNOWN_VOLUME)) {

                if (can_change_volume && (groupVolume != volume)) {

                    Log.i(TAG, "Setting value:" + groupVolume + " to " + device);

                    mVolumeControlNativeInterface.setVolume(device, groupVolume);

                }
@@ -781,17 +812,7 @@ public class VolumeControlService extends ProfileService { 
            }

        } else {

            /* Received group notification for autonomous change. Update cache and audio system. */

            mGroupVolumeCache.put(groupId, volume);

            mGroupMuteCache.put(groupId, mute);



            int streamType = getBluetoothContextualVolumeStream();

            int flags = AudioManager.FLAG_SHOW_UI | AudioManager.FLAG_BLUETOOTH_ABS_VOLUME;

            mAudioManager.setStreamVolume(streamType, getDeviceVolume(streamType, volume), flags);



            if (mAudioManager.isStreamMute(streamType) != mute) {

                int adjustment = mute ? AudioManager.ADJUST_MUTE : AudioManager.ADJUST_UNMUTE;

                mAudioManager.adjustStreamVolume(streamType, adjustment, flags);

            }

            updateGroupCacheAndAudioSystem(groupId, volume, mute);

        }

    }