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"

Browse Source
This commit is contained in:
Treehugger Robot
2017-08-02 23:02:04 +00:00
committed by Gerrit Code Review
parent b14694b043 f91ca58ec4
commit 41a7f5a64f
4 changed files with 6 additions and 6 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,7 +17,7 @@
#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>
@@ -25,7 +25,7 @@
#include <utils/Log.h> #include <utils/Log.h>
#include <hardware/hardware.h> #include <hardware/hardware.h>
#include <hardware/consumerir.h> #include <hardware/consumerir.h>
#include <ScopedPrimitiveArray.h> #include <nativehelper/ScopedPrimitiveArray.h>
namespace android { namespace android {

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

@@ -18,7 +18,7 @@
#define LOG_NDEBUG 0 #define LOG_NDEBUG 0
#include "JNIHelp.h" #include <nativehelper/JNIHelp.h>
#include "jni.h" #include "jni.h"
#include "hardware/hardware.h" #include "hardware/hardware.h"
#include "hardware/gps_internal.h" #include "hardware/gps_internal.h"

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

@@ -21,7 +21,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>