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

Commit bb6c888e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22316109']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22316109'] into security-aosp-tm-release.

Change-Id: Iaaa8523b396c0dc026d09a2ce6096f9de04f0c19
parents 2d150089 ec573bc8

system/stack/gatt/gatt_utils.cc

+7 −0
Original line number Diff line number Diff line
@@ -1501,6 +1501,13 @@ void gatt_end_operation(tGATT_CLCB* p_clcb, tGATT_STATUS status, void* p_data) { 
      cb_data.att_value.handle = p_clcb->s_handle;

      cb_data.att_value.len = p_clcb->counter;



      if (cb_data.att_value.len > GATT_MAX_ATTR_LEN) {

        LOG(WARNING) << __func__

                     << StringPrintf(" Large cb_data.att_value, size=%d",

                                     cb_data.att_value.len);

        cb_data.att_value.len = GATT_MAX_ATTR_LEN;

      }



      if (p_data && p_clcb->counter)

        memcpy(cb_data.att_value.value, p_data, cb_data.att_value.len);

    }