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

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

Merge "Use existing, pre-defined empty name" into main am: fff12f83 am: f53d4ee1 

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



Change-Id: I6188b104b8a2cf74e6ca8cf16d034435654b58dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ddf65d4c f53d4ee1

system/stack/btm/btm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -2320,7 +2320,7 @@ void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr, 
    }

  }



  if (!p_bd_name) p_bd_name = (const uint8_t*)"";

  if (!p_bd_name) p_bd_name = (const uint8_t*)kBtmBdNameEmpty;



  if (p_dev_rec == nullptr) {

    log::debug(