From: Martin Brabham <optedoblivion@google.com>
Date: Wed, 30 Jun 2021 19:08:02 +0000 (-0700)
Subject: OOB: Return local adapter name in generated OOB Data
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9af605ec524c67f16f56e4d198519a0ce3af2615;p=android-x86%2Fsystem-bt.git

OOB: Return local adapter name in generated OOB Data

Bug: 192475074
Test: Manual, test app.
Tag: #feature
Change-Id: I5086cbe6c0d2ab3346a956e22df36725a9e93530
Merged-In: I5086cbe6c0d2ab3346a956e22df36725a9e93530
---

diff --git a/btif/src/bluetooth.cc b/btif/src/bluetooth.cc
index e071a70bc..a72f787f5 100644
--- a/btif/src/bluetooth.cc
+++ b/btif/src/bluetooth.cc
@@ -80,6 +80,7 @@
 #include "osi/include/wakelock.h"
 #include "stack/gatt/connection_manager.h"
 #include "stack/include/avdt_api.h"
+#include "stack/include/btm_api.h"
 #include "stack/include/btu.h"
 #include "stack_manager.h"
 
@@ -743,6 +744,11 @@ void invoke_oob_data_request_cb(tBT_TRANSPORT t, bool valid, Octet16 c,
                                 uint8_t address_type) {
   LOG_INFO("%s", __func__);
   bt_oob_data_t oob_data = {};
+  char* local_name;
+  BTM_ReadLocalDeviceName(&local_name);
+  for (int i = 0; i < BTM_MAX_LOC_BD_NAME_LEN; i++) {
+    oob_data.device_name[i] = local_name[i];
+  }
 
   // Set the local address
   int j = 5;