Merge "resolve merge conflicts of ec7e2a164c37 to master"
diff --git a/core/jni/android/graphics/pdf/PdfEditor.cpp b/core/jni/android/graphics/pdf/PdfEditor.cpp
index b142925..c727519 100644
--- a/core/jni/android/graphics/pdf/PdfEditor.cpp
+++ b/core/jni/android/graphics/pdf/PdfEditor.cpp
@@ -20,7 +20,7 @@
#include <vector>
-#include <android/log.h>
+#include <log/log.h>
#include <utils/Log.h>
#include "PdfUtils.h"
diff --git a/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp b/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp
index 99a5fc7..b6b5366 100644
--- a/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp
+++ b/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp
@@ -15,10 +15,11 @@
*/
#define LOG_TAG "OpenGLRenderer"
+#include "android/log.h"
+
#include "jni.h"
#include "GraphicsJNI.h"
#include "core_jni_helpers.h"
-#include "log/log.h"
#include "Animator.h"
#include "Interpolator.h"
diff --git a/core/jni/android_util_EventLog.cpp b/core/jni/android_util_EventLog.cpp
index 3219d59..0b4fbcc 100644
--- a/core/jni/android_util_EventLog.cpp
+++ b/core/jni/android_util_EventLog.cpp
@@ -18,6 +18,8 @@
#include <log/log_event_list.h>
+#include <log/log.h>
+
#include "JNIHelp.h"
#include "core_jni_helpers.h"
#include "jni.h"
diff --git a/libs/hwui/JankTracker.cpp b/libs/hwui/JankTracker.cpp
index 0a9bf54..2132c2b 100644
--- a/libs/hwui/JankTracker.cpp
+++ b/libs/hwui/JankTracker.cpp
@@ -13,16 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#include "JankTracker.h"
#include <errno.h>
#include <inttypes.h>
+#include <sys/mman.h>
#include <algorithm>
#include <cmath>
#include <cstdio>
#include <limits>
-#include <sys/mman.h>
#include <cutils/ashmem.h>
#include <log/log.h>
diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp
index a766381..0702010 100644
--- a/libs/hwui/Properties.cpp
+++ b/libs/hwui/Properties.cpp
@@ -20,9 +20,9 @@
#include <algorithm>
#include <cstdlib>
-#include <log/log.h>
#include <cutils/compiler.h>
#include <cutils/properties.h>
+#include <log/log.h>
namespace android {
namespace uirenderer {
diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp
index 02021fc..7020be0 100644
--- a/libs/hwui/renderthread/EglManager.cpp
+++ b/libs/hwui/renderthread/EglManager.cpp
@@ -16,20 +16,23 @@
#include "EglManager.h"
-#include "Texture.h"
+#include <string>
+
+#include "utils/StringUtils.h"
+#include <cutils/properties.h>
+#include <log/log.h>
+
#include "Caches.h"
#include "DeviceInfo.h"
#include "Frame.h"
#include "Properties.h"
#include "RenderThread.h"
#include "renderstate/RenderState.h"
-#include "utils/StringUtils.h"
-#include <cutils/log.h>
-#include <cutils/properties.h>
+#include "Texture.h"
+
#include <EGL/eglext.h>
#include <GrContextOptions.h>
#include <gl/GrGLInterface.h>
-#include <string>
#ifdef HWUI_GLES_WRAP_ENABLED
#include "debug/GlesDriver.h"
diff --git a/libs/hwui/tests/macrobench/TestSceneRunner.cpp b/libs/hwui/tests/macrobench/TestSceneRunner.cpp
index f3b7b51..396e896 100644
--- a/libs/hwui/tests/macrobench/TestSceneRunner.cpp
+++ b/libs/hwui/tests/macrobench/TestSceneRunner.cpp
@@ -23,8 +23,8 @@
#include "renderthread/RenderTask.h"
#include <benchmark/benchmark.h>
-#include <cutils/log.h>
#include <gui/Surface.h>
+#include <log/log.h>
#include <ui/PixelFormat.h>
using namespace android;
diff --git a/services/core/jni/com_android_server_am_BatteryStatsService.cpp b/services/core/jni/com_android_server_am_BatteryStatsService.cpp
index b22d5e7..ec36df1 100644
--- a/services/core/jni/com_android_server_am_BatteryStatsService.cpp
+++ b/services/core/jni/com_android_server_am_BatteryStatsService.cpp
@@ -17,6 +17,17 @@
#define LOG_TAG "BatteryStatsService"
//#define LOG_NDEBUG 0
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <semaphore.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
#include <android/hardware/power/1.0/IPower.h>
#include <android_runtime/AndroidRuntime.h>
#include <jni.h>
@@ -24,22 +35,11 @@
#include <ScopedLocalRef.h>
#include <ScopedPrimitiveArray.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <utils/misc.h>
#include <utils/Log.h>
#include <suspend/autosuspend.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <semaphore.h>
-#include <stddef.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
using android::hardware::Return;
using android::hardware::Void;
using android::hardware::power::V1_0::IPower;