am db554581: build: Update osi log functions, use consistently

* commit 'db554581079863974af8e1289646f5deea6fc044':
  build: Update osi log functions, use consistently

diff --cc audio_a2dp_hw/audio_a2dp_hw.c
Simple merge

diff --cc bta/dm/bta_dm_act.c
Simple merge

diff --cc bta/gatt/bta_gattc_act.c
Simple merge

diff --cc bta/hh/bta_hh_le.c
Simple merge

diff --cc btif/src/bluetooth.c
Simple merge

diff --cc btif/src/btif_core.c
Simple merge

diff --cc btif/src/btif_dm.c
Simple merge

diff --cc btif/src/btif_gatt_client.c
Simple merge

diff --cc btif/src/btif_gatt_server.c
Simple merge

diff --cc btif/src/btif_gatt_util.c
Simple merge

diff --cc btif/src/btif_hh.c
Simple merge

diff --cc btif/src/btif_media_task.c
Simple merge

diff --cc btif/src/btif_sock_l2cap.c
Simple merge

diff --cc btif/src/btif_sock_rfc.c
Simple merge

diff --cc btif/src/btif_storage.c
Simple merge

diff --cc hci/src/btsnoop.c
index 484b9a1,f1dcab8..5593e00
--- 1/hci/src/btsnoop.c
--- 2/hci/src/btsnoop.c
+++ b/hci/src/btsnoop.c
@@@ -164,9 -153,9 +164,9 @@@ static void update_logging() 
      // Save the old log if configured to do so
      if (stack_config->get_btsnoop_should_save_last()) {
        char last_log_path[PATH_MAX];
 -      snprintf(last_log_path, PATH_MAX, "%s.last", log_path);
 +      snprintf(last_log_path, PATH_MAX, "%s.%llu", log_path, btsnoop_timestamp());
        if (!rename(log_path, last_log_path) && errno != ENOENT)
-         LOG_ERROR("%s unable to rename '%s' to '%s': %s", __func__, log_path, last_log_path, strerror(errno));
+         LOG_ERROR(LOG_TAG, "%s unable to rename '%s' to '%s': %s", __func__, log_path, last_log_path, strerror(errno));
      }
  
      logfile_fd = open(log_path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);

diff --cc hci/src/hci_inject.c
Simple merge

diff --cc hci/src/hci_layer.c
Simple merge

diff --cc osi/src/config.c
index 46acab0,7af398f..d9ac70d
--- 1/osi/src/config.c
--- 2/osi/src/config.c
+++ b/osi/src/config.c
@@@ -284,14 -283,8 +284,14 @@@ bool config_save(const config_t *config
    fflush(fp);
    fclose(fp);
  
 +  // Change the file's permissions to Read/Write by User and Group
 +  if (chmod(temp_filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP) == -1) {
 +    LOG_ERROR("%s unable to change file permissions '%s': %s", __func__, filename, strerror(errno));
 +    goto error;
 +  }
 +
    if (rename(temp_filename, filename) == -1) {
-     LOG_ERROR("%s unable to commit file '%s': %s", __func__, filename, strerror(errno));
+     LOG_ERROR(LOG_TAG, "%s unable to commit file '%s': %s", __func__, filename, strerror(errno));
      goto error;
    }
  

diff --cc stack/btm/btm_ble.c
Simple merge

diff --cc stack/btm/btm_ble_gap.c
Simple merge

diff --cc stack/btm/btm_sec.c
Simple merge

diff --cc stack/l2cap/l2c_api.c
Simple merge