commit 2b737b856d77442f12838e83340a28035dee4efd
author Dan Willemsen <dwillemsen@google.com> Wed May 09 05:59:03 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 09 05:59:03 2018 +0000
tree 1edc5381c1da89b839e9f84a03c7fb36f33d1aea
parent 61d1e86c5b4beb3bf4dabba3de0490cad637afb3
parent f9f186ade89c6135b2e45e0316da9083a838fa22

Merge "Remove unused `tags` property from Android.bp files"

audio_a2dp_hw/src/audio_a2dp_hw.cc

diff --git a/audio_a2dp_hw/src/audio_a2dp_hw.cc b/audio_a2dp_hw/src/audio_a2dp_hw.cc
index 837e124..3622298 100644
--- a/audio_a2dp_hw/src/audio_a2dp_hw.cc
+++ b/audio_a2dp_hw/src/audio_a2dp_hw.cc
@@ -748,7 +748,8 @@
 static int a2dp_get_presentation_position_cmd(struct a2dp_stream_common* common,
                                               uint64_t* bytes, uint16_t* delay,
                                               struct timespec* timestamp) {
-  if (common->ctrl_fd == AUDIO_SKT_DISCONNECTED) {  // Already disconnected
+  if ((common->ctrl_fd == AUDIO_SKT_DISCONNECTED) ||
+      (common->state != AUDIO_A2DP_STATE_STARTED)) {  // Audio is not streaming
     return -1;
   }
 

binder/android/bluetooth/IBluetoothHeadset.aidl

diff --git a/binder/android/bluetooth/IBluetoothHeadset.aidl b/binder/android/bluetooth/IBluetoothHeadset.aidl
index 60a92d2..f8dfb65 100644
--- a/binder/android/bluetooth/IBluetoothHeadset.aidl
+++ b/binder/android/bluetooth/IBluetoothHeadset.aidl
@@ -51,8 +51,8 @@
     void setAudioRouteAllowed(boolean allowed);
     boolean getAudioRouteAllowed();
     void setForceScoAudio(boolean forced);
-    boolean startScoUsingVirtualVoiceCall(in BluetoothDevice device);
-    boolean stopScoUsingVirtualVoiceCall(in BluetoothDevice device);
+    boolean startScoUsingVirtualVoiceCall();
+    boolean stopScoUsingVirtualVoiceCall();
     oneway void phoneStateChanged(int numActive, int numHeld, int callState, String number, int type);
     void clccResponse(int index, int direction, int status, int mode, boolean mpty,
                       String number, int type);