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

Commit b3580d41 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Robust caching: read database hash on devices with unknown state." into main am: b97cbb6e 

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



Change-Id: If8d68ceaa9ec8e588e3a440e27991251cd4921d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c5dcd7e7 b97cbb6e

system/bta/gatt/bta_gattc_act.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -552,7 +552,7 @@ void bta_gattc_conn(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data) { 
      if (!db.IsEmpty()) p_clcb->p_srcb->gatt_database = db;

      if (!db.IsEmpty()) p_clcb->p_srcb->gatt_database = db;





      if (db.IsEmpty() ||

      if (db.IsEmpty() ||

          robust_caching_support == RobustCachingSupport::SUPPORTED) {

          robust_caching_support != RobustCachingSupport::UNSUPPORTED) {

        // If the peer device is expected to support robust caching, or if we

        // If the peer device is expected to support robust caching, or if we

        // don't know its services yet, then we should do discovery (which may

        // don't know its services yet, then we should do discovery (which may

        // short-circuit through a hash match, but might also do the full

        // short-circuit through a hash match, but might also do the full