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

Commit 5006e690 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: eb6aa8b6 

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

Change-Id: I3961f7a28be5f855715471248eb1887a45dc3759
parents c7d9f839 eb6aa8b6

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(