Bug 3352047 Wrong message when adjusting volume
Add hidden AudioManager.getDevicesForStream and output device codes.
Change-Id: I4d1c1d3b6a077cd117720817d1f733dda557b947
diff --git a/core/java/android/view/VolumePanel.java b/core/java/android/view/VolumePanel.java
index 3bab29f..a67ce17 100644
--- a/core/java/android/view/VolumePanel.java
+++ b/core/java/android/view/VolumePanel.java
@@ -403,7 +403,10 @@
case AudioManager.STREAM_MUSIC: {
// message = MUSIC_VOLUME_TEXT;
// Special case for when Bluetooth is active for music
- if (mAudioManager.isBluetoothA2dpOn()) {
+ if ((mAudioManager.getDevicesForStream(AudioManager.STREAM_MUSIC) &
+ (AudioManager.DEVICE_OUT_BLUETOOTH_A2DP |
+ AudioManager.DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |
+ AudioManager.DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER)) != 0) {
// additionalMessage =
// com.android.internal.R.string.volume_music_hint_playing_through_bluetooth;
// setLargeIcon(com.android.internal.R.drawable.ic_volume_bluetooth_ad2p);