From 15d78c0b95a6afc58001365794f9b5de942cf7e8 Mon Sep 17 00:00:00 2001 From: Hyundo Moon Date: Fri, 18 Feb 2022 11:25:58 +0900 Subject: Correct volume control symbol for BLE Bug: 204404173 Test: Connected BLE headset and checked volume slider Change-Id: If79edd7a0ef74659a917aba11ba70081f50b87fb --- .../com/android/systemui/volume/VolumeDialogControllerImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java index cd6a77836304..70e4fb523637 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java @@ -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; -- cgit v1.2.3-59-g8ed1b