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

Commit e59c2640 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Decouple audio_hearing_aid_hw_default logging from gd"

parents ede12077 becf6e33

system/audio_hearing_aid_hw/Android.bp

+3 −1
Original line number Original line Diff line number Diff line
@@ -9,10 +9,12 @@ package { 




cc_defaults {

cc_defaults {

    name: "audio_hearing_aid_hw_defaults",

    name: "audio_hearing_aid_hw_defaults",

    defaults: ["fluoride_defaults"],

    defaults: ["libchrome_support_defaults"],

    include_dirs: [

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/gd",

        "packages/modules/Bluetooth/system/gd",

        "packages/modules/Bluetooth/system/include",

        "packages/modules/Bluetooth/system/types",

    ],

    ],

}

}

system/audio_hearing_aid_hw/src/audio_hearing_aid_hw.cc

+11 −7
Original line number Original line Diff line number Diff line
@@ -35,10 +35,10 @@ 




#include <hardware/audio.h>

#include <hardware/audio.h>

#include <hardware/hardware.h>

#include <hardware/hardware.h>

#include <log/log.h>

#include <system/audio.h>

#include <system/audio.h>





#include "osi/include/hash_map_utils.h"

#include "osi/include/hash_map_utils.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "osi/include/osi.h"

#include "osi/include/socket_utils/sockets.h"

#include "osi/include/socket_utils/sockets.h"
@@ -57,11 +57,15 @@ 
// sockets

// sockets

#define WRITE_POLL_MS 20

#define WRITE_POLL_MS 20





#define FNLOG() LOG_VERBOSE("%s", __func__);

#define FNLOG() ALOGV("%s:%d %s: ", __FILE__, __LINE__, __func__)

#define DEBUG(fmt, ...) LOG_VERBOSE("%s: " fmt, __func__, ##__VA_ARGS__)

#define DEBUG(fmt, args...) \

#define INFO(fmt, ...) LOG_INFO("%s: " fmt, __func__, ##__VA_ARGS__)

  ALOGD("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args)

#define WARN(fmt, ...) LOG_WARN("%s: " fmt, __func__, ##__VA_ARGS__)

#define INFO(fmt, args...) \

#define ERROR(fmt, ...) LOG_ERROR("%s: " fmt, __func__, ##__VA_ARGS__)

  ALOGI("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args)

#define WARN(fmt, args...) \

  ALOGW("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args)

#define ERROR(fmt, args...) \

  ALOGE("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args)





#define ASSERTC(cond, msg, val)                                           \

#define ASSERTC(cond, msg, val)                                           \

  if (!(cond)) {                                                          \

  if (!(cond)) {                                                          \
@@ -166,7 +170,7 @@ struct ha_stream_in { 
static void hash_map_utils_dump_string_keys_string_values(

static void hash_map_utils_dump_string_keys_string_values(

    std::unordered_map<std::string, std::string>& map) {

    std::unordered_map<std::string, std::string>& map) {

  for (const auto& ptr : map) {

  for (const auto& ptr : map) {

    LOG_INFO("key: '%s' value: '%s'\n", ptr.first.c_str(), ptr.second.c_str());

    INFO("key: '%s' value: '%s'\n", ptr.first.c_str(), ptr.second.c_str());

  }

  }

}

}