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

Commit 200dfd38 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Correct volume control symbol for BLE"

parents 2b65ebc3 15d78c0b

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ import android.media.AudioManager; 
import android.media.AudioSystem;

import android.media.AudioSystem;

import android.media.IAudioService;

import android.media.IAudioService;

import android.media.IVolumeController;

import android.media.IVolumeController;

import android.media.MediaRoute2Info;

import android.media.MediaRouter2Manager;

import android.media.MediaRouter2Manager;

import android.media.RoutingSessionInfo;

import android.media.RoutingSessionInfo;

import android.media.VolumePolicy;

import android.media.VolumePolicy;
@@ -462,11 +461,15 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa 
    private boolean checkRoutedToBluetoothW(int stream) {

    private boolean checkRoutedToBluetoothW(int stream) {

        boolean changed = false;

        boolean changed = false;

        if (stream == AudioManager.STREAM_MUSIC) {

        if (stream == AudioManager.STREAM_MUSIC) {

            // Note: Here we didn't use DEVICE_OUT_BLE_SPEAKER and DEVICE_OUT_BLE_BROADCAST

            //       Since their values overlap with DEVICE_OUT_EARPIECE and DEVICE_OUT_SPEAKER.

            //       Anyway, we can check BLE devices by using just DEVICE_OUT_BLE_HEADSET.

            final boolean routedToBluetooth =

            final boolean routedToBluetooth =

                    (mAudio.getDevicesForStream(AudioManager.STREAM_MUSIC) &

                    (mAudio.getDevicesForStream(AudioManager.STREAM_MUSIC) &

                            (AudioManager.DEVICE_OUT_BLUETOOTH_A2DP |

                            (AudioManager.DEVICE_OUT_BLUETOOTH_A2DP |

                            AudioManager.DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |

                            AudioManager.DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |

                            AudioManager.DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER)) != 0;

                            AudioManager.DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER |

                            AudioManager.DEVICE_OUT_BLE_HEADSET)) != 0;

            changed |= updateStreamRoutedToBluetoothW(stream, routedToBluetooth);

            changed |= updateStreamRoutedToBluetoothW(stream, routedToBluetooth);

        }

        }

        return changed;

        return changed;