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

Commit bd3ef5ac authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge changes I09303d9b,I2910ab5f,Iae2cd514 into tm-qpr-dev am: a2dce06e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/19395453



Change-Id: Idaeeb39ed3505c8cc6095f901e9ff3a49010648a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11b031a1 a2dce06e

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+1 −1
Original line number Diff line number Diff line
@@ -5347,7 +5347,7 @@ public class AdapterService extends Service { 
            initFlags.add(String.format("%s=%s", GD_LINK_POLICY_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                GATT_ROBUST_CACHING_CLIENT_FLAG, false)) {

                GATT_ROBUST_CACHING_CLIENT_FLAG, true)) {

            initFlags.add(String.format("%s=%s", GATT_ROBUST_CACHING_CLIENT_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

system/stack/gatt/gatt_attr.cc

+16 −1
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ static void gatt_cl_op_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op, 


static void gatt_cl_start_config_ccc(tGATT_PROFILE_CLCB* p_clcb);



static bool gatt_cl_is_robust_caching_enabled();



static bool gatt_sr_is_robust_caching_enabled();



static bool read_sr_supported_feat_req(
@@ -430,7 +432,7 @@ void gatt_profile_db_init(void) { 
  gatt_cb.gatt_svr_supported_feat_mask |= BLE_GATT_SVR_SUP_FEAT_EATT_BITMASK;

  gatt_cb.gatt_cl_supported_feat_mask |= BLE_GATT_CL_ANDROID_SUP_FEAT;



  if (gatt_sr_is_robust_caching_enabled())

  if (gatt_cl_is_robust_caching_enabled())

    gatt_cb.gatt_cl_supported_feat_mask |= BLE_GATT_CL_SUP_FEAT_CACHING_BITMASK;



  VLOG(1) << __func__ << ": gatt_if=" << gatt_cb.gatt_if << " EATT supported";
@@ -846,6 +848,19 @@ bool gatt_profile_get_eatt_support(const RawAddress& remote_bda) { 
  return tcb.sr_supp_feat & BLE_GATT_SVR_SUP_FEAT_EATT_BITMASK;

}



/*******************************************************************************

 *

 * Function         gatt_cl_is_robust_caching_enabled

 *

 * Description      Check if Robust Caching is enabled on client side.

 *

 * Returns          true if enabled in gd flag, otherwise false

 *

 ******************************************************************************/

static bool gatt_cl_is_robust_caching_enabled() {

  return bluetooth::common::init_flags::gatt_robust_caching_client_is_enabled();

}



/*******************************************************************************

 *

 * Function         gatt_sr_is_robust_caching_enabled