Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 795bcc5b authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

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

am: 81972a18

Change-Id: Id008ba3508c972d8d27eebca22009b4823e387e0
parents 5a4b0680 81972a18

cmds/hid/jni/com_android_commands_hid_Device.cpp

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
#include <unistd.h>



#include <jni.h>

#include <JNIHelp.h>

#include <ScopedPrimitiveArray.h>

#include <nativehelper/JNIHelp.h>

#include <nativehelper/ScopedPrimitiveArray.h>

#include <ScopedUtfChars.h>

#include <android/looper.h>

#include <android/log.h>

services/core/jni/com_android_server_ConsumerIrService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ 
#define LOG_TAG "ConsumerIrService"



#include "jni.h"

#include "JNIHelp.h"

#include <nativehelper/JNIHelp.h>

#include "android_runtime/AndroidRuntime.h"



#include <stdlib.h>

#include <utils/misc.h>

#include <utils/Log.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::ConsumerIrFreqRange;

services/core/jni/com_android_server_GraphicsStatsService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#include <jni.h>

#include <log/log.h>

#include <nativehelper/JNIHelp.h>

#include <ScopedPrimitiveArray.h>

#include <ScopedUtfChars.h>

#include <nativehelper/ScopedPrimitiveArray.h>

#include <nativehelper/ScopedUtfChars.h>

#include <JankTracker.h>

#include <service/GraphicsStatsService.h>

services/core/jni/com_android_server_location_ContextHubService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include <cutils/log.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::ContextHub;

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include <android/hardware/gnss/1.0/IGnss.h>



#include "JNIHelp.h"

#include <nativehelper/JNIHelp.h>

#include "jni.h"

#include "hardware_legacy/power.h"

#include "utils/Log.h"