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

Commit 75e156e2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Correct volume control symbol for BLE" am: 200dfd38 am: 50987acb 

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

Change-Id: I21844add8be8b0deeda87f399d46b9d4868b31e0
parents c65ee54b 50987acb

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

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

import android.media.IAudioService;

import android.media.IVolumeController;

import android.media.MediaRoute2Info;

import android.media.MediaRouter2Manager;

import android.media.RoutingSessionInfo;

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

        boolean changed = false;

        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 =

                    (mAudio.getDevicesForStream(AudioManager.STREAM_MUSIC) &

                            (AudioManager.DEVICE_OUT_BLUETOOTH_A2DP |

                            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);

        }

        return changed;