Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff4b0d6d authored by Yuyang Huang's avatar Yuyang Huang
Browse files

Remove reset_after_collision flag 

The change is in nextfood and rolled out to public, so remove the flag

Bug: 325084426
Bug: 332324315
Change-Id: I94ed93b6e7e05ef810e8e25a4770c1535af54338
Flag: com::android::bluetooth::flags::reset_after_collision
Test: atest net_test_bta
parent b62445cd

flags/hfp.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -39,16 +39,6 @@ flag { 
    }

}



flag {

    name: "reset_after_collision"

    namespace: "bluetooth"

    description: "Reset p_scb when collision occurred and rfcomm is not opened yet"

    bug: "332324315"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "sink_audio_policy_handover"

    namespace: "bluetooth"

system/bta/ag/bta_ag_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
          log::warn("RFCOMM_RemoveConnection failed for {}, handle {}, error {}", dev_addr,

                    ag_scb.conn_handle, status);

        }

      } else if (com::android::bluetooth::flags::reset_after_collision()) {

      } else {

        // As no existing outgoing rfcomm connection, then manual reset current

        // state, and use the incoming one

        bta_ag_rfc_fail(&ag_scb, tBTA_AG_DATA::kEmpty);