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

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

Merge "hearing_aid: Fix handling BTA_GATTC_ENC_CMPL_CB_EVT" am: e4587374 am:... 

Merge "hearing_aid: Fix handling BTA_GATTC_ENC_CMPL_CB_EVT" am: e4587374 am: 80fda444 am: df2733c7

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



Change-Id: Ic9e9c8cdd4bb572c8d3e7dc4971b096921017c37
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75352eb7 df2733c7

system/bta/hearing_aid/hearing_aid.cc

+3 −1
Original line number Diff line number Diff line
@@ -1868,7 +1868,9 @@ void hearingaid_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) { 


    case BTA_GATTC_ENC_CMPL_CB_EVT:

      if (!instance) return;

      instance->OnEncryptionComplete(p_data->enc_cmpl.remote_bda, true);

      instance->OnEncryptionComplete(

          p_data->enc_cmpl.remote_bda,

          BTM_IsEncrypted(p_data->enc_cmpl.remote_bda, BT_TRANSPORT_LE));

      break;



    case BTA_GATTC_CONN_UPDATE_EVT: