commit 2b0e75626a17ad3162af591525fbe3c7707b52fe
author jonerlin <jonerlin@google.com> Mon Nov 25 22:47:00 2019 +0800
committer jonerlin <jonerlin@google.com> Tue Dec 17 23:24:48 2019 +0800
tree c068d29a26b4a1a1a3bb693b5ecb6ec39e693a95
parent fc62052d3446475a045ee533e0b6dcec1eff8109

A2dp: Check the value of mConnectionState in isConnected

* There could be potential critical timing to cause
java.lang.ArrayIndexOutOfBoundsException: index=-1, when a2dp state machine
exit one state to enter another state. at this timing, the mStateStackTopIndex
value of mStateStack be set to -1.
* Checking mConnectionState value which maintained in A2dpStateMachine to avoid
this AndroidRuntime exception.

Bug: 142217033
Test: Enable Bluetooth -> Connect Bluetooth headset -> Disconnect
Bluetooth headset -> Disable Bluetooth then check a2dp state machine log.
Change-Id: Ifdd3e96b84496cef04a70d95b5b64eca81e5db9c

src/com/android/bluetooth/a2dp/A2dpStateMachine.java

diff --git a/src/com/android/bluetooth/a2dp/A2dpStateMachine.java b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
index e0df8b2..cc8f88d 100644
--- a/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
+++ b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
@@ -596,7 +596,7 @@
 
     boolean isConnected() {
         synchronized (this) {
-            return (getCurrentState() == mConnected);
+            return (getConnectionState() == BluetoothProfile.STATE_CONNECTED);
         }
     }