From: Hansong Zhang <hsz@google.com>
Date: Thu, 24 Sep 2020 00:35:10 +0000 (-0700)
Subject: SDP: FCR mode is checked in L2cap layer
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d581fc8a55fe29893fcd2d14065783581834c449;p=android-x86%2Fsystem-bt.git

SDP: FCR mode is checked in L2cap layer

In l2c_fcr_process_peer_cfg_req.

L2cap layer sends config response for you.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I841c8f23c15004cd6aade3b2ce8803cf4dd88909
---

diff --git a/stack/sdp/sdp_main.cc b/stack/sdp/sdp_main.cc
index 4f596ede0..5df9c64ba 100644
--- a/stack/sdp/sdp_main.cc
+++ b/stack/sdp/sdp_main.cc
@@ -229,19 +229,6 @@ static void sdp_config_ind(uint16_t l2cap_cid, tL2CAP_CFG_INFO* p_cfg) {
   p_cfg->mtu_present = false;
   p_cfg->result = L2CAP_CFG_OK;
 
-  /* Check peer config request against our rfcomm configuration */
-  if (p_cfg->fcr_present && p_cfg->fcr.mode != L2CAP_FCR_BASIC_MODE) {
-    /* Reject if locally we want basic and they don't */
-    p_cfg->fcr.mode = L2CAP_FCR_BASIC_MODE;
-    p_cfg->result = L2CAP_CFG_UNACCEPTABLE_PARAMS;
-    SDP_TRACE_DEBUG(
-        "sdp_config_ind(CONFIG) -> Please try again with BASIC mode");
-    /* Remain in configure state and give the peer our desired configuration
-     */
-    L2CA_ConfigRsp(l2cap_cid, p_cfg);
-    return;
-  }
-
   L2CA_ConfigRsp(l2cap_cid, p_cfg);
 
   SDP_TRACE_EVENT("SDP - Rcvd cfg ind, sent cfg cfm, CID: 0x%x", l2cap_cid);