mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-06-29 08:02:40 +00:00
1705545d22
TODO: - manifest - devices - a few small patches to rebase Signed-off-by: Tad <tad@spotco.us>
214 lines
10 KiB
Diff
214 lines
10 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Micay <danielmicay@gmail.com>
|
|
Date: Sat, 16 Oct 2021 19:44:59 -0400
|
|
Subject: [PATCH] constify JNINativeMethod tables
|
|
|
|
---
|
|
cmds/hid/jni/com_android_commands_hid_Device.cpp | 2 +-
|
|
cmds/uinput/jni/com_android_commands_uinput_Device.cpp | 2 +-
|
|
core/jni/android_app_ActivityThread.cpp | 2 +-
|
|
core/jni/android_os_HidlMemory.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 | 2 +-
|
|
libs/hwui/jni/android_graphics_DisplayListCanvas.cpp | 2 +-
|
|
media/jni/android_media_ImageWriter.cpp | 4 ++--
|
|
media/jni/android_media_MediaSync.cpp | 2 +-
|
|
media/jni/soundpool/android_media_SoundPool.cpp | 2 +-
|
|
services/core/jni/com_android_server_UsbMidiDevice.cpp | 2 +-
|
|
services/core/jni/com_android_server_tv_TvUinputBridge.cpp | 2 +-
|
|
14 files changed, 15 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/cmds/hid/jni/com_android_commands_hid_Device.cpp b/cmds/hid/jni/com_android_commands_hid_Device.cpp
|
|
index 2cda57dd67e9..7613651e75c4 100644
|
|
--- a/cmds/hid/jni/com_android_commands_hid_Device.cpp
|
|
+++ b/cmds/hid/jni/com_android_commands_hid_Device.cpp
|
|
@@ -354,7 +354,7 @@ static void closeDevice(JNIEnv* /* env */, jclass /* clazz */, jlong ptr) {
|
|
}
|
|
}
|
|
|
|
-static JNINativeMethod sMethods[] = {
|
|
+static const JNINativeMethod sMethods[] = {
|
|
{"nativeOpenDevice",
|
|
"(Ljava/lang/String;IIII[B"
|
|
"Lcom/android/commands/hid/Device$DeviceCallback;)J",
|
|
diff --git a/cmds/uinput/jni/com_android_commands_uinput_Device.cpp b/cmds/uinput/jni/com_android_commands_uinput_Device.cpp
|
|
index 06fa2aac2c7e..4c20055020a4 100644
|
|
--- a/cmds/uinput/jni/com_android_commands_uinput_Device.cpp
|
|
+++ b/cmds/uinput/jni/com_android_commands_uinput_Device.cpp
|
|
@@ -301,7 +301,7 @@ static void setAbsInfo(JNIEnv* env, jclass /* clazz */, jint handle, jint axisCo
|
|
::ioctl(static_cast<int>(handle), UI_ABS_SETUP, &absSetup);
|
|
}
|
|
|
|
-static JNINativeMethod sMethods[] = {
|
|
+static const JNINativeMethod sMethods[] = {
|
|
{"nativeOpenUinputDevice",
|
|
"(Ljava/lang/String;IIIII"
|
|
"Lcom/android/commands/uinput/Device$DeviceCallback;)J",
|
|
diff --git a/core/jni/android_app_ActivityThread.cpp b/core/jni/android_app_ActivityThread.cpp
|
|
index e9d9a20c7538..cd285238d6e2 100644
|
|
--- a/core/jni/android_app_ActivityThread.cpp
|
|
+++ b/core/jni/android_app_ActivityThread.cpp
|
|
@@ -40,7 +40,7 @@ static void android_app_ActivityThread_initZygoteChildHeapProfiling(JNIEnv* env,
|
|
android_mallopt(M_INIT_ZYGOTE_CHILD_PROFILING, nullptr, 0);
|
|
}
|
|
|
|
-static JNINativeMethod gActivityThreadMethods[] = {
|
|
+static const JNINativeMethod gActivityThreadMethods[] = {
|
|
// ------------ Regular JNI ------------------
|
|
{ "nPurgePendingResources", "()V",
|
|
(void*) android_app_ActivityThread_purgePendingResources },
|
|
diff --git a/core/jni/android_os_HidlMemory.cpp b/core/jni/android_os_HidlMemory.cpp
|
|
index 69e48184c0ad..612fc95776a5 100644
|
|
--- a/core/jni/android_os_HidlMemory.cpp
|
|
+++ b/core/jni/android_os_HidlMemory.cpp
|
|
@@ -50,7 +50,7 @@ static void nativeFinalize(JNIEnv* env, jobject jobj) {
|
|
delete native;
|
|
}
|
|
|
|
-static JNINativeMethod gMethods[] = {
|
|
+static const JNINativeMethod gMethods[] = {
|
|
{"nativeFinalize", "()V", (void*) nativeFinalize},
|
|
};
|
|
|
|
diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp
|
|
index 781895eeeaba..cbec79144826 100644
|
|
--- a/core/jni/android_os_HwBinder.cpp
|
|
+++ b/core/jni/android_os_HwBinder.cpp
|
|
@@ -352,7 +352,7 @@ static void JHwBinder_report_sysprop_change(JNIEnv * /*env*/, jclass /*clazz*/)
|
|
report_sysprop_change();
|
|
}
|
|
|
|
-static JNINativeMethod gMethods[] = {
|
|
+static const JNINativeMethod gMethods[] = {
|
|
{ "native_init", "()J", (void *)JHwBinder_native_init },
|
|
{ "native_setup", "()V", (void *)JHwBinder_native_setup },
|
|
|
|
diff --git a/core/jni/android_os_HwBlob.cpp b/core/jni/android_os_HwBlob.cpp
|
|
index a9db91be1d5b..ba4cf6101449 100644
|
|
--- a/core/jni/android_os_HwBlob.cpp
|
|
+++ b/core/jni/android_os_HwBlob.cpp
|
|
@@ -599,7 +599,7 @@ static jlong JHwBlob_native_handle(JNIEnv *env, jobject thiz) {
|
|
return handle;
|
|
}
|
|
|
|
-static JNINativeMethod gMethods[] = {
|
|
+static const JNINativeMethod gMethods[] = {
|
|
{ "native_init", "()J", (void *)JHwBlob_native_init },
|
|
{ "native_setup", "(I)V", (void *)JHwBlob_native_setup },
|
|
|
|
diff --git a/core/jni/android_os_HwParcel.cpp b/core/jni/android_os_HwParcel.cpp
|
|
index 4c4443fc29c3..78fd6d90691b 100644
|
|
--- a/core/jni/android_os_HwParcel.cpp
|
|
+++ b/core/jni/android_os_HwParcel.cpp
|
|
@@ -1068,7 +1068,7 @@ static void JHwParcel_native_writeBuffer(
|
|
}
|
|
}
|
|
|
|
-static JNINativeMethod gMethods[] = {
|
|
+static const JNINativeMethod gMethods[] = {
|
|
{ "native_init", "()J", (void *)JHwParcel_native_init },
|
|
{ "native_setup", "(Z)V", (void *)JHwParcel_native_setup },
|
|
|
|
diff --git a/core/jni/android_os_HwRemoteBinder.cpp b/core/jni/android_os_HwRemoteBinder.cpp
|
|
index 3af55fe810fc..feabd6a60fbf 100644
|
|
--- a/core/jni/android_os_HwRemoteBinder.cpp
|
|
+++ b/core/jni/android_os_HwRemoteBinder.cpp
|
|
@@ -442,7 +442,7 @@ static jint JHwRemoteBinder_hashCode(JNIEnv* env, jobject thiz) {
|
|
return static_cast<jint>(longHash ^ (longHash >> 32)); // See Long.hashCode()
|
|
}
|
|
|
|
-static JNINativeMethod gMethods[] = {
|
|
+static const JNINativeMethod gMethods[] = {
|
|
{ "native_init", "()J", (void *)JHwRemoteBinder_native_init },
|
|
|
|
{ "native_setup_empty", "()V",
|
|
diff --git a/libs/hwui/jni/android_graphics_DisplayListCanvas.cpp b/libs/hwui/jni/android_graphics_DisplayListCanvas.cpp
|
|
index f060bb32031a..3ebb3553ce20 100644
|
|
--- a/libs/hwui/jni/android_graphics_DisplayListCanvas.cpp
|
|
+++ b/libs/hwui/jni/android_graphics_DisplayListCanvas.cpp
|
|
@@ -174,7 +174,7 @@ static void android_view_DisplayListCanvas_drawWebViewFunctor(CRITICAL_JNI_PARAM
|
|
|
|
const char* const kClassPathName = "android/graphics/RecordingCanvas";
|
|
|
|
-static JNINativeMethod gMethods[] = {
|
|
+static const JNINativeMethod gMethods[] = {
|
|
// ------------ @CriticalNative --------------
|
|
{"nCreateDisplayListCanvas", "(JII)J",
|
|
(void*)android_view_DisplayListCanvas_createDisplayListCanvas},
|
|
diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp
|
|
index b291ac95bf4f..1ee25c4f6421 100644
|
|
--- a/media/jni/android_media_ImageWriter.cpp
|
|
+++ b/media/jni/android_media_ImageWriter.cpp
|
|
@@ -1061,7 +1061,7 @@ static jobjectArray Image_createSurfacePlanes(JNIEnv* env, jobject thiz,
|
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
-static JNINativeMethod gImageWriterMethods[] = {
|
|
+static const JNINativeMethod gImageWriterMethods[] = {
|
|
{"nativeClassInit", "()V", (void*)ImageWriter_classInit },
|
|
{"nativeInit", "(Ljava/lang/Object;Landroid/view/Surface;IIII)J",
|
|
(void*)ImageWriter_init },
|
|
@@ -1075,7 +1075,7 @@ static JNINativeMethod gImageWriterMethods[] = {
|
|
{"cancelImage", "(JLandroid/media/Image;)V", (void*)ImageWriter_cancelImage },
|
|
};
|
|
|
|
-static JNINativeMethod gImageMethods[] = {
|
|
+static const JNINativeMethod gImageMethods[] = {
|
|
{"nativeCreatePlanes", "(II)[Landroid/media/ImageWriter$WriterSurfaceImage$SurfacePlane;",
|
|
(void*)Image_createSurfacePlanes },
|
|
{"nativeGetWidth", "()I", (void*)Image_getWidth },
|
|
diff --git a/media/jni/android_media_MediaSync.cpp b/media/jni/android_media_MediaSync.cpp
|
|
index d1ce30a3e827..d93bda166c44 100644
|
|
--- a/media/jni/android_media_MediaSync.cpp
|
|
+++ b/media/jni/android_media_MediaSync.cpp
|
|
@@ -514,7 +514,7 @@ static void android_media_MediaSync_native_finalize(JNIEnv *env, jobject thiz) {
|
|
android_media_MediaSync_release(env, thiz);
|
|
}
|
|
|
|
-static JNINativeMethod gMethods[] = {
|
|
+static const JNINativeMethod gMethods[] = {
|
|
{ "native_setSurface",
|
|
"(Landroid/view/Surface;)V",
|
|
(void *)android_media_MediaSync_native_setSurface },
|
|
diff --git a/media/jni/soundpool/android_media_SoundPool.cpp b/media/jni/soundpool/android_media_SoundPool.cpp
|
|
index a66d99fbd9f4..1665421aacd4 100644
|
|
--- a/media/jni/soundpool/android_media_SoundPool.cpp
|
|
+++ b/media/jni/soundpool/android_media_SoundPool.cpp
|
|
@@ -247,7 +247,7 @@ android_media_SoundPool_release(JNIEnv *env, jobject thiz)
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// Dalvik VM type signatures
|
|
-static JNINativeMethod gMethods[] = {
|
|
+static const JNINativeMethod gMethods[] = {
|
|
{ "_load",
|
|
"(Ljava/io/FileDescriptor;JJI)I",
|
|
(void *)android_media_SoundPool_load_FD
|
|
diff --git a/services/core/jni/com_android_server_UsbMidiDevice.cpp b/services/core/jni/com_android_server_UsbMidiDevice.cpp
|
|
index d6b5bed173eb..564f71daedac 100644
|
|
--- a/services/core/jni/com_android_server_UsbMidiDevice.cpp
|
|
+++ b/services/core/jni/com_android_server_UsbMidiDevice.cpp
|
|
@@ -157,7 +157,7 @@ android_server_UsbMidiDevice_close(JNIEnv *env, jobject thiz, jobjectArray fds)
|
|
}
|
|
}
|
|
|
|
-static JNINativeMethod method_table[] = {
|
|
+static const JNINativeMethod method_table[] = {
|
|
{ "nativeGetSubdeviceCount", "(II)I", (void*)android_server_UsbMidiDevice_get_subdevice_count },
|
|
{ "nativeOpen", "(III)[Ljava/io/FileDescriptor;", (void*)android_server_UsbMidiDevice_open },
|
|
{ "nativeClose", "([Ljava/io/FileDescriptor;)V", (void*)android_server_UsbMidiDevice_close },
|
|
diff --git a/services/core/jni/com_android_server_tv_TvUinputBridge.cpp b/services/core/jni/com_android_server_tv_TvUinputBridge.cpp
|
|
index 99deab4fd652..2cb1aaef13fa 100644
|
|
--- a/services/core/jni/com_android_server_tv_TvUinputBridge.cpp
|
|
+++ b/services/core/jni/com_android_server_tv_TvUinputBridge.cpp
|
|
@@ -534,7 +534,7 @@ static void nativeClear(JNIEnv* env, jclass clazz, jlong ptr) {
|
|
* JNI registration
|
|
*/
|
|
|
|
-static JNINativeMethod gUinputBridgeMethods[] = {
|
|
+static const JNINativeMethod gUinputBridgeMethods[] = {
|
|
{"nativeOpen", "(Ljava/lang/String;Ljava/lang/String;III)J", (void*)nativeOpen},
|
|
{"nativeGamepadOpen", "(Ljava/lang/String;Ljava/lang/String;)J", (void*)nativeGamepadOpen},
|
|
{"nativeClose", "(J)V", (void*)nativeClose},
|