commit 853996e7b28fcb8707a15f70eb9c3cadd47943f0
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 26 18:02:39 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 26 18:02:39 2018 +0000
tree f5aa741235215cd73df2025b8e42394486a52ae8
parent fa87fc3b31e273efe3a2f5090dcd9c283e414aa5
parent f0c02ce99ccac584f4f4790390702aabc4d92c90

Merge "Don't use cutils/Atomic.h"

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 91f4d37..69ba529 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -39,8 +39,8 @@
 #include <memunreachable/memunreachable.h>
 #include <utils/String16.h>
 #include <utils/threads.h>
-#include <utils/Atomic.h>
 
+#include <cutils/atomic.h>
 #include <cutils/properties.h>
 
 #include <system/audio.h>

services/audioflinger/AudioFlinger.h

diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index 63898a0..c64752f 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -27,6 +27,7 @@
 
 #include <android-base/macros.h>
 
+#include <cutils/atomic.h>
 #include <cutils/compiler.h>
 #include <cutils/properties.h>
 
@@ -39,7 +40,6 @@
 #include <media/MmapStreamInterface.h>
 #include <media/MmapStreamCallback.h>
 
-#include <utils/Atomic.h>
 #include <utils/Errors.h>
 #include <utils/threads.h>
 #include <utils/SortedVector.h>