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

Commit eb6ba2f6 authored by Vlad Popa's avatar Vlad Popa
Browse files

Remove the extra SCO intent when changing volume 

This was just a workaround until all the external parties that were
listening to the deprecated STREAM_BLUETOOTH_SCO intent adjust the code
to react to STREAM_VOICE_CALL instead.

Test: manual
Bug: 376756660
Flag: android.media.audio.deprecate_stream_bt_sco
Change-Id: I0fd11c070c45320c4ecbc3bb1c7c0a56ce439df8
parent ac37f0f6

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

+4 −29
Original line number Diff line number Diff line
@@ -4175,12 +4175,6 @@ public class AudioService extends IAudioService.Stub 
        // Stream mute changed, fire the intent.

        Intent intent = new Intent(AudioManager.STREAM_MUTE_CHANGED_ACTION);

        intent.putExtra(AudioManager.EXTRA_STREAM_VOLUME_MUTED, isMuted);

        if (replaceStreamBtSco() && isStreamBluetoothSco(streamType)) {

            intent.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE,

                    AudioSystem.STREAM_BLUETOOTH_SCO);

            // in this case broadcast for both sco and voice_call streams the mute status

            sendBroadcastToAll(intent, null /* options */);

        }

        intent.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, streamType);

        sendBroadcastToAll(intent, null /* options */);

    }
@@ -9663,16 +9657,9 @@ public class AudioService extends IAudioService.Stub 
                        mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, index);

                        mVolumeChanged.putExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE,

                                oldIndex);

                        int extraStreamType = mStreamType;

                        // TODO: remove this when deprecating STREAM_BLUETOOTH_SCO

                        if (isStreamBluetoothSco(mStreamType)) {

                            mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE,

                                    AudioSystem.STREAM_BLUETOOTH_SCO);

                            extraStreamType = AudioSystem.STREAM_BLUETOOTH_SCO;

                        } else {















                        mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE,















                                mStreamType);













                        }















                        mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE_ALIAS,















                                streamAlias);























@@ -9682,22 +9669,10 @@ public class AudioService extends IAudioService.Stub













                                aliasStreamIndexesString =















                                        " aliased streams: " + aliasStreamIndexes;















                            }













                            AudioService.sVolumeLogger.enqueue(new VolChangedBroadcastEvent(













                                    extraStreamType, aliasStreamIndexesString, index, oldIndex));













                            if (extraStreamType != mStreamType) {















                            AudioService.sVolumeLogger.enqueue(new VolChangedBroadcastEvent(















                                    mStreamType, aliasStreamIndexesString, index, oldIndex));















                        }













                        }















                        sendBroadcastToAll(mVolumeChanged, mVolumeChangedOptions);













                        if (extraStreamType != mStreamType) {













                            // send multiple intents in case we merged voice call and bt sco streams













                            mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE,













                                    mStreamType);













                            // do not use the options in thid case which could discard













                            // the previous intent













                            sendBroadcastToAll(mVolumeChanged, null);













                        }















                    }















                }















            }