From 9656df2b2ec70b2b0e0b644dd380c2f402fb6aa8 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 20 Apr 2016 16:42:28 -0700 Subject: [PATCH] AudioManager: fix isBluetoothA2dpOn() Test all A2DP type variants when checking if an A2DP device is connected in isBluetoothA2dpOn(). Bug: 28286051 Change-Id: I756d632b12d584d8a27cc1890e758d8accff7120 --- media/java/android/media/AudioManager.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 00eff9139dc82..23ae691ddca94 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -1502,11 +1502,16 @@ public class AudioManager { */ public boolean isBluetoothA2dpOn() { if (AudioSystem.getDeviceConnectionState(DEVICE_OUT_BLUETOOTH_A2DP,"") - == AudioSystem.DEVICE_STATE_UNAVAILABLE) { - return false; - } else { + == AudioSystem.DEVICE_STATE_AVAILABLE) { + return true; + } else if (AudioSystem.getDeviceConnectionState(DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES,"") + == AudioSystem.DEVICE_STATE_AVAILABLE) { + return true; + } else if (AudioSystem.getDeviceConnectionState(DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER,"") + == AudioSystem.DEVICE_STATE_AVAILABLE) { return true; } + return false; } /**