commit c88aae2d9edbf1dbb896bd3595ea25889f29a016
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 19 03:57:43 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 19 03:57:43 2019 +0000
tree 858fcf64e86d2a28d036497b7d53aeb870191d35
parent 2b0e75626a17ad3162af591525fbe3c7707b52fe
parent e7f50211780183985d7093125b06d4a67f5c7461

Merge changes from topic "gps no sound" into qt-qpr1-dev

* changes:
  Update playback state only for navigation sound
  Monitor AudioManger Playback state to update the AVRCP playback state

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);
         }
     }