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

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

Merge "Read local cache directly if bonded" am: 2a309288 am: 16548695 am:... 

Merge "Read local cache directly if bonded" am: 2a309288 am: 16548695 am: f53123bf am: 50d34581

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



Change-Id: Id53634da95a8e3d197299bad910cb9f623dd908b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 624a3c46 50d34581

system/bta/gatt/bta_gattc_act.cc

+2 −5
Original line number Diff line number Diff line
@@ -536,12 +536,9 @@ void bta_gattc_conn(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data) { 
      p_clcb->p_srcb->state != BTA_GATTC_SERV_IDLE) {

    if (p_clcb->p_srcb->state == BTA_GATTC_SERV_IDLE) {

      p_clcb->p_srcb->state = BTA_GATTC_SERV_LOAD;

      // Consider the case that if GATT Server is changed, but no service

      // changed indication is received, the database might be out of date. So

      // if robust caching is enabled, any time when connection is established,

      // always check the db hash first, not just load the stored database.

      // For bonded devices, read cache directly, and back to connected state.

      gatt::Database db = bta_gattc_cache_load(p_clcb->p_srcb->server_bda);

      if (!bta_gattc_is_robust_caching_enabled() && !db.IsEmpty()) {

      if (!db.IsEmpty() && btm_sec_is_a_bonded_dev(p_clcb->p_srcb->server_bda)) {

        p_clcb->p_srcb->gatt_database = db;

        p_clcb->p_srcb->state = BTA_GATTC_SERV_IDLE;

        bta_gattc_reset_discover_st(p_clcb->p_srcb, GATT_SUCCESS);