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

Commit b1beefdb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "bt: don't return the address of a stack-allocated string" am:... 

Merge "bt: don't return the address of a stack-allocated string" am: eb6aa8b6 am: 5006e690 am: 8a72320c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1418959

Change-Id: I31718e3d4541ef3593fd6a99dae5371d334968bf
parents 13288d0f 8a72320c

system/main/shim/btm_api.cc

+2 −3
Original line number Diff line number Diff line
@@ -1277,9 +1277,8 @@ void bluetooth::shim::BTM_SecClearSecurityFlags(const RawAddress& bd_addr) { 
}



char* bluetooth::shim::BTM_SecReadDevName(const RawAddress& address) {

  char name[] = "TODO: See if this is needed";

  char* n = name;

  return n;

  static char name[] = "TODO: See if this is needed";

  return name;

}



bool bluetooth::shim::BTM_SecAddRmtNameNotifyCallback(