Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct volume control symbol for BLE" am: 200dfd387f am: 50987acb5b

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

Change-Id: I21844add8be8b0deeda87f399d46b9d4868b31e0
This commit is contained in:
Treehugger Robot
2022-03-03 03:17:01 +00:00
committed by Automerger Merge Worker
parent c65ee54bcb 50987acb5b
commit 75e156e2c5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
View File

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