OSDN Git Service

Remove redundant logic from system/bt/bta
authorJack He <siyuanh@google.com>
Fri, 30 Sep 2016 19:57:44 +0000 (12:57 -0700)
committerJack He <siyuanh@google.com>
Fri, 30 Sep 2016 21:15:54 +0000 (21:15 +0000)
Bug: 31274290
Test: Manual
Change-Id: I5a4bff5e25b08a32709cdc81bac86a641d80f113

bta/ag/bta_ag_sco.c

index 2fd646e..19d37a3 100644 (file)
@@ -1307,14 +1307,8 @@ bool bta_ag_sco_is_open(tBTA_AG_SCB *p_scb)
 *******************************************************************************/
 bool bta_ag_sco_is_opening(tBTA_AG_SCB *p_scb)
 {
-#if (BTM_WBS_INCLUDED == TRUE)
-    return (((bta_ag_cb.sco.state == BTA_AG_SCO_OPENING_ST) ||
-            (bta_ag_cb.sco.state == BTA_AG_SCO_OPENING_ST)) &&
-            (bta_ag_cb.sco.p_curr_scb == p_scb));
-#else
     return ((bta_ag_cb.sco.state == BTA_AG_SCO_OPENING_ST) &&
             (bta_ag_cb.sco.p_curr_scb == p_scb));
-#endif
 }
 
 /*******************************************************************************