From 2279b2534272282a5b5152723235da397e49195c Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 19 Jul 2017 09:50:45 -0700 Subject: [PATCH] frameworks/base: use proper nativehelper headers libnativehelper exports headers under nativehelper. These were available before incorrectly as global headers in order to give access to jni.h. Test: modules using frameworks/base find headers Bug: 63762847 Change-Id: I0f9f231acdebe460f279135462f43d3e32eff64d --- core/jni/AndroidRuntime.cpp | 4 ++-- core/jni/android/graphics/BitmapFactory.cpp | 2 +- core/jni/android/graphics/BitmapRegionDecoder.cpp | 2 +- .../android/graphics/CreateJavaOutputStreamAdaptor.cpp | 2 +- core/jni/android/graphics/FontFamily.cpp | 6 +++--- core/jni/android/graphics/Graphics.cpp | 2 +- core/jni/android/graphics/Movie.cpp | 2 +- core/jni/android/graphics/NinePatch.cpp | 2 +- core/jni/android/graphics/Paint.cpp | 4 ++-- core/jni/android/graphics/Typeface.cpp | 2 +- core/jni/android/graphics/pdf/PdfEditor.cpp | 2 +- core/jni/android/graphics/pdf/PdfRenderer.cpp | 2 +- core/jni/android/opengl/util.cpp | 2 +- core/jni/android_app_NativeActivity.cpp | 4 ++-- core/jni/android_app_admin_SecurityLog.cpp | 2 +- core/jni/android_app_backup_FullBackup.cpp | 2 +- core/jni/android_backup_BackupDataInput.cpp | 2 +- core/jni/android_backup_BackupDataOutput.cpp | 2 +- core/jni/android_backup_BackupHelperDispatcher.cpp | 2 +- core/jni/android_backup_FileBackupHelperBase.cpp | 2 +- core/jni/android_content_res_ObbScanner.cpp | 2 +- core/jni/android_database_CursorWindow.cpp | 2 +- core/jni/android_database_SQLiteCommon.h | 2 +- core/jni/android_database_SQLiteConnection.cpp | 2 +- core/jni/android_database_SQLiteDebug.cpp | 2 +- core/jni/android_database_SQLiteGlobal.cpp | 2 +- core/jni/android_ddm_DdmHandleNativeHeap.cpp | 2 +- core/jni/android_hardware_Camera.cpp | 2 +- core/jni/android_hardware_SensorManager.cpp | 6 +++--- core/jni/android_hardware_SerialPort.cpp | 2 +- core/jni/android_hardware_SoundTrigger.cpp | 2 +- core/jni/android_hardware_UsbDevice.cpp | 2 +- core/jni/android_hardware_UsbDeviceConnection.cpp | 2 +- core/jni/android_hardware_UsbRequest.cpp | 2 +- core/jni/android_hardware_camera2_CameraMetadata.cpp | 2 +- core/jni/android_hardware_camera2_DngCreator.cpp | 2 +- ...android_hardware_camera2_legacy_LegacyCameraDevice.cpp | 2 +- .../android_hardware_camera2_legacy_PerfMeasurement.cpp | 2 +- ...roid_hardware_location_ActivityRecognitionHardware.cpp | 2 +- core/jni/android_media_AudioRecord.cpp | 4 ++-- core/jni/android_media_AudioSystem.cpp | 2 +- core/jni/android_media_AudioTrack.cpp | 6 +++--- core/jni/android_media_DeviceCallback.cpp | 4 ++-- core/jni/android_media_JetPlayer.cpp | 2 +- core/jni/android_media_RemoteDisplay.cpp | 4 ++-- core/jni/android_media_ToneGenerator.cpp | 2 +- core/jni/android_net_LocalSocketImpl.cpp | 4 ++-- core/jni/android_net_NetUtils.cpp | 2 +- core/jni/android_net_TrafficStats.cpp | 2 +- core/jni/android_opengl_EGL14.cpp | 2 +- core/jni/android_opengl_EGLExt.cpp | 2 +- core/jni/android_opengl_GLES10.cpp | 2 +- core/jni/android_opengl_GLES10Ext.cpp | 2 +- core/jni/android_opengl_GLES11.cpp | 2 +- core/jni/android_opengl_GLES11Ext.cpp | 2 +- core/jni/android_opengl_GLES20.cpp | 2 +- core/jni/android_opengl_GLES30.cpp | 2 +- core/jni/android_opengl_GLES31.cpp | 2 +- core/jni/android_opengl_GLES31Ext.cpp | 2 +- core/jni/android_opengl_GLES32.cpp | 2 +- core/jni/android_os_HwBinder.cpp | 2 +- core/jni/android_os_HwBlob.cpp | 2 +- core/jni/android_os_HwParcel.cpp | 2 +- core/jni/android_os_HwRemoteBinder.cpp | 4 ++-- core/jni/android_os_MemoryFile.cpp | 2 +- core/jni/android_os_MessageQueue.cpp | 2 +- core/jni/android_os_Parcel.cpp | 6 +++--- core/jni/android_os_SELinux.cpp | 6 +++--- core/jni/android_os_SystemClock.cpp | 2 +- core/jni/android_os_Trace.cpp | 6 +++--- core/jni/android_os_UEventObserver.cpp | 4 ++-- core/jni/android_os_VintfObject.cpp | 2 +- core/jni/android_os_VintfRuntimeInfo.cpp | 2 +- core/jni/android_os_seccomp.cpp | 2 +- core/jni/android_server_NetworkManagementSocketTagger.cpp | 2 +- core/jni/android_server_Watchdog.cpp | 2 +- core/jni/android_text_AndroidBidi.cpp | 2 +- core/jni/android_text_AndroidCharacter.cpp | 4 ++-- core/jni/android_text_StaticLayout.cpp | 6 +++--- core/jni/android_util_AssetManager.cpp | 6 +++--- core/jni/android_util_Binder.cpp | 6 +++--- core/jni/android_util_EventLog.cpp | 2 +- core/jni/android_util_FileObserver.cpp | 2 +- core/jni/android_util_Log.cpp | 2 +- core/jni/android_util_Log.h | 2 +- core/jni/android_util_Process.cpp | 2 +- core/jni/android_util_StringBlock.cpp | 2 +- core/jni/android_util_XmlBlock.cpp | 2 +- core/jni/android_util_jar_StrictJarFile.cpp | 8 ++++---- core/jni/android_view_DisplayEventReceiver.cpp | 4 ++-- core/jni/android_view_InputChannel.cpp | 2 +- core/jni/android_view_InputDevice.cpp | 2 +- core/jni/android_view_InputEventReceiver.cpp | 4 ++-- core/jni/android_view_InputEventSender.cpp | 4 ++-- core/jni/android_view_InputQueue.cpp | 4 ++-- core/jni/android_view_KeyEvent.cpp | 4 ++-- core/jni/android_view_MotionEvent.cpp | 4 ++-- core/jni/android_view_PointerIcon.cpp | 4 ++-- core/jni/android_view_Surface.cpp | 4 ++-- core/jni/android_view_SurfaceControl.cpp | 4 ++-- core/jni/android_view_SurfaceSession.cpp | 2 +- core/jni/android_view_ThreadedRenderer.cpp | 2 +- core/jni/android_view_VelocityTracker.cpp | 4 ++-- .../com_android_internal_content_NativeLibraryHelper.cpp | 2 +- core/jni/com_android_internal_net_NetworkStatsFactory.cpp | 6 +++--- core/jni/com_android_internal_os_Zygote.cpp | 8 ++++---- core/jni/com_google_android_gles_jni_EGLImpl.cpp | 2 +- core/jni/com_google_android_gles_jni_GLImpl.cpp | 2 +- core/jni/core_jni_helpers.h | 2 +- .../jni/include/android_runtime/android_view_InputQueue.h | 2 +- drm/jni/android_drm_DrmManagerClient.cpp | 4 ++-- media/jni/android_media_ImageReader.cpp | 2 +- media/jni/android_media_ImageWriter.cpp | 2 +- media/jni/android_media_MediaCodec.cpp | 2 +- media/jni/android_media_MediaCodecList.cpp | 2 +- media/jni/android_media_MediaCrypto.cpp | 2 +- media/jni/android_media_MediaDataSource.cpp | 2 +- media/jni/android_media_MediaDrm.cpp | 2 +- media/jni/android_media_MediaHTTPConnection.cpp | 2 +- media/jni/android_media_MediaMetadataRetriever.cpp | 2 +- media/jni/android_media_MediaMuxer.cpp | 2 +- media/jni/android_media_MediaPlayer.cpp | 2 +- media/jni/android_media_MediaProfiles.cpp | 2 +- media/jni/android_media_MediaScanner.cpp | 2 +- media/jni/android_media_MediaSync.cpp | 2 +- media/jni/android_media_ResampleInputStream.cpp | 2 +- media/jni/android_media_SyncParams.cpp | 2 +- media/jni/android_media_Utils.h | 2 +- media/jni/android_mtp_MtpDatabase.cpp | 2 +- media/jni/android_mtp_MtpDevice.cpp | 4 ++-- media/jni/android_mtp_MtpServer.cpp | 2 +- media/jni/audioeffect/android_media_AudioEffect.cpp | 2 +- media/jni/audioeffect/android_media_Visualizer.cpp | 2 +- native/android/asset_manager.cpp | 2 +- .../jni/com_android_defcontainer_MeasurementUtils.cpp | 2 +- ...com_android_printspooler_util_BitmapSerializeUtils.cpp | 2 +- .../jni/com_android_pacprocessor_PacNative.cpp | 2 +- rs/jni/android_renderscript_RenderScript.cpp | 2 +- .../core/jni/com_android_server_AlarmManagerService.cpp | 2 +- ...om_android_server_HardwarePropertiesManagerService.cpp | 2 +- .../jni/com_android_server_PersistentDataBlockService.cpp | 4 ++-- services/core/jni/com_android_server_SerialService.cpp | 2 +- services/core/jni/com_android_server_SystemServer.cpp | 2 +- services/core/jni/com_android_server_UsbDeviceManager.cpp | 2 +- services/core/jni/com_android_server_UsbHostManager.cpp | 2 +- services/core/jni/com_android_server_UsbMidiDevice.cpp | 2 +- services/core/jni/com_android_server_VibratorService.cpp | 2 +- .../jni/com_android_server_am_BatteryStatsService.cpp | 4 ++-- services/core/jni/com_android_server_connectivity_Vpn.cpp | 2 +- ...er_connectivity_tethering_OffloadHardwareInterface.cpp | 2 +- .../com_android_server_fingerprint_FingerprintService.cpp | 2 +- .../jni/com_android_server_hdmi_HdmiCecController.cpp | 4 ++-- .../com_android_server_input_InputApplicationHandle.cpp | 2 +- .../jni/com_android_server_input_InputApplicationHandle.h | 2 +- .../jni/com_android_server_input_InputManagerService.cpp | 8 ++++---- .../jni/com_android_server_input_InputWindowHandle.cpp | 2 +- .../core/jni/com_android_server_input_InputWindowHandle.h | 2 +- .../core/jni/com_android_server_lights_LightsService.cpp | 2 +- .../jni/com_android_server_power_PowerManagerService.h | 2 +- services/core/jni/com_android_server_tv_TvInputHal.cpp | 2 +- .../core/jni/com_android_server_tv_TvUinputBridge.cpp | 2 +- .../core/jni/com_android_server_vr_VrManagerService.cpp | 2 +- services/core/jni/onload.cpp | 2 +- tests/net/jni/apf_jni.cpp | 4 ++-- 164 files changed, 219 insertions(+), 219 deletions(-) diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index facc0f998bdaa..e8cddf01b5a7a 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -33,8 +33,8 @@ #include #include "jni.h" -#include "JNIHelp.h" -#include "JniInvocation.h" +#include +#include #include "android_util_Binder.h" #include diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index 4001283c4c66b..3866c84baf2f8 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -15,7 +15,7 @@ #include "Utils.h" #include "core_jni_helpers.h" -#include +#include #include #include #include diff --git a/core/jni/android/graphics/BitmapRegionDecoder.cpp b/core/jni/android/graphics/BitmapRegionDecoder.cpp index a1ba42e7ab724..7d12f44ef4deb 100644 --- a/core/jni/android/graphics/BitmapRegionDecoder.cpp +++ b/core/jni/android/graphics/BitmapRegionDecoder.cpp @@ -33,7 +33,7 @@ #include "android_util_Binder.h" #include "core_jni_helpers.h" -#include +#include #include #include #include diff --git a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp b/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp index 067489a547c02..0e907c3491619 100644 --- a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp +++ b/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp @@ -5,7 +5,7 @@ #include "SkTypes.h" #include "Utils.h" -#include +#include #include static jmethodID gInputStream_readMethodID; diff --git a/core/jni/android/graphics/FontFamily.cpp b/core/jni/android/graphics/FontFamily.cpp index 1c2d13d98acc0..95bcbd688b7d6 100644 --- a/core/jni/android/graphics/FontFamily.cpp +++ b/core/jni/android/graphics/FontFamily.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "Minikin" -#include "JNIHelp.h" +#include #include #include "SkData.h" @@ -24,8 +24,8 @@ #include "SkRefCnt.h" #include "SkTypeface.h" #include "GraphicsJNI.h" -#include -#include +#include +#include #include #include #include diff --git a/core/jni/android/graphics/Graphics.cpp b/core/jni/android/graphics/Graphics.cpp index 889a3db81e6f0..19ca1eac1ef0f 100644 --- a/core/jni/android/graphics/Graphics.cpp +++ b/core/jni/android/graphics/Graphics.cpp @@ -4,7 +4,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "GraphicsJNI.h" #include "SkCanvas.h" diff --git a/core/jni/android/graphics/Movie.cpp b/core/jni/android/graphics/Movie.cpp index 71988f9cf44d6..c96552f5e0028 100644 --- a/core/jni/android/graphics/Movie.cpp +++ b/core/jni/android/graphics/Movie.cpp @@ -1,6 +1,6 @@ #include "CreateJavaOutputStreamAdaptor.h" #include "GraphicsJNI.h" -#include "ScopedLocalRef.h" +#include #include "SkFrontBufferedStream.h" #include "SkMovie.h" #include "SkStream.h" diff --git a/core/jni/android/graphics/NinePatch.cpp b/core/jni/android/graphics/NinePatch.cpp index 4f2f3897469ce..fa9c9c759853a 100644 --- a/core/jni/android/graphics/NinePatch.cpp +++ b/core/jni/android/graphics/NinePatch.cpp @@ -31,7 +31,7 @@ #include "utils/NinePatch.h" -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" using namespace android; diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp index 85092ad4fdd47..fdd4b3cb24fa7 100644 --- a/core/jni/android/graphics/Paint.cpp +++ b/core/jni/android/graphics/Paint.cpp @@ -22,8 +22,8 @@ #include "jni.h" #include "GraphicsJNI.h" #include "core_jni_helpers.h" -#include -#include +#include +#include #include "SkBlurDrawLooper.h" #include "SkColorFilter.h" diff --git a/core/jni/android/graphics/Typeface.cpp b/core/jni/android/graphics/Typeface.cpp index 9a53cadf355b7..1799e015fa21b 100644 --- a/core/jni/android/graphics/Typeface.cpp +++ b/core/jni/android/graphics/Typeface.cpp @@ -18,7 +18,7 @@ #include "core_jni_helpers.h" #include "GraphicsJNI.h" -#include "ScopedPrimitiveArray.h" +#include #include "SkTypeface.h" #include #include diff --git a/core/jni/android/graphics/pdf/PdfEditor.cpp b/core/jni/android/graphics/pdf/PdfEditor.cpp index 59c5be66737d0..8c9f8fa18aa69 100644 --- a/core/jni/android/graphics/pdf/PdfEditor.cpp +++ b/core/jni/android/graphics/pdf/PdfEditor.cpp @@ -24,7 +24,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" diff --git a/core/jni/android/graphics/pdf/PdfRenderer.cpp b/core/jni/android/graphics/pdf/PdfRenderer.cpp index 43550ac9ed72b..e8b2aa94b7819 100644 --- a/core/jni/android/graphics/pdf/PdfRenderer.cpp +++ b/core/jni/android/graphics/pdf/PdfRenderer.cpp @@ -15,7 +15,7 @@ */ #include "jni.h" -#include "JNIHelp.h" +#include #include "GraphicsJNI.h" #include "SkBitmap.h" #include "SkMatrix.h" diff --git a/core/jni/android/opengl/util.cpp b/core/jni/android/opengl/util.cpp index 41d911150d933..825c19f557f15 100644 --- a/core/jni/android/opengl/util.cpp +++ b/core/jni/android/opengl/util.cpp @@ -15,7 +15,7 @@ */ #include "jni.h" -#include "JNIHelp.h" +#include #include "GraphicsJNI.h" #include diff --git a/core/jni/android_app_NativeActivity.cpp b/core/jni/android_app_NativeActivity.cpp index fd9e714618e5e..6d0619f17b8cc 100644 --- a/core/jni/android_app_NativeActivity.cpp +++ b/core/jni/android_app_NativeActivity.cpp @@ -35,7 +35,7 @@ #include -#include "JNIHelp.h" +#include #include "android_os_MessageQueue.h" #include "android_view_InputChannel.h" #include "android_view_KeyEvent.h" @@ -45,7 +45,7 @@ #include "core_jni_helpers.h" -#include "ScopedUtfChars.h" +#include #define LOG_TRACE(...) //#define LOG_TRACE(...) ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__) diff --git a/core/jni/android_app_admin_SecurityLog.cpp b/core/jni/android_app_admin_SecurityLog.cpp index e8ca79384f689..5c45b4b26a1bd 100644 --- a/core/jni/android_app_admin_SecurityLog.cpp +++ b/core/jni/android_app_admin_SecurityLog.cpp @@ -16,7 +16,7 @@ #include -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include "jni.h" #include diff --git a/core/jni/android_app_backup_FullBackup.cpp b/core/jni/android_app_backup_FullBackup.cpp index 63b2e2aaee126..3e399898ed555 100644 --- a/core/jni/android_app_backup_FullBackup.cpp +++ b/core/jni/android_app_backup_FullBackup.cpp @@ -20,7 +20,7 @@ #include #include -#include "JNIHelp.h" +#include #include #include diff --git a/core/jni/android_backup_BackupDataInput.cpp b/core/jni/android_backup_BackupDataInput.cpp index 096a784b711b4..aa8acc16bc3f2 100644 --- a/core/jni/android_backup_BackupDataInput.cpp +++ b/core/jni/android_backup_BackupDataInput.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "FileBackupHelper_native" #include -#include "JNIHelp.h" +#include #include #include diff --git a/core/jni/android_backup_BackupDataOutput.cpp b/core/jni/android_backup_BackupDataOutput.cpp index a7894f487c559..4f5d1f80dffcd 100644 --- a/core/jni/android_backup_BackupDataOutput.cpp +++ b/core/jni/android_backup_BackupDataOutput.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "FileBackupHelper_native" #include -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include diff --git a/core/jni/android_backup_BackupHelperDispatcher.cpp b/core/jni/android_backup_BackupHelperDispatcher.cpp index 80bdaf84dca97..fac7eba4c0a29 100644 --- a/core/jni/android_backup_BackupHelperDispatcher.cpp +++ b/core/jni/android_backup_BackupHelperDispatcher.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "BackupHelperDispatcher_native" #include -#include "JNIHelp.h" +#include #include #include diff --git a/core/jni/android_backup_FileBackupHelperBase.cpp b/core/jni/android_backup_FileBackupHelperBase.cpp index 6d6ac1b477444..65840ee2c0166 100644 --- a/core/jni/android_backup_FileBackupHelperBase.cpp +++ b/core/jni/android_backup_FileBackupHelperBase.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "FileBackupHelper_native" #include -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include diff --git a/core/jni/android_content_res_ObbScanner.cpp b/core/jni/android_content_res_ObbScanner.cpp index 36d78cf3aca01..de429a07d0f68 100644 --- a/core/jni/android_content_res_ObbScanner.cpp +++ b/core/jni/android_content_res_ObbScanner.cpp @@ -21,7 +21,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "utils/misc.h" #include "android_runtime/AndroidRuntime.h" diff --git a/core/jni/android_database_CursorWindow.cpp b/core/jni/android_database_CursorWindow.cpp index 3fc3aaf6c8f36..7c1d3136fc4fa 100644 --- a/core/jni/android_database_CursorWindow.cpp +++ b/core/jni/android_database_CursorWindow.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/core/jni/android_database_SQLiteCommon.h b/core/jni/android_database_SQLiteCommon.h index 0cac176502e2d..81164ef1f99de 100644 --- a/core/jni/android_database_SQLiteCommon.h +++ b/core/jni/android_database_SQLiteCommon.h @@ -18,7 +18,7 @@ #define _ANDROID_DATABASE_SQLITE_COMMON_H #include -#include +#include #include diff --git a/core/jni/android_database_SQLiteConnection.cpp b/core/jni/android_database_SQLiteConnection.cpp index bcc3bb09b69dc..cbf09bd08673c 100644 --- a/core/jni/android_database_SQLiteConnection.cpp +++ b/core/jni/android_database_SQLiteConnection.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "SQLiteConnection" #include -#include +#include #include #include diff --git a/core/jni/android_database_SQLiteDebug.cpp b/core/jni/android_database_SQLiteDebug.cpp index 4e4c36cbb7e15..3ba9b91028bbf 100644 --- a/core/jni/android_database_SQLiteDebug.cpp +++ b/core/jni/android_database_SQLiteDebug.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "SQLiteDebug" #include -#include +#include #include #include diff --git a/core/jni/android_database_SQLiteGlobal.cpp b/core/jni/android_database_SQLiteGlobal.cpp index 03e2387f24bcb..ec5dc4ae30c5b 100644 --- a/core/jni/android_database_SQLiteGlobal.cpp +++ b/core/jni/android_database_SQLiteGlobal.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "SQLiteGlobal" #include -#include +#include #include "core_jni_helpers.h" #include diff --git a/core/jni/android_ddm_DdmHandleNativeHeap.cpp b/core/jni/android_ddm_DdmHandleNativeHeap.cpp index 3e7a04efc536c..2f25d8f2d3a43 100644 --- a/core/jni/android_ddm_DdmHandleNativeHeap.cpp +++ b/core/jni/android_ddm_DdmHandleNativeHeap.cpp @@ -18,7 +18,7 @@ #undef LOG_TAG #define LOG_TAG "DdmHandleNativeHeap" -#include +#include #include #include "core_jni_helpers.h" diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index b926270100598..fb9494fcc266f 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -20,7 +20,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include #include diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp index 271f24b130524..7adcc9b98cb31 100644 --- a/core/jni/android_hardware_SensorManager.cpp +++ b/core/jni/android_hardware_SensorManager.cpp @@ -15,13 +15,13 @@ */ #define LOG_TAG "SensorManager" -#include "JNIHelp.h" +#include #include "android_os_MessageQueue.h" #include "core_jni_helpers.h" #include "jni.h" -#include -#include +#include +#include #include #include #include diff --git a/core/jni/android_hardware_SerialPort.cpp b/core/jni/android_hardware_SerialPort.cpp index 393dc7b9f4fd6..190ddced73127 100644 --- a/core/jni/android_hardware_SerialPort.cpp +++ b/core/jni/android_hardware_SerialPort.cpp @@ -19,7 +19,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include diff --git a/core/jni/android_hardware_SoundTrigger.cpp b/core/jni/android_hardware_SoundTrigger.cpp index 0c7f5a1165610..9dbb8d757e159 100644 --- a/core/jni/android_hardware_SoundTrigger.cpp +++ b/core/jni/android_hardware_SoundTrigger.cpp @@ -20,7 +20,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include #include diff --git a/core/jni/android_hardware_UsbDevice.cpp b/core/jni/android_hardware_UsbDevice.cpp index 89d33e2ace1c1..879d409246906 100644 --- a/core/jni/android_hardware_UsbDevice.cpp +++ b/core/jni/android_hardware_UsbDevice.cpp @@ -19,7 +19,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include diff --git a/core/jni/android_hardware_UsbDeviceConnection.cpp b/core/jni/android_hardware_UsbDeviceConnection.cpp index 1ba9fc58800ca..c15cb83be3269 100644 --- a/core/jni/android_hardware_UsbDeviceConnection.cpp +++ b/core/jni/android_hardware_UsbDeviceConnection.cpp @@ -19,7 +19,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include diff --git a/core/jni/android_hardware_UsbRequest.cpp b/core/jni/android_hardware_UsbRequest.cpp index 399e7b16f0738..06cfd4c1ae928 100644 --- a/core/jni/android_hardware_UsbRequest.cpp +++ b/core/jni/android_hardware_UsbRequest.cpp @@ -19,7 +19,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include diff --git a/core/jni/android_hardware_camera2_CameraMetadata.cpp b/core/jni/android_hardware_camera2_CameraMetadata.cpp index 518f99e864345..45e7c07758a8b 100644 --- a/core/jni/android_hardware_camera2_CameraMetadata.cpp +++ b/core/jni/android_hardware_camera2_CameraMetadata.cpp @@ -28,7 +28,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "android_os_Parcel.h" #include "core_jni_helpers.h" #include "android_runtime/android_hardware_camera2_CameraMetadata.h" diff --git a/core/jni/android_hardware_camera2_DngCreator.cpp b/core/jni/android_hardware_camera2_DngCreator.cpp index d2932e43fe5bd..09aaff6a3de47 100644 --- a/core/jni/android_hardware_camera2_DngCreator.cpp +++ b/core/jni/android_hardware_camera2_DngCreator.cpp @@ -45,7 +45,7 @@ #include "android_runtime/android_hardware_camera2_CameraMetadata.h" #include -#include +#include using namespace android; using namespace img_utils; diff --git a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp index 80f9d5750d8aa..33ce3aa380917 100644 --- a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp +++ b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp @@ -22,7 +22,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include "android_runtime/android_view_Surface.h" #include "android_runtime/android_graphics_SurfaceTexture.h" diff --git a/core/jni/android_hardware_camera2_legacy_PerfMeasurement.cpp b/core/jni/android_hardware_camera2_legacy_PerfMeasurement.cpp index a08166568c9f1..fac243a70415c 100644 --- a/core/jni/android_hardware_camera2_legacy_PerfMeasurement.cpp +++ b/core/jni/android_hardware_camera2_legacy_PerfMeasurement.cpp @@ -21,7 +21,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include diff --git a/core/jni/android_hardware_location_ActivityRecognitionHardware.cpp b/core/jni/android_hardware_location_ActivityRecognitionHardware.cpp index 44a3555bcce0d..0e2b80e031c93 100644 --- a/core/jni/android_hardware_location_ActivityRecognitionHardware.cpp +++ b/core/jni/android_hardware_location_ActivityRecognitionHardware.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "ActivityRecognitionHardware" #include -#include +#include #include #include diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index 5e93fc97de3fb..e4da3c6a6ac8d 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -20,13 +20,13 @@ #include #include -#include +#include #include "core_jni_helpers.h" #include #include -#include +#include #include "android_media_AudioFormat.h" #include "android_media_AudioErrors.h" diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index d30e6eba48e73..6c3d5f1fcd115 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include "core_jni_helpers.h" #include diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 86c4df7588112..e1470c3fed43a 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -19,11 +19,11 @@ #include "android_media_AudioTrack.h" -#include -#include +#include +#include #include "core_jni_helpers.h" -#include "ScopedBytes.h" +#include #include #include diff --git a/core/jni/android_media_DeviceCallback.cpp b/core/jni/android_media_DeviceCallback.cpp index e159373602c3d..108fa00fe5103 100644 --- a/core/jni/android_media_DeviceCallback.cpp +++ b/core/jni/android_media_DeviceCallback.cpp @@ -19,8 +19,8 @@ #define LOG_TAG "AudioDeviceCallback-JNI" #include -#include -#include +#include +#include #include "core_jni_helpers.h" #include diff --git a/core/jni/android_media_JetPlayer.cpp b/core/jni/android_media_JetPlayer.cpp index 873c3f2e07e1d..da116bf7c96af 100644 --- a/core/jni/android_media_JetPlayer.cpp +++ b/core/jni/android_media_JetPlayer.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include "core_jni_helpers.h" #include diff --git a/core/jni/android_media_RemoteDisplay.cpp b/core/jni/android_media_RemoteDisplay.cpp index bd1a6ecaf95c4..3b517f1eafe07 100644 --- a/core/jni/android_media_RemoteDisplay.cpp +++ b/core/jni/android_media_RemoteDisplay.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "RemoteDisplay" #include "jni.h" -#include "JNIHelp.h" +#include #include "android_os_Parcel.h" #include "android_util_Binder.h" @@ -36,7 +36,7 @@ #include -#include +#include namespace android { diff --git a/core/jni/android_media_ToneGenerator.cpp b/core/jni/android_media_ToneGenerator.cpp index aec62631c559b..ecb3cd60c42f0 100644 --- a/core/jni/android_media_ToneGenerator.cpp +++ b/core/jni/android_media_ToneGenerator.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include "core_jni_helpers.h" #include diff --git a/core/jni/android_net_LocalSocketImpl.cpp b/core/jni/android_net_LocalSocketImpl.cpp index 37b6df1e3d2c0..6df23f72bdd34 100644 --- a/core/jni/android_net_LocalSocketImpl.cpp +++ b/core/jni/android_net_LocalSocketImpl.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "LocalSocketImpl" -#include "JNIHelp.h" +#include #include "jni.h" #include "utils/Log.h" #include "utils/misc.h" @@ -35,7 +35,7 @@ #include #include -#include +#include namespace android { diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp index 3e99521f8ad42..823f1cc362250 100644 --- a/core/jni/android_net_NetUtils.cpp +++ b/core/jni/android_net_NetUtils.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "NetUtils" #include "jni.h" -#include "JNIHelp.h" +#include #include "NetdClient.h" #include #include diff --git a/core/jni/android_net_TrafficStats.cpp b/core/jni/android_net_TrafficStats.cpp index 7b7d0cf498c38..d0c237da07775 100644 --- a/core/jni/android_net_TrafficStats.cpp +++ b/core/jni/android_net_TrafficStats.cpp @@ -25,7 +25,7 @@ #include "core_jni_helpers.h" #include -#include +#include #include #include diff --git a/core/jni/android_opengl_EGL14.cpp b/core/jni/android_opengl_EGL14.cpp index c8b1784112517..6163588662759 100644 --- a/core/jni/android_opengl_EGL14.cpp +++ b/core/jni/android_opengl_EGL14.cpp @@ -21,7 +21,7 @@ #pragma GCC diagnostic ignored "-Wunused-function" #include "jni.h" -#include "JNIHelp.h" +#include #include #include #include diff --git a/core/jni/android_opengl_EGLExt.cpp b/core/jni/android_opengl_EGLExt.cpp index 62ccad4d85f0f..df1aa2025b984 100644 --- a/core/jni/android_opengl_EGLExt.cpp +++ b/core/jni/android_opengl_EGLExt.cpp @@ -21,7 +21,7 @@ #pragma GCC diagnostic ignored "-Wunused-function" #include "jni.h" -#include "JNIHelp.h" +#include #include #include #include diff --git a/core/jni/android_opengl_GLES10.cpp b/core/jni/android_opengl_GLES10.cpp index f4135c213e365..b93ae80b2920c 100644 --- a/core/jni/android_opengl_GLES10.cpp +++ b/core/jni/android_opengl_GLES10.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/core/jni/android_opengl_GLES10Ext.cpp b/core/jni/android_opengl_GLES10Ext.cpp index 4dc42339b6e55..26a01f2e7a1f7 100644 --- a/core/jni/android_opengl_GLES10Ext.cpp +++ b/core/jni/android_opengl_GLES10Ext.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/core/jni/android_opengl_GLES11.cpp b/core/jni/android_opengl_GLES11.cpp index 2625e03c962ea..0762d6e2c08fe 100644 --- a/core/jni/android_opengl_GLES11.cpp +++ b/core/jni/android_opengl_GLES11.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/core/jni/android_opengl_GLES11Ext.cpp b/core/jni/android_opengl_GLES11Ext.cpp index fb85cb0f8d95e..3006558371c01 100644 --- a/core/jni/android_opengl_GLES11Ext.cpp +++ b/core/jni/android_opengl_GLES11Ext.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/core/jni/android_opengl_GLES20.cpp b/core/jni/android_opengl_GLES20.cpp index ac3bf7a5b7355..c5787f400eacd 100644 --- a/core/jni/android_opengl_GLES20.cpp +++ b/core/jni/android_opengl_GLES20.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/core/jni/android_opengl_GLES30.cpp b/core/jni/android_opengl_GLES30.cpp index 59b8911487b9c..d1e616153db53 100644 --- a/core/jni/android_opengl_GLES30.cpp +++ b/core/jni/android_opengl_GLES30.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/core/jni/android_opengl_GLES31.cpp b/core/jni/android_opengl_GLES31.cpp index 156e7bdda5f22..ab6475714cc4a 100644 --- a/core/jni/android_opengl_GLES31.cpp +++ b/core/jni/android_opengl_GLES31.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/jni/android_opengl_GLES31Ext.cpp b/core/jni/android_opengl_GLES31Ext.cpp index 5be7be04f5810..da45fef6789e9 100644 --- a/core/jni/android_opengl_GLES31Ext.cpp +++ b/core/jni/android_opengl_GLES31Ext.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/core/jni/android_opengl_GLES32.cpp b/core/jni/android_opengl_GLES32.cpp index f9a1a8ea0d745..824a2e8c4faeb 100644 --- a/core/jni/android_opengl_GLES32.cpp +++ b/core/jni/android_opengl_GLES32.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp index dc16220e7f84f..8fd31fca30ce2 100644 --- a/core/jni/android_os_HwBinder.cpp +++ b/core/jni/android_os_HwBinder.cpp @@ -25,7 +25,7 @@ #include -#include +#include #include #include #include diff --git a/core/jni/android_os_HwBlob.cpp b/core/jni/android_os_HwBlob.cpp index 8590ecf3bb19c..0c23797b627bb 100644 --- a/core/jni/android_os_HwBlob.cpp +++ b/core/jni/android_os_HwBlob.cpp @@ -22,7 +22,7 @@ #include "android_os_HwParcel.h" -#include +#include #include #include #include diff --git a/core/jni/android_os_HwParcel.cpp b/core/jni/android_os_HwParcel.cpp index 6ea809aa95adb..b412b6a016b65 100644 --- a/core/jni/android_os_HwParcel.cpp +++ b/core/jni/android_os_HwParcel.cpp @@ -24,7 +24,7 @@ #include "android_os_HwBlob.h" #include "android_os_HwRemoteBinder.h" -#include +#include #include #include #include diff --git a/core/jni/android_os_HwRemoteBinder.cpp b/core/jni/android_os_HwRemoteBinder.cpp index 9c2ee9cfec458..cf59a56a13dc0 100644 --- a/core/jni/android_os_HwRemoteBinder.cpp +++ b/core/jni/android_os_HwRemoteBinder.cpp @@ -22,10 +22,10 @@ #include "android_os_HwParcel.h" -#include +#include #include #include -#include +#include #include #include "core_jni_helpers.h" diff --git a/core/jni/android_os_MemoryFile.cpp b/core/jni/android_os_MemoryFile.cpp index c198a733103dd..19926e2ac155b 100644 --- a/core/jni/android_os_MemoryFile.cpp +++ b/core/jni/android_os_MemoryFile.cpp @@ -19,7 +19,7 @@ #include #include "core_jni_helpers.h" -#include "JNIHelp.h" +#include #include #include diff --git a/core/jni/android_os_MessageQueue.cpp b/core/jni/android_os_MessageQueue.cpp index e57a7190cfcee..f7a98d16f2e3d 100644 --- a/core/jni/android_os_MessageQueue.cpp +++ b/core/jni/android_os_MessageQueue.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "MessageQueue-JNI" -#include "JNIHelp.h" +#include #include #include diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp index 0a8ae2bdeecd5..6af5b9624ebd4 100644 --- a/core/jni/android_os_Parcel.cpp +++ b/core/jni/android_os_Parcel.cpp @@ -20,7 +20,7 @@ #include "android_os_Parcel.h" #include "android_util_Binder.h" -#include "JNIHelp.h" +#include #include #include @@ -41,8 +41,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/core/jni/android_os_SELinux.cpp b/core/jni/android_os_SELinux.cpp index 4b68c0dad0383..6778b294a93c7 100644 --- a/core/jni/android_os_SELinux.cpp +++ b/core/jni/android_os_SELinux.cpp @@ -17,15 +17,15 @@ #define LOG_TAG "SELinuxJNI" #include -#include "JNIHelp.h" +#include #include "jni.h" #include "core_jni_helpers.h" #include "selinux/selinux.h" #include "selinux/android.h" #include #include -#include -#include +#include +#include namespace android { diff --git a/core/jni/android_os_SystemClock.cpp b/core/jni/android_os_SystemClock.cpp index d98407deb7e75..27a40349ec69d 100644 --- a/core/jni/android_os_SystemClock.cpp +++ b/core/jni/android_os_SystemClock.cpp @@ -25,7 +25,7 @@ #include #include -#include "JNIHelp.h" +#include #include "jni.h" #include "core_jni_helpers.h" diff --git a/core/jni/android_os_Trace.cpp b/core/jni/android_os_Trace.cpp index dc5ce3912121d..25182e1367e2f 100644 --- a/core/jni/android_os_Trace.cpp +++ b/core/jni/android_os_Trace.cpp @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace android { diff --git a/core/jni/android_os_UEventObserver.cpp b/core/jni/android_os_UEventObserver.cpp index 30d40a2a08adf..2df74b05d97bd 100644 --- a/core/jni/android_os_UEventObserver.cpp +++ b/core/jni/android_os_UEventObserver.cpp @@ -21,13 +21,13 @@ #include "hardware_legacy/uevent.h" #include "jni.h" -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include #include #include -#include +#include namespace android { diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp index 8b4cc91565b64..7ec4b8ea0799c 100644 --- a/core/jni/android_os_VintfObject.cpp +++ b/core/jni/android_os_VintfObject.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/core/jni/android_os_VintfRuntimeInfo.cpp b/core/jni/android_os_VintfRuntimeInfo.cpp index ecb685435a97b..19220cf05adbb 100644 --- a/core/jni/android_os_VintfRuntimeInfo.cpp +++ b/core/jni/android_os_VintfRuntimeInfo.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "VintfRuntimeInfo" //#define LOG_NDEBUG 0 -#include +#include #include #include #include diff --git a/core/jni/android_os_seccomp.cpp b/core/jni/android_os_seccomp.cpp index 45023713ea859..06e2a167de0a8 100644 --- a/core/jni/android_os_seccomp.cpp +++ b/core/jni/android_os_seccomp.cpp @@ -15,7 +15,7 @@ */ #include "core_jni_helpers.h" -#include "JniConstants.h" +#include #include "utils/Log.h" #include diff --git a/core/jni/android_server_NetworkManagementSocketTagger.cpp b/core/jni/android_server_NetworkManagementSocketTagger.cpp index 818bf53d97a45..58295af50135a 100644 --- a/core/jni/android_server_NetworkManagementSocketTagger.cpp +++ b/core/jni/android_server_NetworkManagementSocketTagger.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "NMST_QTagUidNative" #include -#include "JNIHelp.h" +#include #include "jni.h" #include diff --git a/core/jni/android_server_Watchdog.cpp b/core/jni/android_server_Watchdog.cpp index d1f943458d907..01d565b26ddb7 100644 --- a/core/jni/android_server_Watchdog.cpp +++ b/core/jni/android_server_Watchdog.cpp @@ -25,7 +25,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" static void dumpOneStack(int tid, int outFd) { diff --git a/core/jni/android_text_AndroidBidi.cpp b/core/jni/android_text_AndroidBidi.cpp index 3b97a5e6442ed..6e9a339d24196 100644 --- a/core/jni/android_text_AndroidBidi.cpp +++ b/core/jni/android_text_AndroidBidi.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "AndroidUnicode" -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include "utils/misc.h" #include "utils/Log.h" diff --git a/core/jni/android_text_AndroidCharacter.cpp b/core/jni/android_text_AndroidCharacter.cpp index 474a74e8776c2..8885aac490648 100644 --- a/core/jni/android_text_AndroidCharacter.cpp +++ b/core/jni/android_text_AndroidCharacter.cpp @@ -17,8 +17,8 @@ #define LOG_TAG "AndroidUnicode" -#include "JNIHelp.h" -#include "ScopedPrimitiveArray.h" +#include +#include #include "core_jni_helpers.h" #include "utils/misc.h" #include "utils/Log.h" diff --git a/core/jni/android_text_StaticLayout.cpp b/core/jni/android_text_StaticLayout.cpp index 13e4f1a59fd8d..fd1067534f33e 100644 --- a/core/jni/android_text_StaticLayout.cpp +++ b/core/jni/android_text_StaticLayout.cpp @@ -21,9 +21,9 @@ #include "unicode/brkiter.h" #include "utils/misc.h" #include "utils/Log.h" -#include "ScopedStringChars.h" -#include "ScopedPrimitiveArray.h" -#include "JNIHelp.h" +#include +#include +#include #include "core_jni_helpers.h" #include #include diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 171bd8907e591..15966adcd33ce 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -37,9 +37,9 @@ #include "android_util_Binder.h" #include "core_jni_helpers.h" #include "jni.h" -#include "JNIHelp.h" -#include "ScopedStringChars.h" -#include "ScopedUtfChars.h" +#include +#include +#include #include "utils/Log.h" #include "utils/misc.h" #include "utils/String8.h" diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index e2aa17b32d0b4..5b0f7768c165d 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -20,7 +20,7 @@ #include "android_os_Parcel.h" #include "android_util_Binder.h" -#include "JNIHelp.h" +#include #include #include @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include #include "core_jni_helpers.h" diff --git a/core/jni/android_util_EventLog.cpp b/core/jni/android_util_EventLog.cpp index 0b4fbcc2e3400..3d05778898541 100644 --- a/core/jni/android_util_EventLog.cpp +++ b/core/jni/android_util_EventLog.cpp @@ -20,7 +20,7 @@ #include -#include "JNIHelp.h" +#include #include "core_jni_helpers.h" #include "jni.h" diff --git a/core/jni/android_util_FileObserver.cpp b/core/jni/android_util_FileObserver.cpp index 2b93b6d61905f..6f975b23e5bdb 100644 --- a/core/jni/android_util_FileObserver.cpp +++ b/core/jni/android_util_FileObserver.cpp @@ -15,7 +15,7 @@ ** limitations under the License. */ -#include "JNIHelp.h" +#include #include "jni.h" #include "utils/Log.h" #include "utils/misc.h" diff --git a/core/jni/android_util_Log.cpp b/core/jni/android_util_Log.cpp index 56505afc78b2f..a6adc88f53fb0 100644 --- a/core/jni/android_util_Log.cpp +++ b/core/jni/android_util_Log.cpp @@ -26,7 +26,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "utils/misc.h" #include "core_jni_helpers.h" #include "android_util_Log.h" diff --git a/core/jni/android_util_Log.h b/core/jni/android_util_Log.h index 4804a8547422e..8a32864ff8721 100644 --- a/core/jni/android_util_Log.h +++ b/core/jni/android_util_Log.h @@ -18,7 +18,7 @@ #define _ANDROID_UTIL_LOG_H #include -#include +#include namespace android { diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index a03d3c503e1c3..cd95432ebe9d3 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -30,7 +30,7 @@ #include "core_jni_helpers.h" #include "android_util_Binder.h" -#include "JNIHelp.h" +#include #include #include diff --git a/core/jni/android_util_StringBlock.cpp b/core/jni/android_util_StringBlock.cpp index b396afe62dff8..760f9e36ed3d8 100644 --- a/core/jni/android_util_StringBlock.cpp +++ b/core/jni/android_util_StringBlock.cpp @@ -18,7 +18,7 @@ #define LOG_TAG "StringBlock" #include "jni.h" -#include "JNIHelp.h" +#include #include #include #include diff --git a/core/jni/android_util_XmlBlock.cpp b/core/jni/android_util_XmlBlock.cpp index a15c23cd879ae..87f88511ec1b0 100644 --- a/core/jni/android_util_XmlBlock.cpp +++ b/core/jni/android_util_XmlBlock.cpp @@ -18,7 +18,7 @@ #define LOG_TAG "XmlBlock" #include "jni.h" -#include "JNIHelp.h" +#include #include #include #include diff --git a/core/jni/android_util_jar_StrictJarFile.cpp b/core/jni/android_util_jar_StrictJarFile.cpp index 4f1f926c8a225..4ab8db4395f65 100644 --- a/core/jni/android_util_jar_StrictJarFile.cpp +++ b/core/jni/android_util_jar_StrictJarFile.cpp @@ -22,10 +22,10 @@ #include -#include "JNIHelp.h" -#include "JniConstants.h" -#include "ScopedLocalRef.h" -#include "ScopedUtfChars.h" +#include +#include +#include +#include #include "jni.h" #include "ziparchive/zip_archive.h" diff --git a/core/jni/android_view_DisplayEventReceiver.cpp b/core/jni/android_view_DisplayEventReceiver.cpp index ea5a760622d7a..78bf1db8e1277 100644 --- a/core/jni/android_view_DisplayEventReceiver.cpp +++ b/core/jni/android_view_DisplayEventReceiver.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 -#include "JNIHelp.h" +#include #include @@ -30,7 +30,7 @@ #include #include "android_os_MessageQueue.h" -#include +#include #include "core_jni_helpers.h" diff --git a/core/jni/android_view_InputChannel.cpp b/core/jni/android_view_InputChannel.cpp index 1c6ead0f1086a..71742cbbb1809 100644 --- a/core/jni/android_view_InputChannel.cpp +++ b/core/jni/android_view_InputChannel.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "InputChannel-JNI" -#include "JNIHelp.h" +#include #include #include diff --git a/core/jni/android_view_InputDevice.cpp b/core/jni/android_view_InputDevice.cpp index 4e6e512b69df8..494fad7900ef6 100644 --- a/core/jni/android_view_InputDevice.cpp +++ b/core/jni/android_view_InputDevice.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "android_view_InputDevice.h" #include "android_view_KeyCharacterMap.h" diff --git a/core/jni/android_view_InputEventReceiver.cpp b/core/jni/android_view_InputEventReceiver.cpp index 8293cd8ff88dd..31e954bf5b887 100644 --- a/core/jni/android_view_InputEventReceiver.cpp +++ b/core/jni/android_view_InputEventReceiver.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 -#include "JNIHelp.h" +#include #include #include @@ -31,7 +31,7 @@ #include "android_view_KeyEvent.h" #include "android_view_MotionEvent.h" -#include +#include #include "core_jni_helpers.h" diff --git a/core/jni/android_view_InputEventSender.cpp b/core/jni/android_view_InputEventSender.cpp index 3bd6917aedfa1..420ff2a46814d 100644 --- a/core/jni/android_view_InputEventSender.cpp +++ b/core/jni/android_view_InputEventSender.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 -#include "JNIHelp.h" +#include #include #include @@ -31,7 +31,7 @@ #include "android_view_KeyEvent.h" #include "android_view_MotionEvent.h" -#include +#include #include "core_jni_helpers.h" diff --git a/core/jni/android_view_InputQueue.cpp b/core/jni/android_view_InputQueue.cpp index 96ccdee20c7c6..24c3ff80badd1 100644 --- a/core/jni/android_view_InputQueue.cpp +++ b/core/jni/android_view_InputQueue.cpp @@ -26,9 +26,9 @@ #include #include #include -#include +#include -#include "JNIHelp.h" +#include #include "android_os_MessageQueue.h" #include "android_view_KeyEvent.h" #include "android_view_MotionEvent.h" diff --git a/core/jni/android_view_KeyEvent.cpp b/core/jni/android_view_KeyEvent.cpp index 216e6f64a9f8f..8a6e745b60a85 100644 --- a/core/jni/android_view_KeyEvent.cpp +++ b/core/jni/android_view_KeyEvent.cpp @@ -16,13 +16,13 @@ #define LOG_TAG "KeyEvent-JNI" -#include "JNIHelp.h" +#include #include #include #include #include -#include +#include #include "android_view_KeyEvent.h" #include "core_jni_helpers.h" diff --git a/core/jni/android_view_MotionEvent.cpp b/core/jni/android_view_MotionEvent.cpp index 0245d38144cbb..79e7e118f8d5e 100644 --- a/core/jni/android_view_MotionEvent.cpp +++ b/core/jni/android_view_MotionEvent.cpp @@ -16,14 +16,14 @@ #define LOG_TAG "MotionEvent-JNI" -#include "JNIHelp.h" +#include #include #include #include #include #include -#include +#include #include "android_os_Parcel.h" #include "android_view_MotionEvent.h" #include "android_util_Binder.h" diff --git a/core/jni/android_view_PointerIcon.cpp b/core/jni/android_view_PointerIcon.cpp index 4150636cae12d..4f79790dec51f 100644 --- a/core/jni/android_view_PointerIcon.cpp +++ b/core/jni/android_view_PointerIcon.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "PointerIcon-JNI" -#include "JNIHelp.h" +#include #include "android_view_PointerIcon.h" @@ -24,7 +24,7 @@ #include #include #include -#include "ScopedLocalRef.h" +#include #include "core_jni_helpers.h" diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index a0c62c3662850..cb96f613084d0 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -19,7 +19,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "android_os_Parcel.h" #include "android/graphics/GraphicsJNI.h" @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index bc3593977a999..d18fc2dc8c29e 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -24,8 +24,8 @@ #include "core_jni_helpers.h" #include -#include -#include +#include +#include #include #include #include diff --git a/core/jni/android_view_SurfaceSession.cpp b/core/jni/android_view_SurfaceSession.cpp index dad6958560c0a..99a445e33ff68 100644 --- a/core/jni/android_view_SurfaceSession.cpp +++ b/core/jni/android_view_SurfaceSession.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "SurfaceSession" -#include "JNIHelp.h" +#include #include #include diff --git a/core/jni/android_view_ThreadedRenderer.cpp b/core/jni/android_view_ThreadedRenderer.cpp index 9c0a65a606067..094bf9a1d4364 100644 --- a/core/jni/android_view_ThreadedRenderer.cpp +++ b/core/jni/android_view_ThreadedRenderer.cpp @@ -23,7 +23,7 @@ #include #include "core_jni_helpers.h" #include -#include +#include #include #include diff --git a/core/jni/android_view_VelocityTracker.cpp b/core/jni/android_view_VelocityTracker.cpp index e1f2241bfd474..153789c7f933a 100644 --- a/core/jni/android_view_VelocityTracker.cpp +++ b/core/jni/android_view_VelocityTracker.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "VelocityTracker-JNI" -#include "JNIHelp.h" +#include #include #include @@ -24,7 +24,7 @@ #include #include "android_view_MotionEvent.h" -#include +#include #include "core_jni_helpers.h" diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp index f8f9efe2804fb..fce5dd58d7f9e 100644 --- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp +++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp @@ -19,7 +19,7 @@ #include "core_jni_helpers.h" -#include +#include #include #include #include diff --git a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp index 4a2b88142e788..0cb69359901d1 100644 --- a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp +++ b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index cb53106dbf28b..3887c76419cc2 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -54,10 +54,10 @@ #include #include "core_jni_helpers.h" -#include "JNIHelp.h" -#include "ScopedLocalRef.h" -#include "ScopedPrimitiveArray.h" -#include "ScopedUtfChars.h" +#include +#include +#include +#include #include "fd_utils.h" #include "nativebridge/native_bridge.h" diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp index 3d63b013e9f1e..18731187b8b4c 100644 --- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp @@ -15,7 +15,7 @@ ** limitations under the License. */ -#include "JNIHelp.h" +#include #include #include #include diff --git a/core/jni/com_google_android_gles_jni_GLImpl.cpp b/core/jni/com_google_android_gles_jni_GLImpl.cpp index 3e74d1c855b36..fe012d75c1f45 100644 --- a/core/jni/com_google_android_gles_jni_GLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_GLImpl.cpp @@ -22,7 +22,7 @@ #pragma GCC diagnostic ignored "-Wunused-function" #include "jni.h" -#include "JNIHelp.h" +#include #include #include diff --git a/core/jni/core_jni_helpers.h b/core/jni/core_jni_helpers.h index 3f169c365ca4a..1325b0ce1ea73 100644 --- a/core/jni/core_jni_helpers.h +++ b/core/jni/core_jni_helpers.h @@ -17,7 +17,7 @@ #ifndef CORE_JNI_HELPERS #define CORE_JNI_HELPERS -#include "JNIHelp.h" +#include #include namespace android { diff --git a/core/jni/include/android_runtime/android_view_InputQueue.h b/core/jni/include/android_runtime/android_view_InputQueue.h index ed37b0aa50832..ac8da586eed99 100644 --- a/core/jni/include/android_runtime/android_view_InputQueue.h +++ b/core/jni/include/android_runtime/android_view_InputQueue.h @@ -22,7 +22,7 @@ #include #include -#include "JNIHelp.h" +#include /* * Declare a concrete type for the NDK's AInputQueue forward declaration diff --git a/drm/jni/android_drm_DrmManagerClient.cpp b/drm/jni/android_drm_DrmManagerClient.cpp index 63fe8acedd543..52ea8e3b161ff 100644 --- a/drm/jni/android_drm_DrmManagerClient.cpp +++ b/drm/jni/android_drm_DrmManagerClient.cpp @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp index c655b7c3c5ee8..fcc975c0975a3 100644 --- a/media/jni/android_media_ImageReader.cpp +++ b/media/jni/android_media_ImageReader.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp index 56df32f79cb93..1cfb3cfd34cd3 100644 --- a/media/jni/android_media_ImageWriter.cpp +++ b/media/jni/android_media_ImageWriter.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index 810996ec79a77..79d6c53fbbc58 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -25,7 +25,7 @@ #include "android_runtime/AndroidRuntime.h" #include "android_runtime/android_view_Surface.h" #include "jni.h" -#include "JNIHelp.h" +#include #include diff --git a/media/jni/android_media_MediaCodecList.cpp b/media/jni/android_media_MediaCodecList.cpp index de9bf1f528af0..8de11caf7d7a8 100644 --- a/media/jni/android_media_MediaCodecList.cpp +++ b/media/jni/android_media_MediaCodecList.cpp @@ -26,7 +26,7 @@ #include "android_runtime/AndroidRuntime.h" #include "jni.h" -#include "JNIHelp.h" +#include #include "android_media_Utils.h" using namespace android; diff --git a/media/jni/android_media_MediaCrypto.cpp b/media/jni/android_media_MediaCrypto.cpp index 2adbfeefcd7ed..a2abef59f95e2 100644 --- a/media/jni/android_media_MediaCrypto.cpp +++ b/media/jni/android_media_MediaCrypto.cpp @@ -22,7 +22,7 @@ #include "android_runtime/AndroidRuntime.h" #include "jni.h" -#include "JNIHelp.h" +#include #include #include diff --git a/media/jni/android_media_MediaDataSource.cpp b/media/jni/android_media_MediaDataSource.cpp index 2ab7e39fad17b..8c38d887f82bd 100644 --- a/media/jni/android_media_MediaDataSource.cpp +++ b/media/jni/android_media_MediaDataSource.cpp @@ -23,7 +23,7 @@ #include "android_runtime/AndroidRuntime.h" #include "android_runtime/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include #include #include diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index 7a98c954747f1..31e227bea363b 100644 --- a/media/jni/android_media_MediaDrm.cpp +++ b/media/jni/android_media_MediaDrm.cpp @@ -24,7 +24,7 @@ #include "android_runtime/Log.h" #include "android_os_Parcel.h" #include "jni.h" -#include "JNIHelp.h" +#include #include #include diff --git a/media/jni/android_media_MediaHTTPConnection.cpp b/media/jni/android_media_MediaHTTPConnection.cpp index fa0b43fedcef3..365e045689f08 100644 --- a/media/jni/android_media_MediaHTTPConnection.cpp +++ b/media/jni/android_media_MediaHTTPConnection.cpp @@ -27,7 +27,7 @@ #include "android_runtime/AndroidRuntime.h" #include "jni.h" -#include "JNIHelp.h" +#include namespace android { diff --git a/media/jni/android_media_MediaMetadataRetriever.cpp b/media/jni/android_media_MediaMetadataRetriever.cpp index f4e940d6cb214..4f1a145b87094 100644 --- a/media/jni/android_media_MediaMetadataRetriever.cpp +++ b/media/jni/android_media_MediaMetadataRetriever.cpp @@ -28,7 +28,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include "android_media_MediaDataSource.h" #include "android_media_Utils.h" diff --git a/media/jni/android_media_MediaMuxer.cpp b/media/jni/android_media_MediaMuxer.cpp index 216624e96ad2d..8b67346b3bc37 100644 --- a/media/jni/android_media_MediaMuxer.cpp +++ b/media/jni/android_media_MediaMuxer.cpp @@ -21,7 +21,7 @@ #include "android_media_Utils.h" #include "android_runtime/AndroidRuntime.h" #include "jni.h" -#include "JNIHelp.h" +#include #include #include diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 8f14b79660be7..8392b9e4b7676 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -30,7 +30,7 @@ #include #include #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include "android_runtime/android_view_Surface.h" #include "android_runtime/Log.h" diff --git a/media/jni/android_media_MediaProfiles.cpp b/media/jni/android_media_MediaProfiles.cpp index 5800043041704..5bc80925eca44 100644 --- a/media/jni/android_media_MediaProfiles.cpp +++ b/media/jni/android_media_MediaProfiles.cpp @@ -22,7 +22,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include diff --git a/media/jni/android_media_MediaScanner.cpp b/media/jni/android_media_MediaScanner.cpp index 0f3c61f53a2c8..3b475b2d70c8e 100644 --- a/media/jni/android_media_MediaScanner.cpp +++ b/media/jni/android_media_MediaScanner.cpp @@ -24,7 +24,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include "android_runtime/Log.h" diff --git a/media/jni/android_media_MediaSync.cpp b/media/jni/android_media_MediaSync.cpp index 6de5ea9e9f668..f75200868a0db 100644 --- a/media/jni/android_media_MediaSync.cpp +++ b/media/jni/android_media_MediaSync.cpp @@ -26,7 +26,7 @@ #include "android_runtime/AndroidRuntime.h" #include "android_runtime/android_view_Surface.h" #include "jni.h" -#include "JNIHelp.h" +#include #include diff --git a/media/jni/android_media_ResampleInputStream.cpp b/media/jni/android_media_ResampleInputStream.cpp index fa755242a86b5..3d8f517ca3a1f 100644 --- a/media/jni/android_media_ResampleInputStream.cpp +++ b/media/jni/android_media_ResampleInputStream.cpp @@ -27,7 +27,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" diff --git a/media/jni/android_media_SyncParams.cpp b/media/jni/android_media_SyncParams.cpp index d9b2f1d7f43cf..2d9738d8a34f8 100644 --- a/media/jni/android_media_SyncParams.cpp +++ b/media/jni/android_media_SyncParams.cpp @@ -16,7 +16,7 @@ #include "android_media_SyncParams.h" -#include "JNIHelp.h" +#include namespace android { diff --git a/media/jni/android_media_Utils.h b/media/jni/android_media_Utils.h index af2f2d7bbe5d8..821c6b25c3333 100644 --- a/media/jni/android_media_Utils.h +++ b/media/jni/android_media_Utils.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index f7f791696dd30..cf4458a6fd497 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp @@ -39,7 +39,7 @@ extern "C" { #include #include #include -#include +#include #include #include diff --git a/media/jni/android_mtp_MtpDevice.cpp b/media/jni/android_mtp_MtpDevice.cpp index 1faa0c472b2e2..6b7e7bbcd6fc9 100644 --- a/media/jni/android_mtp_MtpDevice.cpp +++ b/media/jni/android_mtp_MtpDevice.cpp @@ -29,8 +29,8 @@ #include #include "jni.h" -#include "JNIHelp.h" -#include "ScopedPrimitiveArray.h" +#include +#include #include "android_runtime/AndroidRuntime.h" #include "android_runtime/Log.h" diff --git a/media/jni/android_mtp_MtpServer.cpp b/media/jni/android_mtp_MtpServer.cpp index c325f4ef078bf..e9e93099c1e20 100644 --- a/media/jni/android_mtp_MtpServer.cpp +++ b/media/jni/android_mtp_MtpServer.cpp @@ -25,7 +25,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include "private/android_filesystem_config.h" diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index 5f2656337db74..17c18b7727a0e 100644 --- a/media/jni/audioeffect/android_media_AudioEffect.cpp +++ b/media/jni/audioeffect/android_media_AudioEffect.cpp @@ -25,7 +25,7 @@ #include #include "media/AudioEffect.h" -#include +#include using namespace android; diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp index f0cfeef197d8a..b7d7b03393769 100644 --- a/media/jni/audioeffect/android_media_Visualizer.cpp +++ b/media/jni/audioeffect/android_media_Visualizer.cpp @@ -26,7 +26,7 @@ #include #include "media/Visualizer.h" -#include +#include using namespace android; diff --git a/native/android/asset_manager.cpp b/native/android/asset_manager.cpp index 0e5e5c60d506a..98e9a42d944d3 100644 --- a/native/android/asset_manager.cpp +++ b/native/android/asset_manager.cpp @@ -24,7 +24,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include using namespace android; diff --git a/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp b/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp index 6be48491ef107..53cdc9d96b434 100644 --- a/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp +++ b/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "DefContainer-JNI" -#include +#include #include #include diff --git a/packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp b/packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp index 1ce3949bbb815..7ff9cedab5f70 100644 --- a/packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp +++ b/packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "BitmapSerializeUtils" #include -#include +#include #include #include diff --git a/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp b/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp index 990d7707cdfb0..846ff2517d12c 100644 --- a/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp +++ b/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp @@ -21,7 +21,7 @@ #include "android_runtime/AndroidRuntime.h" #include "jni.h" -#include "JNIHelp.h" +#include #include "proxy_resolver_v8.h" diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index b4630efe80e89..d45d1678491d1 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -29,7 +29,7 @@ #include #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include "android_runtime/android_view_Surface.h" #include "android_runtime/android_util_AssetManager.h" diff --git a/services/core/jni/com_android_server_AlarmManagerService.cpp b/services/core/jni/com_android_server_AlarmManagerService.cpp index 3a0273d8c3c8c..bcb0b4fcbe0b8 100644 --- a/services/core/jni/com_android_server_AlarmManagerService.cpp +++ b/services/core/jni/com_android_server_AlarmManagerService.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "AlarmManagerService" -#include "JNIHelp.h" +#include #include "jni.h" #include #include diff --git a/services/core/jni/com_android_server_HardwarePropertiesManagerService.cpp b/services/core/jni/com_android_server_HardwarePropertiesManagerService.cpp index 14d50ce957fe7..701403b18c9a4 100644 --- a/services/core/jni/com_android_server_HardwarePropertiesManagerService.cpp +++ b/services/core/jni/com_android_server_HardwarePropertiesManagerService.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "HardwarePropertiesManagerService-JNI" -#include "JNIHelp.h" +#include #include "jni.h" #include diff --git a/services/core/jni/com_android_server_PersistentDataBlockService.cpp b/services/core/jni/com_android_server_PersistentDataBlockService.cpp index f94e5d9d438c9..97e69fb4bb404 100644 --- a/services/core/jni/com_android_server_PersistentDataBlockService.cpp +++ b/services/core/jni/com_android_server_PersistentDataBlockService.cpp @@ -15,9 +15,9 @@ */ #include -#include +#include #include -#include +#include #include #include diff --git a/services/core/jni/com_android_server_SerialService.cpp b/services/core/jni/com_android_server_SerialService.cpp index 1bd7a599ed601..aef0b25503c85 100644 --- a/services/core/jni/com_android_server_SerialService.cpp +++ b/services/core/jni/com_android_server_SerialService.cpp @@ -18,7 +18,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include diff --git a/services/core/jni/com_android_server_SystemServer.cpp b/services/core/jni/com_android_server_SystemServer.cpp index e46490bb3fac9..01da4df31a805 100644 --- a/services/core/jni/com_android_server_SystemServer.cpp +++ b/services/core/jni/com_android_server_SystemServer.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include diff --git a/services/core/jni/com_android_server_UsbDeviceManager.cpp b/services/core/jni/com_android_server_UsbDeviceManager.cpp index 3733a55e75049..f37f87060fa63 100644 --- a/services/core/jni/com_android_server_UsbDeviceManager.cpp +++ b/services/core/jni/com_android_server_UsbDeviceManager.cpp @@ -18,7 +18,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include "android_runtime/Log.h" diff --git a/services/core/jni/com_android_server_UsbHostManager.cpp b/services/core/jni/com_android_server_UsbHostManager.cpp index 795f6aa6018a4..eab3979846e30 100644 --- a/services/core/jni/com_android_server_UsbHostManager.cpp +++ b/services/core/jni/com_android_server_UsbHostManager.cpp @@ -18,7 +18,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include "android_runtime/Log.h" diff --git a/services/core/jni/com_android_server_UsbMidiDevice.cpp b/services/core/jni/com_android_server_UsbMidiDevice.cpp index e12a01661a440..79d935fe610c6 100644 --- a/services/core/jni/com_android_server_UsbMidiDevice.cpp +++ b/services/core/jni/com_android_server_UsbMidiDevice.cpp @@ -19,7 +19,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include "android_runtime/Log.h" diff --git a/services/core/jni/com_android_server_VibratorService.cpp b/services/core/jni/com_android_server_VibratorService.cpp index 03fbd19094ba0..d7e7c241bf3e0 100644 --- a/services/core/jni/com_android_server_VibratorService.cpp +++ b/services/core/jni/com_android_server_VibratorService.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "VibratorService" #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include diff --git a/services/core/jni/com_android_server_am_BatteryStatsService.cpp b/services/core/jni/com_android_server_am_BatteryStatsService.cpp index 531f9462a98f0..1d59762af5f8e 100644 --- a/services/core/jni/com_android_server_am_BatteryStatsService.cpp +++ b/services/core/jni/com_android_server_am_BatteryStatsService.cpp @@ -31,8 +31,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/services/core/jni/com_android_server_connectivity_Vpn.cpp b/services/core/jni/com_android_server_connectivity_Vpn.cpp index 4d85d9a558aa6..b6bea11a66ea9 100644 --- a/services/core/jni/com_android_server_connectivity_Vpn.cpp +++ b/services/core/jni/com_android_server_connectivity_Vpn.cpp @@ -38,7 +38,7 @@ #include "netutils/ifc.h" #include "jni.h" -#include "JNIHelp.h" +#include namespace android { diff --git a/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp b/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp index 4e5c27fca7847..87312f82d58ae 100644 --- a/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp +++ b/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/services/core/jni/com_android_server_fingerprint_FingerprintService.cpp b/services/core/jni/com_android_server_fingerprint_FingerprintService.cpp index 39474ece0d21a..503f0cf993d4e 100644 --- a/services/core/jni/com_android_server_fingerprint_FingerprintService.cpp +++ b/services/core/jni/com_android_server_fingerprint_FingerprintService.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "Fingerprint-JNI" -#include "JNIHelp.h" +#include #include #include diff --git a/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp b/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp index a23fbcbd42c71..3f6295b9ecfe8 100644 --- a/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp +++ b/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp @@ -18,8 +18,8 @@ #define LOG_NDEBUG 1 -#include -#include +#include +#include #include diff --git a/services/core/jni/com_android_server_input_InputApplicationHandle.cpp b/services/core/jni/com_android_server_input_InputApplicationHandle.cpp index e927b60318413..232b2c2c8c86b 100644 --- a/services/core/jni/com_android_server_input_InputApplicationHandle.cpp +++ b/services/core/jni/com_android_server_input_InputApplicationHandle.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "InputApplicationHandle" -#include "JNIHelp.h" +#include #include "jni.h" #include #include diff --git a/services/core/jni/com_android_server_input_InputApplicationHandle.h b/services/core/jni/com_android_server_input_InputApplicationHandle.h index e6f25cce1f987..c9af711a7586a 100644 --- a/services/core/jni/com_android_server_input_InputApplicationHandle.h +++ b/services/core/jni/com_android_server_input_InputApplicationHandle.h @@ -19,7 +19,7 @@ #include -#include "JNIHelp.h" +#include #include "jni.h" namespace android { diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index 6791da928b1b2..151c8874759a3 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -25,7 +25,7 @@ #define DEBUG_INPUT_DISPATCHER_POLICY 0 -#include "JNIHelp.h" +#include #include "jni.h" #include #include @@ -50,9 +50,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "com_android_server_power_PowerManagerService.h" #include "com_android_server_input_InputApplicationHandle.h" diff --git a/services/core/jni/com_android_server_input_InputWindowHandle.cpp b/services/core/jni/com_android_server_input_InputWindowHandle.cpp index 197d056619763..2b2a6fac9b6a0 100644 --- a/services/core/jni/com_android_server_input_InputWindowHandle.cpp +++ b/services/core/jni/com_android_server_input_InputWindowHandle.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "InputWindowHandle" -#include "JNIHelp.h" +#include #include "jni.h" #include #include diff --git a/services/core/jni/com_android_server_input_InputWindowHandle.h b/services/core/jni/com_android_server_input_InputWindowHandle.h index 8d9e7d7776360..44d4620c8b0c7 100644 --- a/services/core/jni/com_android_server_input_InputWindowHandle.h +++ b/services/core/jni/com_android_server_input_InputWindowHandle.h @@ -19,7 +19,7 @@ #include -#include "JNIHelp.h" +#include #include "jni.h" namespace android { diff --git a/services/core/jni/com_android_server_lights_LightsService.cpp b/services/core/jni/com_android_server_lights_LightsService.cpp index dc6bc2ee42cfc..178d15aab5de6 100644 --- a/services/core/jni/com_android_server_lights_LightsService.cpp +++ b/services/core/jni/com_android_server_lights_LightsService.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "LightsService" #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include diff --git a/services/core/jni/com_android_server_power_PowerManagerService.h b/services/core/jni/com_android_server_power_PowerManagerService.h index f5fd3d6ecad19..a17fd650522b0 100644 --- a/services/core/jni/com_android_server_power_PowerManagerService.h +++ b/services/core/jni/com_android_server_power_PowerManagerService.h @@ -17,7 +17,7 @@ #ifndef _ANDROID_SERVER_POWER_MANAGER_SERVICE_H #define _ANDROID_SERVER_POWER_MANAGER_SERVICE_H -#include "JNIHelp.h" +#include #include "jni.h" #include diff --git a/services/core/jni/com_android_server_tv_TvInputHal.cpp b/services/core/jni/com_android_server_tv_TvInputHal.cpp index e34a8e8a8cf87..038ab120c5af3 100644 --- a/services/core/jni/com_android_server_tv_TvInputHal.cpp +++ b/services/core/jni/com_android_server_tv_TvInputHal.cpp @@ -21,7 +21,7 @@ #include "android_os_MessageQueue.h" #include "android_runtime/AndroidRuntime.h" #include "android_runtime/android_view_Surface.h" -#include "JNIHelp.h" +#include #include "jni.h" #include diff --git a/services/core/jni/com_android_server_tv_TvUinputBridge.cpp b/services/core/jni/com_android_server_tv_TvUinputBridge.cpp index de115c80938b5..980922a806f5f 100644 --- a/services/core/jni/com_android_server_tv_TvUinputBridge.cpp +++ b/services/core/jni/com_android_server_tv_TvUinputBridge.cpp @@ -20,7 +20,7 @@ #include "jni.h" #include -#include +#include #include #include diff --git a/services/core/jni/com_android_server_vr_VrManagerService.cpp b/services/core/jni/com_android_server_vr_VrManagerService.cpp index 1aba43b2cd8be..72df5b6d7dacb 100644 --- a/services/core/jni/com_android_server_vr_VrManagerService.cpp +++ b/services/core/jni/com_android_server_vr_VrManagerService.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp index 5d7291a9ddb33..05f140bc5baf3 100644 --- a/services/core/jni/onload.cpp +++ b/services/core/jni/onload.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "JNIHelp.h" +#include #include "jni.h" #include "utils/Log.h" #include "utils/misc.h" diff --git a/tests/net/jni/apf_jni.cpp b/tests/net/jni/apf_jni.cpp index ee43dd4883638..82cbb6b7fb0c0 100644 --- a/tests/net/jni/apf_jni.cpp +++ b/tests/net/jni/apf_jni.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include +#include #include #include #include