| commit | 13738ffa12858081f232427fcda215679cff7fc1 | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@android.com> | Wed Jul 01 23:34:49 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 01 23:34:49 2020 +0000 |
| tree | c7c20ace22c488e57290f9f51ea4c599e4acc5c2 | |
| parent | 84e07fe2793443c139fdbbb8cce81d6e963cf3b8 [diff] | |
| parent | 7997351bc447cbbff9dc255faf62bc89c1c180c6 [diff] |
Merge "Include what you use: <cutils/bitops.h> for popcount" am: a4d629d311 am: e9458106aa am: 7997351bc4 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1354145 Change-Id: Iee4973fcf6cba7a368f314aa8978b306678d0247
diff --git a/media/libaudiohal/impl/StreamPowerLog.h b/media/libaudiohal/impl/StreamPowerLog.h index 5fd3912..f6a554b 100644 --- a/media/libaudiohal/impl/StreamPowerLog.h +++ b/media/libaudiohal/impl/StreamPowerLog.h
@@ -19,6 +19,7 @@ #include <audio_utils/clock.h> #include <audio_utils/PowerLog.h> +#include <cutils/bitops.h> #include <cutils/properties.h> #include <system/audio.h>
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp index 2661c30..1fe340a 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -42,6 +42,7 @@ #include <set> #include <unordered_set> #include <vector> +#include <cutils/bitops.h> #include <cutils/properties.h> #include <utils/Log.h> #include <media/AudioParameter.h>