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

Commit 2844c42f authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Do not rediscover HOGP device services on restart" into main am:... 

Merge "Do not rediscover HOGP device services on restart" into main am: 35d9844c am: 4599cd59 am: 63de74e6 am: 3430ca59

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



Change-Id: I0a1e10ac64f76d71c9759296b8bfda1176a12b76
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef03ff34 3430ca59

system/bta/hh/bta_hh_le.cc

+4 −2
Original line number Diff line number Diff line
@@ -978,16 +978,18 @@ void bta_hh_security_cmpl(tBTA_HH_DEV_CB* p_cb, 
  APPL_TRACE_DEBUG("%s", __func__);

  if (p_cb->status == BTA_HH_OK) {

    if (p_cb->hid_srvc.state < BTA_HH_SERVICE_DISCOVERED) {

      APPL_TRACE_DEBUG("bta_hh_security_cmpl no reports loaded, try to load");

      LOG_DEBUG("No reports loaded, try to load");



      /* start loading the cache if not in stack */

      tBTA_HH_RPT_CACHE_ENTRY* p_rpt_cache;

      uint8_t num_rpt = 0;

      if ((p_rpt_cache = bta_hh_le_co_cache_load(p_cb->addr, &num_rpt,

                                                 p_cb->app_id)) != NULL) {

        LOG_DEBUG("Cache found, no need to perform service discovery");

        bta_hh_process_cache_rpt(p_cb, p_rpt_cache, num_rpt);

      }

    }



    /*  discovery has been done for HID service */

    if (p_cb->app_id != 0 &&

        p_cb->hid_srvc.state >= BTA_HH_SERVICE_DISCOVERED) {
@@ -2221,7 +2223,7 @@ static void bta_hh_process_cache_rpt(tBTA_HH_DEV_CB* p_cb, 


  if (num_rpt != 0) /* no cache is found */

  {

    p_cb->hid_srvc.state = BTA_HH_SERVICE_UNKNOWN;

    p_cb->hid_srvc.state = BTA_HH_SERVICE_DISCOVERED;



    /* set the descriptor info */

    p_cb->hid_srvc.descriptor.dl_len = p_cb->dscp_info.descriptor.dl_len;