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

Commit 45a589f5 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: Update MelReporter class includes" into udc-dev-plus-aosp am: aa1af23c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24501990



Change-Id: I3cbe027e99fc7db53ce2fe8f58810270b0116dd1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3beaab69 aa1af23c

services/audioflinger/MelReporter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
// #define LOG_NDEBUG 0

#define LOG_TAG "MelReporter"



#include "AudioFlinger.h"

#include "MelReporter.h"



#include <android/media/ISoundDoseCallback.h>

#include <audio_utils/power.h>

services/audioflinger/MelReporter.h

+5 −1
Original line number Diff line number Diff line
@@ -17,8 +17,12 @@ 


#pragma once



#include <mutex>

#include "IAfPatchPanel.h"

#include "PatchCommandThread.h"



#include <sounddose/SoundDoseManager.h>



#include <mutex>

#include <unordered_map>



namespace android {