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

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

Merge "bta_gattc_start_discover: trivial style fix" into main am: e34d7578 

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



Change-Id: I9eab0b107a1a1ce15c92638419463a2401a6eee3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d3b2778 e34d7578

system/bta/gatt/bta_gattc_act.cc

+31 −30
Original line number Diff line number Diff line
@@ -822,7 +822,11 @@ void bta_gattc_start_discover(tBTA_GATTC_CLCB* p_clcb, 
  {

    p_clcb->auto_update = BTA_GATTC_NO_SCHEDULE;



    if (p_clcb->p_srcb != NULL) {

    if (p_clcb->p_srcb == NULL) {

      LOG(ERROR) << "unknown device, can not start discovery";

      return;

    }



    /* set all srcb related clcb into discovery ST */

    bta_gattc_set_discover_st(p_clcb->p_srcb);
@@ -854,9 +858,6 @@ void bta_gattc_start_discover(tBTA_GATTC_CLCB* p_clcb, 
    }



    bta_gattc_start_discover_internal(p_clcb);

    } else {

      LOG(ERROR) << "unknown device, can not start discovery";

    }

  }

  /* pending operation, wait until it finishes */

  else {