Commit: cda119df1f6bd0e743962666feff215daad28f09 - system-bt (git)

system/bt

Commit MetaInfo

• Revision: cda119df1f6bd0e743962666feff215daad28f09 (tree)
• Time: 2019-11-14 13:21:27
• Author: Jeevaka Prabu Badrappan <jeevaka.badrappan@inte...>
• Commiter: Chih-Wei Huang

Log Message

Fix for Bluetooth device name reset to default name after reboot

Reason: When the BT device name is updated is getting saved
to the config data pointer but not to the persistent data
(i.e. bt_config.conf). So, when the reboot is happening it
is not able to get the updated device name from the persistent
data (i.e. bt_config.conf) as during reboot bt_config_flush is
not called. It is only called on the BT Enable Event.

Fix: Saving the BT Device name to persistent data using
btif_config_flush once it is set.

Tracked-On: OAM-67917

Signed-off-by: Gaganpreet kaur <[e-mail]>
Signed-off-by: Aiswarya Cyriac <[e-mail]>

Change Summary

• modified: btif/src/btif_storage.cc

Incremental Difference

--- a/btif/src/btif_storage.cc
+++ b/btif/src/btif_storage.cc
@@ -208,10 +208,12 @@ static int prop2cfg(const RawAddress* remote_bd_addr, bt_property_t* prop) {
                             : prop->len;
       strncpy(value, (char*)prop->val, name_length);
       value[name_length] = '\0';
-      if (remote_bd_addr)
+      if (remote_bd_addr) {
         btif_config_set_str(bdstr, BTIF_STORAGE_PATH_REMOTE_NAME, value);
-      else
+      } else {
         btif_config_set_str("Adapter", BTIF_STORAGE_KEY_ADAPTER_NAME, value);
+        btif_config_flush();
+      }
       break;
     }
     case BT_PROPERTY_REMOTE_FRIENDLY_NAME: