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

Commit eb9b0a24 authored by Marie Janssen's avatar Marie Janssen
Browse files

build: fixes for LOG_* message build errors. 

Differences in aosp and master mean these were missed before.

Change-Id: Ieedffa62ca0c175637947eb190ead579eb55ff58
(cherry picked from commit fcd814a35c862e46f82332ca203d17f280b33d2f)
parent afbb7110

system/device/src/interop.c

+3 −2
Original line number Diff line number Diff line
@@ -46,8 +46,9 @@ bool interop_match(const interop_feature_t feature, const bt_bdaddr_t *addr) { 
    if (feature == interop_database[i].feature &&

        memcmp(addr, &interop_database[i].addr, interop_database[i].len) == 0) {

      char bdstr[20] = {0};

      LOG_WARN("%s() Device %s is a match for interop workaround %s", __func__,

          bdaddr_to_string(addr, bdstr, sizeof(bdstr)), interop_feature_string(feature));

      LOG_WARN(LOG_TAG, "%s() Device %s is a match for interop workaround %s",

          __func__, bdaddr_to_string(addr, bdstr, sizeof(bdstr)),

                        interop_feature_string(feature));

      return true;

    }

  }

system/osi/src/config.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ bool config_save(const config_t *config, const char *filename) { 


  // 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));

    LOG_ERROR(LOG_TAG, "%s unable to change file permissions '%s': %s", __func__, filename, strerror(errno));

    goto error;

  }

system/service/a2dp_source.cpp

+2 −2
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ namespace { 


void ConnectionStateCallback(btav_connection_state_t state,

                             UNUSED_ATTR bt_bdaddr_t *bd_addr) {

  LOG_INFO("%s: %s", __func__, BtAvConnectionStateText(state));

  LOG_INFO(LOG_TAG, "%s: %s", __func__, BtAvConnectionStateText(state));

}



void AudioStateCallback(btav_audio_state_t state,

                        UNUSED_ATTR bt_bdaddr_t *bd_addr) {

  LOG_INFO("%s: %s", __func__, BtAvAudioStateText(state));

  LOG_INFO(LOG_TAG, "%s: %s", __func__, BtAvAudioStateText(state));

}



void AudioConfigCallback(UNUSED_ATTR bt_bdaddr_t *bd_addr,

system/service/host.cpp

+3 −3
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ bool Host::OnSetAdvertisement(const std::string& service_uuid, 
                              const std::string& advertise_uuids,

                              const std::string& advertise_data,

                              const std::string& transmit_name) {

  LOG_INFO("%s: service:%s uuids:%s data:%s", __func__, service_uuid.c_str(),

  LOG_INFO(LOG_TAG, "%s: service:%s uuids:%s data:%s", __func__, service_uuid.c_str(),

           advertise_uuids.c_str(), advertise_data.c_str());



  const std::vector<std::string> advertise_uuid_tokens(
@@ -232,7 +232,7 @@ bool Host::OnMessage() { 
    LOG_ERROR(LOG_TAG, "Error reading datagram size: %s", strerror(errno));

    return false;

  } else if (0 == size) {

    LOG_INFO("%s:%d: Connection closed", __func__, __LINE__);

    LOG_INFO(LOG_TAG, "%s:%d: Connection closed", __func__, __LINE__);

    return false;

  }
@@ -242,7 +242,7 @@ bool Host::OnMessage() { 
    LOG_ERROR(LOG_TAG, "Error reading IPC: %s", strerror(errno));

    return false;

  } else if (0 == size) {

    LOG_INFO("%s:%d: Connection closed", __func__, __LINE__);

    LOG_INFO(LOG_TAG, "%s:%d: Connection closed", __func__, __LINE__);

    return false;

  }