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

Commit af706619 authored by Vlad Popa's avatar Vlad Popa Committed by Android (Google) Code Review
Browse files

Merge "Fix ISoundDose namespace and path"

parents 0a454795 debe0a79

services/audioflinger/MelReporter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <android/binder_manager.h>

#include <utils/Log.h>



using aidl::android::hardware::audio::core::ISoundDose;

using aidl::android::hardware::audio::core::sounddose::ISoundDose;

using aidl::android::hardware::audio::sounddose::ISoundDoseFactory;



namespace android {

services/audioflinger/sounddose/SoundDoseManager.h

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


#pragma once



#include <aidl/android/hardware/audio/core/ISoundDose.h>

#include <aidl/android/hardware/audio/core/sounddose/ISoundDose.h>

#include <aidl/android/media/audio/common/AudioDevice.h>

#include <android/media/BnSoundDose.h>

#include <android/media/ISoundDoseCallback.h>
@@ -30,7 +30,7 @@ 


namespace android {



using aidl::android::hardware::audio::core::ISoundDose;

using aidl::android::hardware::audio::core::sounddose::ISoundDose;



class SoundDoseManager : public audio_utils::MelProcessor::MelCallback {

public:

services/audioflinger/sounddose/tests/sounddosemanager_tests.cpp

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
// #define LOG_NDEBUG 0

#define LOG_TAG "SoundDoseManager_tests"



#include <aidl/android/hardware/audio/core/BnSoundDose.h>

#include <aidl/android/hardware/audio/core/sounddose/BnSoundDose.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>
@@ -26,7 +26,7 @@ 
namespace android {

namespace {



using aidl::android::hardware::audio::core::BnSoundDose;

using aidl::android::hardware::audio::core::sounddose::BnSoundDose;

using aidl::android::media::audio::common::AudioDevice;

using aidl::android::media::audio::common::AudioDeviceAddress;