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

Commit 9f16e047 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Gerrit Code Review
Browse files

Merge "Remove gatt_rediscover_on_canceled flag" into main

parents 5050ac1d 7df7e9b0

flags/gap.aconfig

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

}



flag {

    name: "gatt_rediscover_on_canceled"

    namespace: "bluetooth"

    description: "Re-initiate discovery if the previous discovery is canceled for multiple GATT clients"

    bug: "335082571"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "le_scan_use_uid_for_importance"

    namespace: "bluetooth"

system/bta/gatt/bta_gattc_act.cc

+2 −3
Original line number Diff line number Diff line
@@ -764,9 +764,8 @@ void bta_gattc_disc_close(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data 
  log::verbose("Discovery cancel conn_id=0x{:x}", p_clcb->bta_conn_id);



  if (p_clcb->disc_active ||

      (com::android::bluetooth::flags::gatt_rediscover_on_canceled() &&

      (p_clcb->request_during_discovery == BTA_GATTC_DISCOVER_REQ_READ_DB_HASH ||

        p_clcb->request_during_discovery == BTA_GATTC_DISCOVER_REQ_READ_DB_HASH_FOR_SVC_CHG))) {

       p_clcb->request_during_discovery == BTA_GATTC_DISCOVER_REQ_READ_DB_HASH_FOR_SVC_CHG)) {

    bta_gattc_reset_discover_st(p_clcb->p_srcb, GATT_ERROR);

  } else {

    p_clcb->state = BTA_GATTC_CONN_ST;