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

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

Merge "Remove includes of <base/logging.h>" into main

parents 1cf9e42d b83d9d6c

android/app/jni/com_android_bluetooth_le_audio.cpp

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ class LeAudioClientCallbacksImpl : public LeAudioClientCallbacks { 


  void OnGroupStreamStatus(int group_id,

                           GroupStreamStatus group_stream_status) override {

    LOG(INFO) << __func__;

    log::info("");



    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);

    CallbackEnv sCallbackEnv(__func__);

system/audio/asrc/asrc_resampler.cc

+5 −9
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#include "asrc_resampler.h"



#include <base/logging.h>

#include <base/strings/stringprintf.h>

#include <bluetooth/log.h>
@@ -160,14 +159,11 @@ class SourceAudioHalAsrc::ClockRecovery 
      output_stats = output_stats_;

    }



    LOG(INFO) << base::StringPrintf("Deviation: %6d us (%3.0f ppm)",

                                    state.stream_time - state.local_time,

                                    state.butter_drift)

              << " | "

              << base::StringPrintf("Output Fs: %5.2f Hz  drift: %2d us",

                                    output_stats.sample_rate,

                                    output_stats.drift_us)

              << std::endl;

    log::info(

        "Deviation: {:6} us ({:3.0f} ppm) | Output Fs: {:5.2f} Hz  drift: {:2} "

        "us",

        state.stream_time - state.local_time, state.butter_drift,

        output_stats.sample_rate, output_stats.drift_us);

  }



 public:

system/audio_hal_interface/aidl/audio_aidl_interfaces.h

+0 −2
Original line number Diff line number Diff line
@@ -75,6 +75,4 @@ 
#undef LOG_DEBUG

#endif



#include <base/logging.h>



// clang-format on
 
 No newline at end of file

system/audio_hal_interface/hal_version_manager.cc

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include <android/binder_manager.h>

#include <android/hidl/manager/1.2/IServiceManager.h>

#include <base/logging.h>

#include <bluetooth/log.h>

#include <hidl/ServiceManagement.h>

system/audio_hal_interface/hidl/client_interface_hidl.cc

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include "client_interface_hidl.h"



#include <android/hardware/bluetooth/audio/2.0/IBluetoothAudioPort.h>

#include <base/logging.h>

#include <bluetooth/log.h>

#include <hidl/MQDescriptor.h>