commit 77596c0fb07662a3f9f791e8f7fbb2688eeac36d
author Pavlin Radoslavov <pavlin@google.com> Fri Mar 23 02:01:03 2018 -0700
committer Pavlin Radoslavov <pavlin@google.com> Fri Mar 23 02:39:57 2018 -0700
tree 42aeb6dc006cd4f5720e1e67fde033517b9ef3ad
parent 130f5b5cd0e1ff4f4fa2fa77a69453ecbdf4b513

Remove deinit_pending flag that is not needed/used

Test: Code compilation
Bug: 74952724
Change-Id: I022e16940c73181f991d528b9c96e2d26151369f
(cherry picked from commit e445b5b8b9225a882136a1c941cf77055540a554)

system/btif/src/btif_a2dp_audio_interface.cc

diff --git a/system/btif/src/btif_a2dp_audio_interface.cc b/system/btif/src/btif_a2dp_audio_interface.cc
index 52c8e46..53b11c5 100644
--- a/system/btif/src/btif_a2dp_audio_interface.cc
+++ b/system/btif/src/btif_a2dp_audio_interface.cc
@@ -61,7 +61,6 @@
 static Status mapToStatus(uint8_t resp);
 uint8_t btif_a2dp_audio_process_request(uint8_t cmd);
 
-static bool deinit_pending = false;
 static void btif_a2dp_audio_send_start_req();
 static void btif_a2dp_audio_send_suspend_req();
 // Delay reporting
@@ -182,16 +181,11 @@
   LOG_DEBUG(
       LOG_TAG, "%s: IBluetoothAudioOffload::getService() returned %p (%s)",
       __func__, btAudio.get(), (btAudio->isRemote() ? "remote" : "local"));
-  deinit_pending = false;
   LOG_INFO(LOG_TAG, "%s:Init returned", __func__);
 }
 
 void btif_a2dp_audio_interface_deinit() {
   LOG_INFO(LOG_TAG, "%s: start", __func__);
-  if (btAudio != nullptr) {
-    deinit_pending = true;
-  }
-  deinit_pending = false;
   btAudio = nullptr;
   LOG_INFO(LOG_TAG, "%s: exit", __func__);
 }
@@ -286,11 +280,6 @@
         status = A2DP_CTRL_ACK_INCALL_FAILURE;
         break;
       }
-      if (deinit_pending) {
-        APPL_TRACE_WARNING("%s: deinit pending return disconnected", __func__);
-        status = A2DP_CTRL_ACK_DISCONNECT_IN_PROGRESS;
-        break;
-      }
       if (btif_av_stream_started_ready()) {
         /*
          * Already started, setup audio data channel listener and ACK
@@ -322,11 +311,6 @@
       break;
 
     case A2DP_CTRL_CMD_STOP:
-      if (deinit_pending) {
-        APPL_TRACE_WARNING("%s: deinit pending return disconnected", __func__);
-        status = A2DP_CTRL_ACK_DISCONNECT_IN_PROGRESS;
-        break;
-      }
       if (btif_av_get_peer_sep() == AVDT_TSEP_SNK &&
           !btif_a2dp_source_is_streaming()) {
         /* We are already stopped, just ack back */
@@ -338,11 +322,6 @@
       break;
 
     case A2DP_CTRL_CMD_SUSPEND:
-      if (deinit_pending) {
-        APPL_TRACE_WARNING("%s: deinit pending return disconnected", __func__);
-        status = A2DP_CTRL_ACK_DISCONNECT_IN_PROGRESS;
-        break;
-      }
       /* Local suspend */
       if (btif_av_stream_started_ready()) {
         btif_av_stream_suspend();