Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master

Browse Source 
am: 7d7c269944

Change-Id: Ie9058f2b554d2d88d31b4bc66ac56d4bf735704d
This commit is contained in:
Steven Moreland
2017-08-02 15:22:09 +00:00
committed by android-build-merger
parent 0fed7e3282 7d7c269944
commit 81972a18e4
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/hid/jni/com_android_commands_hid_Device.cpp
View File

@@ -31,8 +31,8 @@
#include <android_os_MessageQueue.h> #include <android_os_MessageQueue.h>
#include <core_jni_helpers.h> #include <core_jni_helpers.h>
#include <jni.h> #include <jni.h>
#include <JNIHelp.h> #include <nativehelper/JNIHelp.h>
#include <ScopedPrimitiveArray.h> #include <nativehelper/ScopedPrimitiveArray.h>
#include <ScopedUtfChars.h> #include <ScopedUtfChars.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <utils/Looper.h> #include <utils/Looper.h>

4
services/core/jni/com_android_server_ConsumerIrService.cpp
View File

@@ -17,14 +17,14 @@
#define LOG_TAG "ConsumerIrService" #define LOG_TAG "ConsumerIrService"
#include "jni.h" #include "jni.h"
#include "JNIHelp.h" #include <nativehelper/JNIHelp.h>
#include "android_runtime/AndroidRuntime.h" #include "android_runtime/AndroidRuntime.h"
#include <stdlib.h> #include <stdlib.h>
#include <utils/misc.h> #include <utils/misc.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <android/hardware/ir/1.0/IConsumerIr.h> #include <android/hardware/ir/1.0/IConsumerIr.h>
#include <ScopedPrimitiveArray.h> #include <nativehelper/ScopedPrimitiveArray.h>
using ::android::hardware::ir::V1_0::IConsumerIr; using ::android::hardware::ir::V1_0::IConsumerIr;
using ::android::hardware::ir::V1_0::ConsumerIrFreqRange; using ::android::hardware::ir::V1_0::ConsumerIrFreqRange;

4
services/core/jni/com_android_server_GraphicsStatsService.cpp
View File

@@ -19,8 +19,8 @@
#include <jni.h> #include <jni.h>
#include <log/log.h> #include <log/log.h>
#include <nativehelper/JNIHelp.h> #include <nativehelper/JNIHelp.h>
#include <ScopedPrimitiveArray.h> #include <nativehelper/ScopedPrimitiveArray.h>
#include <ScopedUtfChars.h> #include <nativehelper/ScopedUtfChars.h>
#include <JankTracker.h> #include <JankTracker.h>
#include <service/GraphicsStatsService.h> #include <service/GraphicsStatsService.h>

2
services/core/jni/com_android_server_location_ContextHubService.cpp
View File

@@ -38,7 +38,7 @@
#include <cutils/log.h> #include <cutils/log.h>
#include "core_jni_helpers.h" #include "core_jni_helpers.h"
#include "JNIHelp.h" #include <nativehelper/JNIHelp.h>
using android::hardware::contexthub::V1_0::AsyncEventType; using android::hardware::contexthub::V1_0::AsyncEventType;
using android::hardware::contexthub::V1_0::ContextHub; using android::hardware::contexthub::V1_0::ContextHub;

2
services/core/jni/com_android_server_location_GnssLocationProvider.cpp
View File

@@ -20,7 +20,7 @@
#include <android/hardware/gnss/1.0/IGnss.h> #include <android/hardware/gnss/1.0/IGnss.h>
#include "JNIHelp.h" #include <nativehelper/JNIHelp.h>
#include "jni.h" #include "jni.h"
#include "hardware_legacy/power.h" #include "hardware_legacy/power.h"
#include "utils/Log.h" #include "utils/Log.h"

2
services/core/jni/com_android_server_power_PowerManagerService.cpp
View File

@@ -22,7 +22,7 @@
#include "JNIHelp.h" #include "JNIHelp.h"
#include "jni.h" #include "jni.h"
#include <ScopedUtfChars.h> #include <nativehelper/ScopedUtfChars.h>
#include <limits.h> #include <limits.h>