Picks + Churn

Signed-off-by: Tad <tad@spotco.us>
2025-02-02 18:34:46 -05:00 · 2022-10-06 15:02:52 -04:00 · 2022-10-06 15:02:52 -04:00 · e7968e1269
commit e7968e1269
parent 4230652540
21 changed files with 269 additions and 183 deletions
--- a/Patches/LineageOS-14.1/android_external_libnfc-nci/341071.patch
+++ b/Patches/LineageOS-14.1/android_external_libnfc-nci/341071.patch
@ -0,0 +1,37 @@
+From 142a4f4670c6c3280ed56f8ae643b02b12f0030e Mon Sep 17 00:00:00 2001
+From: Alisher Alikhodjaev <alisher@google.com>
+Date: Tue, 2 Aug 2022 13:32:30 -0700
+Subject: [PATCH] The length of a packet should be non-zero
+
+Bug: 221856662
+Bug: 237079835
+Test: no functional changes, the build is ok
+Change-Id: I6defe4025c962ae7dde2e673e2bfcfc15785cc12
+(cherry picked from commit 396ac0e081ae67a1d743e0373257ec869692912c)
+Merged-In: I6defe4025c962ae7dde2e673e2bfcfc15785cc12
+[basilgello: Backport to LineageOS 14.1: adjust context]
+Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
+---
+ src/nfc/nfc/nfc_ncif.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/nfc/nfc/nfc_ncif.c b/src/nfc/nfc/nfc_ncif.c
+index dd89d46..3f67d86 100644
+--- a/src/nfc/nfc/nfc_ncif.c
+++ b/src/nfc/nfc/nfc_ncif.c
+@@ -1135,13 +1135,14 @@ void nfc_ncif_proc_ee_discover_req (UINT8 *p, UINT16 plen)
+     tNFC_EE_DISCOVER_INFO       *p_info;
+     UINT8                       u8;
+ 
+-    NFC_TRACE_DEBUG2 ("nfc_ncif_proc_ee_discover_req %d len:%d", *p, plen);
+     if (!plen)
+     {
+         android_errorWriteLog(0x534e4554, "221856662");
+         return;
+     }
+ 
+    NFC_TRACE_DEBUG2 ("nfc_ncif_proc_ee_discover_req %d len:%d", *p, plen);
+
+     if (p_cback)
+     {
+         u8  = *p;
--- a/Patches/LineageOS-14.1/android_system_bt/341070.patch
+++ b/Patches/LineageOS-14.1/android_system_bt/341070.patch
@ -0,0 +1,49 @@
+From 3adbba6cba5251cb939612c21225f888c961d3c8 Mon Sep 17 00:00:00 2001
+From: Ted Wang <tedwang@google.com>
+Date: Fri, 1 Apr 2022 11:22:34 +0800
+Subject: [PATCH] Fix potential interger overflow when parsing vendor response
+
+Add check for str_len to prevent potential OOB read in vendor response.
+
+Bug: 205570663
+Tag: #security
+Test: net_test_stack:StackAvrcpTest
+Ignore-AOSP-First: Security
+Change-Id: Iea2c3e17c2c8cc56468c4456822e1c4c5c15f5bc
+Merged-In: Iea2c3e17c2c8cc56468c4456822e1c4c5c15f5bc
+(cherry picked from commit 96ef1fc9cbe38f1224b4e4a2dca3ecfb44a6aece)
+Merged-In: Iea2c3e17c2c8cc56468c4456822e1c4c5c15f5bc
+[basilgello: Backport to LineageOS 14.1: only AVRC_PDU_GET_ELEMENT_ATTR
+ is present in the affected logic]
+Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
+---
+ stack/avrc/avrc_pars_ct.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/stack/avrc/avrc_pars_ct.c b/stack/avrc/avrc_pars_ct.c
+index cff7bffbe9..88f83066e6 100644
+--- a/stack/avrc/avrc_pars_ct.c
+++ b/stack/avrc/avrc_pars_ct.c
+@@ -531,8 +531,12 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp(
+                 BE_STREAM_TO_UINT32(p_attrs[i].attr_id, p);
+                 BE_STREAM_TO_UINT16(p_attrs[i].name.charset_id, p);
+                 BE_STREAM_TO_UINT16(p_attrs[i].name.str_len, p);
+-                min_len += p_attrs[i].name.str_len;
+-                if (len < min_len)
+                if ((UINT16)(min_len + p_attrs[i].name.str_len) <
+                    min_len) {
+                   // Check for overflow
+                   android_errorWriteLog(0x534e4554, "205570663");
+                }
+                if (len - min_len < p_attrs[i].name.str_len)
+                 {
+                    for (int j = 0; j < i; j++)
+                    {
+@@ -542,6 +546,7 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp(
+                    p_result->get_attrs.num_attrs = 0;
+                    goto length_error;
+                 }
+                min_len += p_attrs[i].name.str_len;
+                 if (p_attrs[i].name.str_len > 0)
+                 {
+                     p_attrs[i].name.p_str = (UINT8 *)osi_calloc(p_attrs[i].name.str_len);
--- a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-11.patch
+++ b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-11.patch
@ -16,10 +16,10 @@ Zygote-based spawning never calls IPCThreadState::stopProcess().
 1 file changed, 4 insertions(+), 2 deletions(-)

 diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp
-index 12083b6fe20b..4ca8b1e18431 100644
+index 1671337511b7..007783d7853e 100644
 --- a/cmds/app_process/app_main.cpp
 +++ b/cmds/app_process/app_main.cpp
-@@ -85,8 +85,10 @@ public:
+@@ -84,8 +84,10 @@ public:
         AndroidRuntime* ar = AndroidRuntime::getRuntime();
         ar->callMain(mClassName, mClass, mArgs);
 
--- a/Patches/LineageOS-16.0/android_libcore/0001-Network_Permission.patch
+++ b/Patches/LineageOS-16.0/android_libcore/0001-Network_Permission.patch
@ -9,7 +9,7 @@ Subject: [PATCH] don't throw SecurityException when INTERNET permission is
 1 file changed, 1 insertion(+), 9 deletions(-)

 diff --git a/ojluni/src/main/java/java/net/Inet6AddressImpl.java b/ojluni/src/main/java/java/net/Inet6AddressImpl.java
-index 1edfe344ce..2176973b44 100644
+index 1edfe344cea..2176973b445 100644
 --- a/ojluni/src/main/java/java/net/Inet6AddressImpl.java
 +++ b/ojluni/src/main/java/java/net/Inet6AddressImpl.java
@@ -143,15 +143,7 @@ class Inet6AddressImpl implements InetAddressImpl {
--- a/Patches/LineageOS-16.0/android_libcore/0002-constify_JNINativeMethod.patch
+++ b/Patches/LineageOS-16.0/android_libcore/0002-constify_JNINativeMethod.patch
@ -64,7 +64,7 @@ Subject: [PATCH] constify JNINativeMethod tables
 57 files changed, 62 insertions(+), 62 deletions(-)

 diff --git a/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp b/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp
-index f3c552f880..b0955bb794 100644
+index f3c552f8809..b0955bb794c 100644
 --- a/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp
 +++ b/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp
@@ -22,7 +22,7 @@
@ -104,7 +104,7 @@ index f3c552f880..b0955bb794 100644
     NATIVE_METHOD(NativeTestTarget, emptyJniStaticMethod6_Critical, "(IIIIII)V"),
 };
 diff --git a/luni/src/main/native/android_system_OsConstants.cpp b/luni/src/main/native/android_system_OsConstants.cpp
-index e373a12653..e612df2174 100644
+index e373a126534..e612df21744 100644
 --- a/luni/src/main/native/android_system_OsConstants.cpp
 +++ b/luni/src/main/native/android_system_OsConstants.cpp
@@ -700,7 +700,7 @@ static void OsConstants_initConstants(JNIEnv* env, jclass c) {
@ -117,7 +117,7 @@ index e373a12653..e612df2174 100644
 };
 void register_android_system_OsConstants(JNIEnv* env) {
 diff --git a/luni/src/main/native/java_lang_StringToReal.cpp b/luni/src/main/native/java_lang_StringToReal.cpp
-index 7f368b15f6..c4f8855677 100644
+index 7f368b15f6e..c4f88556777 100644
 --- a/luni/src/main/native/java_lang_StringToReal.cpp
 +++ b/luni/src/main/native/java_lang_StringToReal.cpp
@@ -889,7 +889,7 @@ static jdouble StringToReal_parseDblImpl(JNIEnv* env, jclass, jstring s, jint e)
@ -130,7 +130,7 @@ index 7f368b15f6..c4f8855677 100644
     NATIVE_METHOD(StringToReal, parseDblImpl, "(Ljava/lang/String;I)D"),
 };
 diff --git a/luni/src/main/native/java_lang_invoke_MethodHandle.cpp b/luni/src/main/native/java_lang_invoke_MethodHandle.cpp
-index 4574f59636..a9c3c910a1 100644
+index 4574f59636a..a9c3c910a1c 100644
 --- a/luni/src/main/native/java_lang_invoke_MethodHandle.cpp
 +++ b/luni/src/main/native/java_lang_invoke_MethodHandle.cpp
@@ -27,7 +27,7 @@ static void MethodHandle_invoke(JNIEnv* env, jobject, jobjectArray) {
@ -143,7 +143,7 @@ index 4574f59636..a9c3c910a1 100644
     NATIVE_METHOD(MethodHandle, invoke, "([Ljava/lang/Object;)Ljava/lang/Object;"),
 };
 diff --git a/luni/src/main/native/java_lang_invoke_VarHandle.cpp b/luni/src/main/native/java_lang_invoke_VarHandle.cpp
-index 46ea8ff8a3..794d16e5ab 100644
+index 46ea8ff8a32..794d16e5ab1 100644
 --- a/luni/src/main/native/java_lang_invoke_VarHandle.cpp
 +++ b/luni/src/main/native/java_lang_invoke_VarHandle.cpp
@@ -193,7 +193,7 @@ static void VarHandle_weakCompareAndSetRelease(JNIEnv* env, jobject, jobjectArra
@ -156,7 +156,7 @@ index 46ea8ff8a3..794d16e5ab 100644
   NATIVE_METHOD(VarHandle, compareAndExchangeAcquire, kVarHandleObjectSignature),
   NATIVE_METHOD(VarHandle, compareAndExchangeRelease, kVarHandleObjectSignature),
 diff --git a/luni/src/main/native/java_math_NativeBN.cpp b/luni/src/main/native/java_math_NativeBN.cpp
-index 066f77e4ab..6c9d869f8d 100644
+index 066f77e4abd..6c9d869f8d3 100644
 --- a/luni/src/main/native/java_math_NativeBN.cpp
 +++ b/luni/src/main/native/java_math_NativeBN.cpp
@@ -524,7 +524,7 @@ static jboolean NativeBN_BN_primality_test(JNIEnv* env, jclass, jlong candidate,
@ -169,7 +169,7 @@ index 066f77e4ab..6c9d869f8d 100644
    NATIVE_METHOD(NativeBN, BN_add_word, "(JI)V"),
    NATIVE_METHOD(NativeBN, BN_bin2bn, "([BIZJ)V"),
 diff --git a/luni/src/main/native/java_util_regex_Matcher.cpp b/luni/src/main/native/java_util_regex_Matcher.cpp
-index 11af4bd610..b3515ae27b 100644
+index 11af4bd6104..b3515ae27b6 100644
 --- a/luni/src/main/native/java_util_regex_Matcher.cpp
 +++ b/luni/src/main/native/java_util_regex_Matcher.cpp
@@ -260,7 +260,7 @@ static jint Matcher_getMatchedGroupIndex0(JNIEnv* env, jclass, jlong patternAddr
@ -182,7 +182,7 @@ index 11af4bd610..b3515ae27b 100644
     NATIVE_METHOD(Matcher, findImpl, "(JI[I)Z"),
     NATIVE_METHOD(Matcher, findNextImpl, "(J[I)Z"),
 diff --git a/luni/src/main/native/java_util_regex_Pattern.cpp b/luni/src/main/native/java_util_regex_Pattern.cpp
-index f4d23cb77d..b436606fe7 100644
+index f4d23cb77de..b436606fe72 100644
 --- a/luni/src/main/native/java_util_regex_Pattern.cpp
 +++ b/luni/src/main/native/java_util_regex_Pattern.cpp
@@ -100,7 +100,7 @@ static jlong Pattern_compileImpl(JNIEnv* env, jclass, jstring javaRegex, jint fl
@ -195,7 +195,7 @@ index f4d23cb77d..b436606fe7 100644
     NATIVE_METHOD(Pattern, getNativeFinalizer, "()J"),
     NATIVE_METHOD(Pattern, nativeSize, "()I"),
 diff --git a/luni/src/main/native/libcore_icu_ICU.cpp b/luni/src/main/native/libcore_icu_ICU.cpp
-index 48f1ba28cd..b97d5d6d0b 100644
+index 48f1ba28cdb..b97d5d6d0b2 100644
 --- a/luni/src/main/native/libcore_icu_ICU.cpp
 +++ b/luni/src/main/native/libcore_icu_ICU.cpp
@@ -806,7 +806,7 @@ static jstring ICU_getDefaultLocale(JNIEnv* env, jclass) {
@ -208,7 +208,7 @@ index 48f1ba28cd..b97d5d6d0b 100644
     NATIVE_METHOD(ICU, getAvailableBreakIteratorLocalesNative, "()[Ljava/lang/String;"),
     NATIVE_METHOD(ICU, getAvailableCalendarLocalesNative, "()[Ljava/lang/String;"),
 diff --git a/luni/src/main/native/libcore_icu_NativeConverter.cpp b/luni/src/main/native/libcore_icu_NativeConverter.cpp
-index b98c79c474..31a01d5508 100644
+index b98c79c474e..31a01d5508c 100644
 --- a/luni/src/main/native/libcore_icu_NativeConverter.cpp
 +++ b/luni/src/main/native/libcore_icu_NativeConverter.cpp
@@ -675,7 +675,7 @@ static jlong NativeConverter_getNativeSize(JNIEnv*, jclass, jstring) {
@ -221,7 +221,7 @@ index b98c79c474..31a01d5508 100644
     NATIVE_METHOD(NativeConverter, closeConverter, "(J)V"),
     NATIVE_METHOD(NativeConverter, contains, "(Ljava/lang/String;Ljava/lang/String;)Z"),
 diff --git a/luni/src/main/native/libcore_icu_TimeZoneNames.cpp b/luni/src/main/native/libcore_icu_TimeZoneNames.cpp
-index cea595d888..13027f8d4c 100644
+index cea595d8888..13027f8d4c0 100644
 --- a/luni/src/main/native/libcore_icu_TimeZoneNames.cpp
 +++ b/luni/src/main/native/libcore_icu_TimeZoneNames.cpp
@@ -97,7 +97,7 @@ static void TimeZoneNames_fillZoneStrings(JNIEnv* env, jclass, jstring javaLocal
@ -234,7 +234,7 @@ index cea595d888..13027f8d4c 100644
 };
 void register_libcore_icu_TimeZoneNames(JNIEnv* env) {
 diff --git a/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp b/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp
-index bf2d3a8772..1f25262588 100644
+index bf2d3a8772e..1f252625887 100644
 --- a/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp
 +++ b/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp
@@ -27,7 +27,7 @@ static void AsynchronousCloseMonitor_signalBlockedThreads(JNIEnv* env, jclass, j
@ -247,7 +247,7 @@ index bf2d3a8772..1f25262588 100644
 };
 void register_libcore_io_AsynchronousCloseMonitor(JNIEnv* env) {
 diff --git a/luni/src/main/native/libcore_io_Linux.cpp b/luni/src/main/native/libcore_io_Linux.cpp
-index 30da35c2c0..67d17e70ec 100644
+index 30da35c2c0c..67d17e70ecc 100644
 --- a/luni/src/main/native/libcore_io_Linux.cpp
 +++ b/luni/src/main/native/libcore_io_Linux.cpp
@@ -2464,7 +2464,7 @@ static jint Linux_writev(JNIEnv* env, jobject, jobject javaFd, jobjectArray buff
@ -260,7 +260,7 @@ index 30da35c2c0..67d17e70ec 100644
     NATIVE_METHOD(Linux, access, "(Ljava/lang/String;I)Z"),
     NATIVE_METHOD(Linux, android_getaddrinfo, "(Ljava/lang/String;Landroid/system/StructAddrinfo;I)[Ljava/net/InetAddress;"),
 diff --git a/luni/src/main/native/libcore_io_Memory.cpp b/luni/src/main/native/libcore_io_Memory.cpp
-index 5f50751d22..b96ee532f3 100644
+index 5f50751d22a..b96ee532f32 100644
 --- a/luni/src/main/native/libcore_io_Memory.cpp
 +++ b/luni/src/main/native/libcore_io_Memory.cpp
@@ -289,7 +289,7 @@ static void Memory_unsafeBulkPut(JNIEnv* env, jclass, jbyteArray dstArray, jint
@ -273,7 +273,7 @@ index 5f50751d22..b96ee532f3 100644
     FAST_NATIVE_METHOD(Memory, peekByte, "(J)B"),
     NATIVE_METHOD(Memory, peekByteArray, "(J[BII)V"),
 diff --git a/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp b/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp
-index 59bed741c4..f55c15eca4 100644
+index 59bed741c4f..f55c15eca4c 100644
 --- a/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp
 +++ b/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp
@@ -28,7 +28,7 @@ static void NativeAllocationRegistry_applyFreeFunction(JNIEnv*,
@ -286,7 +286,7 @@ index 59bed741c4..f55c15eca4 100644
 };
 
 diff --git a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
-index 22496bf7a1..cf86957a7b 100644
+index 22496bf7a18..cf86957a7ba 100644
 --- a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
 +++ b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
@@ -1353,7 +1353,7 @@ static void ExpatParser_staticInitialize(JNIEnv* env, jobject classObject, jstri
@ -308,7 +308,7 @@ index 22496bf7a1..cf86957a7b 100644
     NATIVE_METHOD(ExpatAttributes, getIndexForQName, "(JLjava/lang/String;)I"),
     NATIVE_METHOD(ExpatAttributes, getIndex, "(JLjava/lang/String;Ljava/lang/String;)I"),
 diff --git a/luni/src/main/native/sun_misc_Unsafe.cpp b/luni/src/main/native/sun_misc_Unsafe.cpp
-index 67925b0847..482e2ada4b 100644
+index 67925b08473..482e2ada4bb 100644
 --- a/luni/src/main/native/sun_misc_Unsafe.cpp
 +++ b/luni/src/main/native/sun_misc_Unsafe.cpp
@@ -23,7 +23,7 @@ static jobject Unsafe_allocateInstance(JNIEnv* env, jclass, jclass c) {
@ -321,7 +321,7 @@ index 67925b0847..482e2ada4b 100644
 };
 void register_sun_misc_Unsafe(JNIEnv* env) {
 diff --git a/ojluni/src/main/native/Adler32.c b/ojluni/src/main/native/Adler32.c
-index 11ef08d4c9..849df61067 100644
+index 11ef08d4c98..849df610674 100644
 --- a/ojluni/src/main/native/Adler32.c
 +++ b/ojluni/src/main/native/Adler32.c
@@ -70,7 +70,7 @@ Java_java_util_zip_Adler32_updateByteBuffer(JNIEnv *env, jclass cls, jint adler,
@ -334,7 +334,7 @@ index 11ef08d4c9..849df61067 100644
   NATIVE_METHOD(Adler32, updateBytes, "(I[BII)I"),
   NATIVE_METHOD(Adler32, updateByteBuffer, "(IJII)I"),
 diff --git a/ojluni/src/main/native/Bits.c b/ojluni/src/main/native/Bits.c
-index 50caf36e81..c0b0c91d20 100644
+index 50caf36e818..c0b0c91d201 100644
 --- a/ojluni/src/main/native/Bits.c
 +++ b/ojluni/src/main/native/Bits.c
@@ -282,7 +282,7 @@ Java_java_nio_Bits_copyToLongArray(JNIEnv *env, jobject this, jlong srcAddr,
@ -347,7 +347,7 @@ index 50caf36e81..c0b0c91d20 100644
     NATIVE_METHOD(Bits, copyToShortArray, "(JLjava/lang/Object;JJ)V"),
     NATIVE_METHOD(Bits, copyFromIntArray, "(Ljava/lang/Object;JJJ)V"),
 diff --git a/ojluni/src/main/native/Character.cpp b/ojluni/src/main/native/Character.cpp
-index 666184f816..9f6ec2e960 100644
+index 666184f8161..9f6ec2e9602 100644
 --- a/ojluni/src/main/native/Character.cpp
 +++ b/ojluni/src/main/native/Character.cpp
@@ -158,7 +158,7 @@ Character_getNameImpl(JNIEnv* env, jclass, jint codePoint) {
@ -360,7 +360,7 @@ index 666184f816..9f6ec2e960 100644
   FAST_NATIVE_METHOD(Character, getDirectionalityImpl, "(I)B"),
   NATIVE_METHOD(Character, getNameImpl, "(I)Ljava/lang/String;"),
 diff --git a/ojluni/src/main/native/Console_md.c b/ojluni/src/main/native/Console_md.c
-index 13437be314..f87bd168b1 100644
+index 13437be314e..f87bd168b1a 100644
 --- a/ojluni/src/main/native/Console_md.c
 +++ b/ojluni/src/main/native/Console_md.c
@@ -72,7 +72,7 @@ Java_java_io_Console_echo(JNIEnv *env,
@ -373,7 +373,7 @@ index 13437be314..f87bd168b1 100644
     NATIVE_METHOD(Console, encoding, "()Ljava/lang/String;"),
     NATIVE_METHOD(Console, echo, "(Z)Z"),
 diff --git a/ojluni/src/main/native/DatagramChannelImpl.c b/ojluni/src/main/native/DatagramChannelImpl.c
-index 925064f404..835b9f01c3 100644
+index 925064f404e..835b9f01c35 100644
 --- a/ojluni/src/main/native/DatagramChannelImpl.c
 +++ b/ojluni/src/main/native/DatagramChannelImpl.c
@@ -274,7 +274,7 @@ Java_sun_nio_ch_DatagramChannelImpl_send0(JNIEnv *env, jobject this,
@ -386,7 +386,7 @@ index 925064f404..835b9f01c3 100644
   NATIVE_METHOD(DatagramChannelImpl, disconnect0, "(Ljava/io/FileDescriptor;Z)V"),
   NATIVE_METHOD(DatagramChannelImpl, receive0, "(Ljava/io/FileDescriptor;JIZ)I"),
 diff --git a/ojluni/src/main/native/DatagramDispatcher.c b/ojluni/src/main/native/DatagramDispatcher.c
-index 36cc6cf4bc..39ff924179 100644
+index 36cc6cf4bc1..39ff9241791 100644
 --- a/ojluni/src/main/native/DatagramDispatcher.c
 +++ b/ojluni/src/main/native/DatagramDispatcher.c
@@ -139,7 +139,7 @@ Java_sun_nio_ch_DatagramDispatcher_writev0(JNIEnv *env, jclass clazz,
@ -399,7 +399,7 @@ index 36cc6cf4bc..39ff924179 100644
   NATIVE_METHOD(DatagramDispatcher, readv0, "(Ljava/io/FileDescriptor;JI)J"),
   NATIVE_METHOD(DatagramDispatcher, write0, "(Ljava/io/FileDescriptor;JI)I"),
 diff --git a/ojluni/src/main/native/Double.c b/ojluni/src/main/native/Double.c
-index 8382b88994..2bcb97a653 100644
+index 8382b889945..2bcb97a653f 100644
 --- a/ojluni/src/main/native/Double.c
 +++ b/ojluni/src/main/native/Double.c
@@ -63,7 +63,7 @@ Double_doubleToRawLongBits(JNIEnv *env, jclass unused, jdouble v)
@ -412,7 +412,7 @@ index 8382b88994..2bcb97a653 100644
   NATIVE_METHOD(Double, doubleToRawLongBits, "(D)J"),
 };
 diff --git a/ojluni/src/main/native/FileChannelImpl.c b/ojluni/src/main/native/FileChannelImpl.c
-index 5b428e9866..bf0be0bf73 100644
+index 5b428e98661..bf0be0bf738 100644
 --- a/ojluni/src/main/native/FileChannelImpl.c
 +++ b/ojluni/src/main/native/FileChannelImpl.c
@@ -279,7 +279,7 @@ FileChannelImpl_transferTo0(JNIEnv *env, jobject this,
@ -425,7 +425,7 @@ index 5b428e9866..bf0be0bf73 100644
   NATIVE_METHOD(FileChannelImpl, map0, "(IJJ)J"),
   NATIVE_METHOD(FileChannelImpl, unmap0, "(JJ)I"),
 diff --git a/ojluni/src/main/native/FileDescriptor_md.c b/ojluni/src/main/native/FileDescriptor_md.c
-index 0404263787..a00d799045 100644
+index 04042637876..a00d7990459 100644
 --- a/ojluni/src/main/native/FileDescriptor_md.c
 +++ b/ojluni/src/main/native/FileDescriptor_md.c
@@ -68,7 +68,7 @@ JNIEXPORT jboolean JNICALL FileDescriptor_isSocket(JNIEnv *env, jclass ignored,
@ -438,7 +438,7 @@ index 0404263787..a00d799045 100644
   NATIVE_METHOD(FileDescriptor, isSocket, "(I)Z"),
 };
 diff --git a/ojluni/src/main/native/FileDispatcherImpl.c b/ojluni/src/main/native/FileDispatcherImpl.c
-index 5a49a601ad..0113690d7a 100644
+index 5a49a601ad5..0113690d7af 100644
 --- a/ojluni/src/main/native/FileDispatcherImpl.c
 +++ b/ojluni/src/main/native/FileDispatcherImpl.c
@@ -285,7 +285,7 @@ FileDispatcherImpl_closeIntFD(JNIEnv *env, jclass clazz, jint fd)
@ -451,7 +451,7 @@ index 5a49a601ad..0113690d7a 100644
   NATIVE_METHOD(FileDispatcherImpl, preClose0, "(Ljava/io/FileDescriptor;)V"),
   NATIVE_METHOD(FileDispatcherImpl, close0, "(Ljava/io/FileDescriptor;)V"),
 diff --git a/ojluni/src/main/native/FileInputStream.c b/ojluni/src/main/native/FileInputStream.c
-index 2418c5da27..6fd86d5010 100644
+index 2418c5da273..6fd86d5010c 100644
 --- a/ojluni/src/main/native/FileInputStream.c
 +++ b/ojluni/src/main/native/FileInputStream.c
@@ -132,7 +132,7 @@ FileInputStream_available0(JNIEnv *env, jobject this) {
@ -464,7 +464,7 @@ index 2418c5da27..6fd86d5010 100644
   NATIVE_METHOD(FileInputStream, skip0, "(J)J"),
   NATIVE_METHOD(FileInputStream, available0, "()I"),
 diff --git a/ojluni/src/main/native/FileKey.c b/ojluni/src/main/native/FileKey.c
-index b28fb564a2..4688bb3c65 100644
+index b28fb564a22..4688bb3c658 100644
 --- a/ojluni/src/main/native/FileKey.c
 +++ b/ojluni/src/main/native/FileKey.c
@@ -66,7 +66,7 @@ FileKey_init(JNIEnv *env, jobject this, jobject fdo)
@ -477,7 +477,7 @@ index b28fb564a2..4688bb3c65 100644
 };
 
 diff --git a/ojluni/src/main/native/FileOutputStream_md.c b/ojluni/src/main/native/FileOutputStream_md.c
-index 73218d482e..5bac6129ef 100644
+index 73218d482e1..5bac6129ef7 100644
 --- a/ojluni/src/main/native/FileOutputStream_md.c
 +++ b/ojluni/src/main/native/FileOutputStream_md.c
@@ -58,7 +58,7 @@ FileOutputStream_open0(JNIEnv *env, jobject this,
@ -490,7 +490,7 @@ index 73218d482e..5bac6129ef 100644
 };
 
 diff --git a/ojluni/src/main/native/FileSystemPreferences.c b/ojluni/src/main/native/FileSystemPreferences.c
-index 8ab516a7db..5af1980f44 100644
+index 8ab516a7db3..5af1980f44b 100644
 --- a/ojluni/src/main/native/FileSystemPreferences.c
 +++ b/ojluni/src/main/native/FileSystemPreferences.c
@@ -145,7 +145,7 @@ Java_java_util_prefs_FileSystemPreferences_unlockFile0(JNIEnv *env,
@ -503,7 +503,7 @@ index 8ab516a7db..5af1980f44 100644
     NATIVE_METHOD(FileSystemPreferences, unlockFile0, "(I)I"),
     NATIVE_METHOD(FileSystemPreferences, chmod, "(Ljava/lang/String;I)I"),
 diff --git a/ojluni/src/main/native/Float.c b/ojluni/src/main/native/Float.c
-index 956048d6b8..5bfdf58245 100644
+index 956048d6b8e..5bfdf58245d 100644
 --- a/ojluni/src/main/native/Float.c
 +++ b/ojluni/src/main/native/Float.c
@@ -59,7 +59,7 @@ Float_floatToRawIntBits(JNIEnv *env, jclass unused, jfloat v)
@ -516,7 +516,7 @@ index 956048d6b8..5bfdf58245 100644
   NATIVE_METHOD(Float, floatToRawIntBits, "(F)I"),
 };
 diff --git a/ojluni/src/main/native/IOUtil.c b/ojluni/src/main/native/IOUtil.c
-index 05949dab16..2ccb8795e4 100644
+index 05949dab164..2ccb8795e4a 100644
 --- a/ojluni/src/main/native/IOUtil.c
 +++ b/ojluni/src/main/native/IOUtil.c
@@ -206,7 +206,7 @@ fdval(JNIEnv *env, jobject fdo)
@ -529,7 +529,7 @@ index 05949dab16..2ccb8795e4 100644
   NATIVE_METHOD(IOUtil, fdLimit, "()I"),
   NATIVE_METHOD(IOUtil, drain, "(I)Z"),
 diff --git a/ojluni/src/main/native/MappedByteBuffer.c b/ojluni/src/main/native/MappedByteBuffer.c
-index a5b0b046cd..555f64227e 100644
+index a5b0b046cdb..555f64227e0 100644
 --- a/ojluni/src/main/native/MappedByteBuffer.c
 +++ b/ojluni/src/main/native/MappedByteBuffer.c
@@ -97,7 +97,7 @@ Java_java_nio_MappedByteBuffer_force0(JNIEnv *env, jobject obj, jobject fdo,
@ -542,7 +542,7 @@ index a5b0b046cd..555f64227e 100644
   NATIVE_METHOD(MappedByteBuffer, load0, "(JJ)V"),
   NATIVE_METHOD(MappedByteBuffer, force0, "(Ljava/io/FileDescriptor;JJ)V"),
 diff --git a/ojluni/src/main/native/Math.c b/ojluni/src/main/native/Math.c
-index 64f361ae16..d4727fe246 100644
+index 64f361ae16e..d4727fe246e 100644
 --- a/ojluni/src/main/native/Math.c
 +++ b/ojluni/src/main/native/Math.c
@@ -140,7 +140,7 @@ Math_rint(jdouble d) {
@ -555,7 +555,7 @@ index 64f361ae16..d4727fe246 100644
   FAST_NATIVE_METHOD(Math, acos, "(D)D"),
   FAST_NATIVE_METHOD(Math, asin, "(D)D"),
 diff --git a/ojluni/src/main/native/NativeThread.c b/ojluni/src/main/native/NativeThread.c
-index 3a1c5c1b9a..1e225368af 100644
+index 3a1c5c1b9a4..1e225368af4 100644
 --- a/ojluni/src/main/native/NativeThread.c
 +++ b/ojluni/src/main/native/NativeThread.c
@@ -101,7 +101,7 @@ NativeThread_signal(JNIEnv *env, jclass cl, jlong thread)
@ -568,7 +568,7 @@ index 3a1c5c1b9a..1e225368af 100644
   NATIVE_METHOD(NativeThread, signal, "(J)V"),
 };
 diff --git a/ojluni/src/main/native/Net.c b/ojluni/src/main/native/Net.c
-index 462830dab4..8a14e3c5b2 100644
+index 462830dab46..8a14e3c5b2c 100644
 --- a/ojluni/src/main/native/Net.c
 +++ b/ojluni/src/main/native/Net.c
@@ -850,7 +850,7 @@ handleSocketError(JNIEnv *env, jint errorValue) {
@ -581,7 +581,7 @@ index 462830dab4..8a14e3c5b2 100644
   NATIVE_METHOD(Net, isExclusiveBindAvailable, "()I"),
   NATIVE_METHOD(Net, canIPv6SocketJoinIPv4Group0, "()Z"),
 diff --git a/ojluni/src/main/native/ObjectInputStream.c b/ojluni/src/main/native/ObjectInputStream.c
-index 6f65dca5a5..6ba47e31dc 100644
+index 6f65dca5a56..6ba47e31dc1 100644
 --- a/ojluni/src/main/native/ObjectInputStream.c
 +++ b/ojluni/src/main/native/ObjectInputStream.c
@@ -175,7 +175,7 @@ Java_java_io_ObjectInputStream_bytesToDoubles(JNIEnv *env,
@ -594,7 +594,7 @@ index 6f65dca5a5..6ba47e31dc 100644
     NATIVE_METHOD(ObjectInputStream, bytesToDoubles, "([BI[DII)V"),
 };
 diff --git a/ojluni/src/main/native/ObjectOutputStream.c b/ojluni/src/main/native/ObjectOutputStream.c
-index 169a83f3f8..0e1479d6df 100644
+index 169a83f3f8d..0e1479d6df9 100644
 --- a/ojluni/src/main/native/ObjectOutputStream.c
 +++ b/ojluni/src/main/native/ObjectOutputStream.c
@@ -184,7 +184,7 @@ Java_java_io_ObjectOutputStream_doublesToBytes(JNIEnv *env,
@ -607,7 +607,7 @@ index 169a83f3f8..0e1479d6df 100644
     NATIVE_METHOD(ObjectOutputStream, doublesToBytes, "([DI[BII)V"),
 };
 diff --git a/ojluni/src/main/native/ObjectStreamClass.c b/ojluni/src/main/native/ObjectStreamClass.c
-index 95cd4f0247..6e97d293f4 100644
+index 95cd4f0247b..6e97d293f40 100644
 --- a/ojluni/src/main/native/ObjectStreamClass.c
 +++ b/ojluni/src/main/native/ObjectStreamClass.c
@@ -100,7 +100,7 @@ ObjectStreamClass_hasStaticInitializer(JNIEnv *env, jclass this,
@ -620,7 +620,7 @@ index 95cd4f0247..6e97d293f4 100644
 };
 
 diff --git a/ojluni/src/main/native/ProcessEnvironment_md.c b/ojluni/src/main/native/ProcessEnvironment_md.c
-index a59410badc..a3f46a4d4f 100644
+index a59410badc2..a3f46a4d4fd 100644
 --- a/ojluni/src/main/native/ProcessEnvironment_md.c
 +++ b/ojluni/src/main/native/ProcessEnvironment_md.c
@@ -91,7 +91,7 @@ ProcessEnvironment_environ(JNIEnv *env, jclass ign)
@ -633,7 +633,7 @@ index a59410badc..a3f46a4d4f 100644
 };
 
 diff --git a/ojluni/src/main/native/Runtime.c b/ojluni/src/main/native/Runtime.c
-index 4c023b520e..e2fa8f7950 100644
+index 4c023b520e2..e2fa8f79503 100644
 --- a/ojluni/src/main/native/Runtime.c
 +++ b/ojluni/src/main/native/Runtime.c
@@ -80,7 +80,7 @@ Runtime_nativeLoad(JNIEnv* env, jclass ignored, jstring javaFilename,
@ -646,7 +646,7 @@ index 4c023b520e..e2fa8f7950 100644
   FAST_NATIVE_METHOD(Runtime, totalMemory, "()J"),
   FAST_NATIVE_METHOD(Runtime, maxMemory, "()J"),
 diff --git a/ojluni/src/main/native/ServerSocketChannelImpl.c b/ojluni/src/main/native/ServerSocketChannelImpl.c
-index 679811f96a..83a94f9b8e 100644
+index 679811f96ae..83a94f9b8e3 100644
 --- a/ojluni/src/main/native/ServerSocketChannelImpl.c
 +++ b/ojluni/src/main/native/ServerSocketChannelImpl.c
@@ -137,7 +137,7 @@ Java_sun_nio_ch_ServerSocketChannelImpl_accept0(JNIEnv *env, jobject this,
@ -659,7 +659,7 @@ index 679811f96a..83a94f9b8e 100644
   NATIVE_METHOD(Java_sun_nio_ch_ServerSocketChannelImpl, accept0,
                 "(Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;[Ljava/net/InetSocketAddress;)I"),
 diff --git a/ojluni/src/main/native/SocketChannelImpl.c b/ojluni/src/main/native/SocketChannelImpl.c
-index 94291659cf..9e54369054 100644
+index 94291659cf9..9e543690544 100644
 --- a/ojluni/src/main/native/SocketChannelImpl.c
 +++ b/ojluni/src/main/native/SocketChannelImpl.c
@@ -96,7 +96,7 @@ Java_sun_nio_ch_SocketChannelImpl_sendOutOfBandData(JNIEnv* env, jclass this,
@ -672,7 +672,7 @@ index 94291659cf..9e54369054 100644
   NATIVE_METHOD(SocketChannelImpl, sendOutOfBandData, "(Ljava/io/FileDescriptor;B)I"),
 };
 diff --git a/ojluni/src/main/native/SocketInputStream.c b/ojluni/src/main/native/SocketInputStream.c
-index dcea334fd1..aa10f4e9c1 100644
+index dcea334fd1f..aa10f4e9c1a 100644
 --- a/ojluni/src/main/native/SocketInputStream.c
 +++ b/ojluni/src/main/native/SocketInputStream.c
@@ -153,7 +153,7 @@ SocketInputStream_socketRead0(JNIEnv *env, jobject this,
@ -685,7 +685,7 @@ index dcea334fd1..aa10f4e9c1 100644
 };
 
 diff --git a/ojluni/src/main/native/SocketOutputStream.c b/ojluni/src/main/native/SocketOutputStream.c
-index bc3522bee3..d72fd1108b 100644
+index bc3522bee35..d72fd1108ba 100644
 --- a/ojluni/src/main/native/SocketOutputStream.c
 +++ b/ojluni/src/main/native/SocketOutputStream.c
@@ -128,7 +128,7 @@ SocketOutputStream_socketWrite0(JNIEnv *env, jobject this,
@ -698,7 +698,7 @@ index bc3522bee3..d72fd1108b 100644
 };
 
 diff --git a/ojluni/src/main/native/StrictMath.c b/ojluni/src/main/native/StrictMath.c
-index 7f9bbebcdf..24b29228a4 100644
+index 7f9bbebcdf7..24b29228a46 100644
 --- a/ojluni/src/main/native/StrictMath.c
 +++ b/ojluni/src/main/native/StrictMath.c
@@ -156,7 +156,7 @@ StrictMath_expm1(JNIEnv *env, jclass unused, jdouble d)
@ -711,7 +711,7 @@ index 7f9bbebcdf..24b29228a4 100644
   NATIVE_METHOD(StrictMath, sin, "(D)D"),
   NATIVE_METHOD(StrictMath, tan, "(D)D"),
 diff --git a/ojluni/src/main/native/String.c b/ojluni/src/main/native/String.c
-index 011089de08..da24b3c805 100644
+index 011089de083..da24b3c8055 100644
 --- a/ojluni/src/main/native/String.c
 +++ b/ojluni/src/main/native/String.c
@@ -35,7 +35,7 @@ String_intern(JNIEnv *env, jobject this)
@ -724,7 +724,7 @@ index 011089de08..da24b3c805 100644
 };
 
 diff --git a/ojluni/src/main/native/System.c b/ojluni/src/main/native/System.c
-index 6cfee92e5a..6948219544 100644
+index 6cfee92e5af..69482195447 100644
 --- a/ojluni/src/main/native/System.c
 +++ b/ojluni/src/main/native/System.c
@@ -262,7 +262,7 @@ static jlong System_currentTimeMillis(JNIEnv* env, jclass unused) {
@ -737,7 +737,7 @@ index 6cfee92e5a..6948219544 100644
   NATIVE_METHOD(System, setErr0, "(Ljava/io/PrintStream;)V"),
   NATIVE_METHOD(System, setOut0, "(Ljava/io/PrintStream;)V"),
 diff --git a/ojluni/src/main/native/Thread.c b/ojluni/src/main/native/Thread.c
-index 83b448f87f..f647c66887 100644
+index 83b448f87f4..f647c66887c 100644
 --- a/ojluni/src/main/native/Thread.c
 +++ b/ojluni/src/main/native/Thread.c
@@ -40,7 +40,7 @@
@ -750,7 +750,7 @@ index 83b448f87f..f647c66887 100644
     {"setPriority0",     "(I)V",       (void *)&JVM_SetThreadPriority},
     {"yield",            "()V",        (void *)&JVM_Yield},
 diff --git a/ojluni/src/main/native/Throwable.c b/ojluni/src/main/native/Throwable.c
-index 805c80a3ac..24575d819e 100644
+index 805c80a3ace..24575d819e7 100644
 --- a/ojluni/src/main/native/Throwable.c
 +++ b/ojluni/src/main/native/Throwable.c
@@ -65,7 +65,7 @@ Throwable_getStackTraceElement(JNIEnv *env,
@ -763,7 +763,7 @@ index 805c80a3ac..24575d819e 100644
   NATIVE_METHOD(Throwable, getStackTraceDepth, "()I"),
   NATIVE_METHOD(Throwable, getStackTraceElement, "(I)Ljava/lang/StackTraceElement;"),
 diff --git a/ojluni/src/main/native/UNIXProcess_md.c b/ojluni/src/main/native/UNIXProcess_md.c
-index 550a5c5932..c651413924 100644
+index 550a5c5932b..c6514139248 100644
 --- a/ojluni/src/main/native/UNIXProcess_md.c
 +++ b/ojluni/src/main/native/UNIXProcess_md.c
@@ -974,7 +974,7 @@ UNIXProcess_destroyProcess(JNIEnv *env, jobject junk, jint pid)
@ -776,7 +776,7 @@ index 550a5c5932..c651413924 100644
   NATIVE_METHOD(UNIXProcess, forkAndExec, "([B[BI[BI[B[IZ)I"),
   NATIVE_METHOD(UNIXProcess, waitForProcessExit, "(I)I"),
 diff --git a/ojluni/src/main/native/UnixFileSystem_md.c b/ojluni/src/main/native/UnixFileSystem_md.c
-index 0c53f095eb..3cedc77190 100644
+index 0c53f095ebc..3cedc771907 100644
 --- a/ojluni/src/main/native/UnixFileSystem_md.c
 +++ b/ojluni/src/main/native/UnixFileSystem_md.c
@@ -473,7 +473,7 @@ Java_java_io_UnixFileSystem_getSpace0(JNIEnv *env, jobject this,
@ -789,7 +789,7 @@ index 0c53f095eb..3cedc77190 100644
     NATIVE_METHOD(UnixFileSystem, canonicalize0, "(Ljava/lang/String;)Ljava/lang/String;"),
     NATIVE_METHOD(UnixFileSystem, getBooleanAttributes0, "(Ljava/lang/String;)I"),
 diff --git a/ojluni/src/main/native/java_util_zip_CRC32.c b/ojluni/src/main/native/java_util_zip_CRC32.c
-index cec99de0eb..cb17feec59 100644
+index cec99de0eba..cb17feec591 100644
 --- a/ojluni/src/main/native/java_util_zip_CRC32.c
 +++ b/ojluni/src/main/native/java_util_zip_CRC32.c
@@ -74,7 +74,7 @@ CRC32_updateByteBuffer(JNIEnv *env, jclass cls, jint crc,
@ -802,7 +802,7 @@ index cec99de0eb..cb17feec59 100644
   NATIVE_METHOD(CRC32, updateBytes, "(I[BII)I"),
   NATIVE_METHOD(CRC32, updateByteBuffer, "(IJII)I"),
 diff --git a/ojluni/src/main/native/java_util_zip_Deflater.c b/ojluni/src/main/native/java_util_zip_Deflater.c
-index 9ee032619d..2230f8c951 100644
+index 9ee032619dd..2230f8c9519 100644
 --- a/ojluni/src/main/native/java_util_zip_Deflater.c
 +++ b/ojluni/src/main/native/java_util_zip_Deflater.c
@@ -240,7 +240,7 @@ Deflater_end(JNIEnv *env, jclass cls, jlong addr)
@ -815,7 +815,7 @@ index 9ee032619d..2230f8c951 100644
   NATIVE_METHOD(Deflater, setDictionary, "(J[BII)V"),
   NATIVE_METHOD(Deflater, deflateBytes, "(J[BIII)I"),
 diff --git a/ojluni/src/main/native/java_util_zip_Inflater.c b/ojluni/src/main/native/java_util_zip_Inflater.c
-index c4c24f0fed..23b107426d 100644
+index c4c24f0fed1..23b107426db 100644
 --- a/ojluni/src/main/native/java_util_zip_Inflater.c
 +++ b/ojluni/src/main/native/java_util_zip_Inflater.c
@@ -201,7 +201,7 @@ Inflater_end(JNIEnv *env, jclass cls, jlong addr)
@ -828,7 +828,7 @@ index c4c24f0fed..23b107426d 100644
   NATIVE_METHOD(Inflater, setDictionary, "(J[BII)V"),
   NATIVE_METHOD(Inflater, inflateBytes, "(J[BII)I"),
 diff --git a/ojluni/src/main/native/java_util_zip_ZipFile.c b/ojluni/src/main/native/java_util_zip_ZipFile.c
-index daf5d8efff..78b26fdfa5 100644
+index daf5d8effff..78b26fdfa57 100644
 --- a/ojluni/src/main/native/java_util_zip_ZipFile.c
 +++ b/ojluni/src/main/native/java_util_zip_ZipFile.c
@@ -393,7 +393,7 @@ JarFile_getMetaInfEntryNames(JNIEnv *env, jobject obj)
--- a/Patches/LineageOS-17.1/android_libcore/0001-Exec_Based_Spawning-1.patch
+++ b/Patches/LineageOS-17.1/android_libcore/0001-Exec_Based_Spawning-1.patch
@ -9,7 +9,7 @@ Subject: [PATCH] add parameter for avoiding full preload with exec
 2 files changed, 4 insertions(+), 4 deletions(-)

 diff --git a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
-index 13769e137e..af3b9cfe8b 100644
+index 13769e137ec..af3b9cfe8bf 100644
 --- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
 +++ b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
@@ -47,7 +47,7 @@ public final class ZygoteHooks {
@ -31,7 +31,7 @@ index 13769e137e..af3b9cfe8b 100644
         CacheValue.setStrength(CacheValue.Strength.SOFT);
     }
 diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt
-index b2b81df415..cca6891580 100644
+index b2b81df4150..cca68915806 100644
 --- a/mmodules/core_platform_api/api/platform/current-api.txt
 +++ b/mmodules/core_platform_api/api/platform/current-api.txt
@@ -854,8 +854,8 @@ package dalvik.system {
--- a/Patches/LineageOS-17.1/android_libcore/0001-Exec_Based_Spawning-2.patch
+++ b/Patches/LineageOS-17.1/android_libcore/0001-Exec_Based_Spawning-2.patch
@ -8,7 +8,7 @@ Subject: [PATCH] disable ICU cache pinning for exec spawning
 1 file changed, 15 insertions(+), 11 deletions(-)

 diff --git a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
-index af3b9cfe8b..35e880558a 100644
+index af3b9cfe8bf..35e880558ac 100644
 --- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
 +++ b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
@@ -48,15 +48,17 @@ public final class ZygoteHooks {
--- a/Patches/LineageOS-17.1/android_libcore/0003-Network_Permission.patch
+++ b/Patches/LineageOS-17.1/android_libcore/0003-Network_Permission.patch
@ -9,7 +9,7 @@ Subject: [PATCH] don't throw SecurityException when INTERNET permission is
 1 file changed, 1 insertion(+), 10 deletions(-)

 diff --git a/ojluni/src/main/java/java/net/Inet6AddressImpl.java b/ojluni/src/main/java/java/net/Inet6AddressImpl.java
-index bb722f3df2..212f8b50ef 100644
+index bb722f3df2a..212f8b50ef3 100644
 --- a/ojluni/src/main/java/java/net/Inet6AddressImpl.java
 +++ b/ojluni/src/main/java/java/net/Inet6AddressImpl.java
@@ -141,16 +141,7 @@ class Inet6AddressImpl implements InetAddressImpl {
--- a/Patches/LineageOS-17.1/android_libcore/0004-constify_JNINativeMethod.patch
+++ b/Patches/LineageOS-17.1/android_libcore/0004-constify_JNINativeMethod.patch
@ -60,7 +60,7 @@ Subject: [PATCH] constify JNINativeMethod tables
 53 files changed, 58 insertions(+), 58 deletions(-)

 diff --git a/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp b/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp
-index 9f2b429374..06d05f3b71 100644
+index 9f2b429374d..06d05f3b71f 100644
 --- a/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp
 +++ b/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp
@@ -24,7 +24,7 @@
@ -100,7 +100,7 @@ index 9f2b429374..06d05f3b71 100644
     NATIVE_METHOD(NativeTestTarget, emptyJniStaticMethod6_Critical, "(IIIIII)V"),
 };
 diff --git a/luni/src/main/native/android_system_OsConstants.cpp b/luni/src/main/native/android_system_OsConstants.cpp
-index bb19f6e04f..4fbedc1117 100644
+index bb19f6e04f3..4fbedc11172 100644
 --- a/luni/src/main/native/android_system_OsConstants.cpp
 +++ b/luni/src/main/native/android_system_OsConstants.cpp
@@ -704,7 +704,7 @@ static void OsConstants_initConstants(JNIEnv* env, jclass c) {
@ -113,7 +113,7 @@ index bb19f6e04f..4fbedc1117 100644
 };
 void register_android_system_OsConstants(JNIEnv* env) {
 diff --git a/luni/src/main/native/java_lang_StringToReal.cpp b/luni/src/main/native/java_lang_StringToReal.cpp
-index 7a49285639..edd71fad70 100644
+index 7a492856394..edd71fad700 100644
 --- a/luni/src/main/native/java_lang_StringToReal.cpp
 +++ b/luni/src/main/native/java_lang_StringToReal.cpp
@@ -892,7 +892,7 @@ static jdouble StringToReal_parseDblImpl(JNIEnv* env, jclass, jstring s, jint e)
@ -126,7 +126,7 @@ index 7a49285639..edd71fad70 100644
     NATIVE_METHOD(StringToReal, parseDblImpl, "(Ljava/lang/String;I)D"),
 };
 diff --git a/luni/src/main/native/java_lang_invoke_MethodHandle.cpp b/luni/src/main/native/java_lang_invoke_MethodHandle.cpp
-index 0441d4552d..3335c6de9a 100644
+index 0441d4552dc..3335c6de9ac 100644
 --- a/luni/src/main/native/java_lang_invoke_MethodHandle.cpp
 +++ b/luni/src/main/native/java_lang_invoke_MethodHandle.cpp
@@ -29,7 +29,7 @@ static jobject MethodHandle_invoke(JNIEnv* env, jobject, jobjectArray) {
@ -139,7 +139,7 @@ index 0441d4552d..3335c6de9a 100644
     NATIVE_METHOD(MethodHandle, invoke, "([Ljava/lang/Object;)Ljava/lang/Object;"),
 };
 diff --git a/luni/src/main/native/java_lang_invoke_VarHandle.cpp b/luni/src/main/native/java_lang_invoke_VarHandle.cpp
-index e1cc1c7f8b..9f5215a520 100644
+index e1cc1c7f8b5..9f5215a5204 100644
 --- a/luni/src/main/native/java_lang_invoke_VarHandle.cpp
 +++ b/luni/src/main/native/java_lang_invoke_VarHandle.cpp
@@ -210,7 +210,7 @@ static jboolean VarHandle_weakCompareAndSetRelease(JNIEnv* env, jobject, jobject
@ -152,7 +152,7 @@ index e1cc1c7f8b..9f5215a520 100644
   NATIVE_METHOD(VarHandle, compareAndExchangeAcquire, "([Ljava/lang/Object;)Ljava/lang/Object;"),
   NATIVE_METHOD(VarHandle, compareAndExchangeRelease, "([Ljava/lang/Object;)Ljava/lang/Object;"),
 diff --git a/luni/src/main/native/java_math_NativeBN.cpp b/luni/src/main/native/java_math_NativeBN.cpp
-index 5d085ec9ec..b8c46e6681 100644
+index 5d085ec9ec8..b8c46e6681b 100644
 --- a/luni/src/main/native/java_math_NativeBN.cpp
 +++ b/luni/src/main/native/java_math_NativeBN.cpp
@@ -526,7 +526,7 @@ static jboolean NativeBN_BN_primality_test(JNIEnv* env, jclass, jlong candidate,
@ -165,7 +165,7 @@ index 5d085ec9ec..b8c46e6681 100644
    NATIVE_METHOD(NativeBN, BN_add_word, "(JI)V"),
    NATIVE_METHOD(NativeBN, BN_bin2bn, "([BIZJ)V"),
 diff --git a/luni/src/main/native/java_util_regex_Matcher.cpp b/luni/src/main/native/java_util_regex_Matcher.cpp
-index 12fb764c6e..01751e11bc 100644
+index 12fb764c6ee..01751e11bca 100644
 --- a/luni/src/main/native/java_util_regex_Matcher.cpp
 +++ b/luni/src/main/native/java_util_regex_Matcher.cpp
@@ -269,7 +269,7 @@ static jint Matcher_getMatchedGroupIndex0(JNIEnv* env, jclass, jlong patternAddr
@ -178,7 +178,7 @@ index 12fb764c6e..01751e11bc 100644
     NATIVE_METHOD(Matcher, findImpl, "(JI[I)Z"),
     NATIVE_METHOD(Matcher, findNextImpl, "(J[I)Z"),
 diff --git a/luni/src/main/native/java_util_regex_Pattern.cpp b/luni/src/main/native/java_util_regex_Pattern.cpp
-index a893bab9f3..4053ace294 100644
+index a893bab9f30..4053ace294a 100644
 --- a/luni/src/main/native/java_util_regex_Pattern.cpp
 +++ b/luni/src/main/native/java_util_regex_Pattern.cpp
@@ -96,7 +96,7 @@ static jlong Pattern_compileImpl(JNIEnv* env, jclass, jstring javaRegex, jint fl
@ -191,7 +191,7 @@ index a893bab9f3..4053ace294 100644
     NATIVE_METHOD(Pattern, getNativeFinalizer, "()J"),
 };
 diff --git a/luni/src/main/native/libcore_icu_ICU.cpp b/luni/src/main/native/libcore_icu_ICU.cpp
-index 8a571fddd8..fac0c24e96 100644
+index 8a571fddd85..fac0c24e963 100644
 --- a/luni/src/main/native/libcore_icu_ICU.cpp
 +++ b/luni/src/main/native/libcore_icu_ICU.cpp
@@ -807,7 +807,7 @@ static jstring ICU_getDefaultLocale(JNIEnv* env, jclass) {
@ -204,7 +204,7 @@ index 8a571fddd8..fac0c24e96 100644
     NATIVE_METHOD(ICU, getAvailableBreakIteratorLocalesNative, "()[Ljava/lang/String;"),
     NATIVE_METHOD(ICU, getAvailableCalendarLocalesNative, "()[Ljava/lang/String;"),
 diff --git a/luni/src/main/native/libcore_icu_NativeConverter.cpp b/luni/src/main/native/libcore_icu_NativeConverter.cpp
-index 9ccfabd119..05677f70cc 100644
+index 9ccfabd1190..05677f70cce 100644
 --- a/luni/src/main/native/libcore_icu_NativeConverter.cpp
 +++ b/luni/src/main/native/libcore_icu_NativeConverter.cpp
@@ -675,7 +675,7 @@ static jlong NativeConverter_getNativeSize(JNIEnv*, jclass) {
@ -217,7 +217,7 @@ index 9ccfabd119..05677f70cc 100644
     NATIVE_METHOD(NativeConverter, closeConverter, "(J)V"),
     NATIVE_METHOD(NativeConverter, contains, "(Ljava/lang/String;Ljava/lang/String;)Z"),
 diff --git a/luni/src/main/native/libcore_icu_TimeZoneNames.cpp b/luni/src/main/native/libcore_icu_TimeZoneNames.cpp
-index db4c6f219f..f51ae12cd1 100644
+index db4c6f219fd..f51ae12cd11 100644
 --- a/luni/src/main/native/libcore_icu_TimeZoneNames.cpp
 +++ b/luni/src/main/native/libcore_icu_TimeZoneNames.cpp
@@ -97,7 +97,7 @@ static void TimeZoneNames_fillZoneStrings(JNIEnv* env, jclass, jstring javaLocal
@ -230,7 +230,7 @@ index db4c6f219f..f51ae12cd1 100644
 };
 void register_libcore_icu_TimeZoneNames(JNIEnv* env) {
 diff --git a/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp b/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp
-index 55803b8d8d..5b2627140b 100644
+index 55803b8d8d4..5b2627140b3 100644
 --- a/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp
 +++ b/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp
@@ -26,7 +26,7 @@ static void AsynchronousCloseMonitor_signalBlockedThreads(JNIEnv* env, jclass, j
@ -243,7 +243,7 @@ index 55803b8d8d..5b2627140b 100644
 };
 void register_libcore_io_AsynchronousCloseMonitor(JNIEnv* env) {
 diff --git a/luni/src/main/native/libcore_io_Linux.cpp b/luni/src/main/native/libcore_io_Linux.cpp
-index 6b8ee085df..f80b83985b 100644
+index 6b8ee085df7..f80b83985b0 100644
 --- a/luni/src/main/native/libcore_io_Linux.cpp
 +++ b/luni/src/main/native/libcore_io_Linux.cpp
@@ -2577,7 +2577,7 @@ static jint Linux_writev(JNIEnv* env, jobject, jobject javaFd, jobjectArray buff
@ -256,7 +256,7 @@ index 6b8ee085df..f80b83985b 100644
     NATIVE_METHOD(Linux, access, "(Ljava/lang/String;I)Z"),
     NATIVE_METHOD(Linux, android_fdsan_exchange_owner_tag, "(Ljava/io/FileDescriptor;JJ)V"),
 diff --git a/luni/src/main/native/libcore_io_Memory.cpp b/luni/src/main/native/libcore_io_Memory.cpp
-index a5b7b72a98..8400c5462d 100644
+index a5b7b72a98c..8400c5462de 100644
 --- a/luni/src/main/native/libcore_io_Memory.cpp
 +++ b/luni/src/main/native/libcore_io_Memory.cpp
@@ -289,7 +289,7 @@ static void Memory_unsafeBulkPut(JNIEnv* env, jclass, jbyteArray dstArray, jint
@ -269,7 +269,7 @@ index a5b7b72a98..8400c5462d 100644
     FAST_NATIVE_METHOD(Memory, peekByte, "(J)B"),
     NATIVE_METHOD(Memory, peekByteArray, "(J[BII)V"),
 diff --git a/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp b/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp
-index ded578a958..faaa5c7a7c 100644
+index ded578a9580..faaa5c7a7c4 100644
 --- a/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp
 +++ b/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp
@@ -29,7 +29,7 @@ static void NativeAllocationRegistry_applyFreeFunction(JNIEnv*,
@ -282,7 +282,7 @@ index ded578a958..faaa5c7a7c 100644
 };
 
 diff --git a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
-index 9d23837a5b..404f897140 100644
+index 9d23837a5bb..404f8971409 100644
 --- a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
 +++ b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
@@ -1353,7 +1353,7 @@ static void ExpatParser_staticInitialize(JNIEnv* env, jobject classObject, jstri
@ -304,7 +304,7 @@ index 9d23837a5b..404f897140 100644
     NATIVE_METHOD(ExpatAttributes, getIndexForQName, "(JLjava/lang/String;)I"),
     NATIVE_METHOD(ExpatAttributes, getIndex, "(JLjava/lang/String;Ljava/lang/String;)I"),
 diff --git a/luni/src/main/native/sun_misc_Unsafe.cpp b/luni/src/main/native/sun_misc_Unsafe.cpp
-index 49848a2db2..87b2feac80 100644
+index 49848a2db2b..87b2feac807 100644
 --- a/luni/src/main/native/sun_misc_Unsafe.cpp
 +++ b/luni/src/main/native/sun_misc_Unsafe.cpp
@@ -23,7 +23,7 @@ static jobject Unsafe_allocateInstance(JNIEnv* env, jclass, jclass c) {
@ -317,7 +317,7 @@ index 49848a2db2..87b2feac80 100644
 };
 void register_sun_misc_Unsafe(JNIEnv* env) {
 diff --git a/ojluni/src/main/native/Adler32.c b/ojluni/src/main/native/Adler32.c
-index 11ef08d4c9..849df61067 100644
+index 11ef08d4c98..849df610674 100644
 --- a/ojluni/src/main/native/Adler32.c
 +++ b/ojluni/src/main/native/Adler32.c
@@ -70,7 +70,7 @@ Java_java_util_zip_Adler32_updateByteBuffer(JNIEnv *env, jclass cls, jint adler,
@ -330,7 +330,7 @@ index 11ef08d4c9..849df61067 100644
   NATIVE_METHOD(Adler32, updateBytes, "(I[BII)I"),
   NATIVE_METHOD(Adler32, updateByteBuffer, "(IJII)I"),
 diff --git a/ojluni/src/main/native/CRC32.c b/ojluni/src/main/native/CRC32.c
-index cec99de0eb..cb17feec59 100644
+index cec99de0eba..cb17feec591 100644
 --- a/ojluni/src/main/native/CRC32.c
 +++ b/ojluni/src/main/native/CRC32.c
@@ -74,7 +74,7 @@ CRC32_updateByteBuffer(JNIEnv *env, jclass cls, jint crc,
@ -343,7 +343,7 @@ index cec99de0eb..cb17feec59 100644
   NATIVE_METHOD(CRC32, updateBytes, "(I[BII)I"),
   NATIVE_METHOD(CRC32, updateByteBuffer, "(IJII)I"),
 diff --git a/ojluni/src/main/native/Character.cpp b/ojluni/src/main/native/Character.cpp
-index 9fb24c372c..a12ae6bd17 100644
+index 9fb24c372c3..a12ae6bd177 100644
 --- a/ojluni/src/main/native/Character.cpp
 +++ b/ojluni/src/main/native/Character.cpp
@@ -159,7 +159,7 @@ Character_getNameImpl(JNIEnv* env, jclass, jint codePoint) {
@ -356,7 +356,7 @@ index 9fb24c372c..a12ae6bd17 100644
   FAST_NATIVE_METHOD(Character, getDirectionalityImpl, "(I)B"),
   NATIVE_METHOD(Character, getNameImpl, "(I)Ljava/lang/String;"),
 diff --git a/ojluni/src/main/native/Console_md.c b/ojluni/src/main/native/Console_md.c
-index 13437be314..f87bd168b1 100644
+index 13437be314e..f87bd168b1a 100644
 --- a/ojluni/src/main/native/Console_md.c
 +++ b/ojluni/src/main/native/Console_md.c
@@ -72,7 +72,7 @@ Java_java_io_Console_echo(JNIEnv *env,
@ -369,7 +369,7 @@ index 13437be314..f87bd168b1 100644
     NATIVE_METHOD(Console, encoding, "()Ljava/lang/String;"),
     NATIVE_METHOD(Console, echo, "(Z)Z"),
 diff --git a/ojluni/src/main/native/DatagramChannelImpl.c b/ojluni/src/main/native/DatagramChannelImpl.c
-index 11d149ddcf..8a8444c8a2 100644
+index 11d149ddcf9..8a8444c8a2c 100644
 --- a/ojluni/src/main/native/DatagramChannelImpl.c
 +++ b/ojluni/src/main/native/DatagramChannelImpl.c
@@ -276,7 +276,7 @@ Java_sun_nio_ch_DatagramChannelImpl_send0(JNIEnv *env, jobject this,
@ -382,7 +382,7 @@ index 11d149ddcf..8a8444c8a2 100644
   NATIVE_METHOD(DatagramChannelImpl, disconnect0, "(Ljava/io/FileDescriptor;Z)V"),
   NATIVE_METHOD(DatagramChannelImpl, receive0, "(Ljava/io/FileDescriptor;JIZ)I"),
 diff --git a/ojluni/src/main/native/DatagramDispatcher.c b/ojluni/src/main/native/DatagramDispatcher.c
-index 36cc6cf4bc..39ff924179 100644
+index 36cc6cf4bc1..39ff9241791 100644
 --- a/ojluni/src/main/native/DatagramDispatcher.c
 +++ b/ojluni/src/main/native/DatagramDispatcher.c
@@ -139,7 +139,7 @@ Java_sun_nio_ch_DatagramDispatcher_writev0(JNIEnv *env, jclass clazz,
@ -395,7 +395,7 @@ index 36cc6cf4bc..39ff924179 100644
   NATIVE_METHOD(DatagramDispatcher, readv0, "(Ljava/io/FileDescriptor;JI)J"),
   NATIVE_METHOD(DatagramDispatcher, write0, "(Ljava/io/FileDescriptor;JI)I"),
 diff --git a/ojluni/src/main/native/Deflater.c b/ojluni/src/main/native/Deflater.c
-index 9ee032619d..2230f8c951 100644
+index 9ee032619dd..2230f8c9519 100644
 --- a/ojluni/src/main/native/Deflater.c
 +++ b/ojluni/src/main/native/Deflater.c
@@ -240,7 +240,7 @@ Deflater_end(JNIEnv *env, jclass cls, jlong addr)
@ -408,7 +408,7 @@ index 9ee032619d..2230f8c951 100644
   NATIVE_METHOD(Deflater, setDictionary, "(J[BII)V"),
   NATIVE_METHOD(Deflater, deflateBytes, "(J[BIII)I"),
 diff --git a/ojluni/src/main/native/Double.c b/ojluni/src/main/native/Double.c
-index 8382b88994..2bcb97a653 100644
+index 8382b889945..2bcb97a653f 100644
 --- a/ojluni/src/main/native/Double.c
 +++ b/ojluni/src/main/native/Double.c
@@ -63,7 +63,7 @@ Double_doubleToRawLongBits(JNIEnv *env, jclass unused, jdouble v)
@ -421,7 +421,7 @@ index 8382b88994..2bcb97a653 100644
   NATIVE_METHOD(Double, doubleToRawLongBits, "(D)J"),
 };
 diff --git a/ojluni/src/main/native/FileChannelImpl.c b/ojluni/src/main/native/FileChannelImpl.c
-index 51339dff9c..6d5c075e83 100644
+index 51339dff9c1..6d5c075e835 100644
 --- a/ojluni/src/main/native/FileChannelImpl.c
 +++ b/ojluni/src/main/native/FileChannelImpl.c
@@ -284,7 +284,7 @@ FileChannelImpl_transferTo0(JNIEnv *env, jobject this,
@ -434,7 +434,7 @@ index 51339dff9c..6d5c075e83 100644
   NATIVE_METHOD(FileChannelImpl, map0, "(IJJ)J"),
   NATIVE_METHOD(FileChannelImpl, unmap0, "(JJ)I"),
 diff --git a/ojluni/src/main/native/FileDescriptor_md.c b/ojluni/src/main/native/FileDescriptor_md.c
-index 0404263787..a00d799045 100644
+index 04042637876..a00d7990459 100644
 --- a/ojluni/src/main/native/FileDescriptor_md.c
 +++ b/ojluni/src/main/native/FileDescriptor_md.c
@@ -68,7 +68,7 @@ JNIEXPORT jboolean JNICALL FileDescriptor_isSocket(JNIEnv *env, jclass ignored,
@ -447,7 +447,7 @@ index 0404263787..a00d799045 100644
   NATIVE_METHOD(FileDescriptor, isSocket, "(I)Z"),
 };
 diff --git a/ojluni/src/main/native/FileDispatcherImpl.c b/ojluni/src/main/native/FileDispatcherImpl.c
-index 3e8e4f3e0f..facede4cf1 100644
+index 3e8e4f3e0f2..facede4cf14 100644
 --- a/ojluni/src/main/native/FileDispatcherImpl.c
 +++ b/ojluni/src/main/native/FileDispatcherImpl.c
@@ -287,7 +287,7 @@ FileDispatcherImpl_closeIntFD(JNIEnv *env, jclass clazz, jint fd)
@ -460,7 +460,7 @@ index 3e8e4f3e0f..facede4cf1 100644
   NATIVE_METHOD(FileDispatcherImpl, preClose0, "(Ljava/io/FileDescriptor;)V"),
   NATIVE_METHOD(FileDispatcherImpl, close0, "(Ljava/io/FileDescriptor;)V"),
 diff --git a/ojluni/src/main/native/FileInputStream.c b/ojluni/src/main/native/FileInputStream.c
-index 58664a1f1d..b388a72eb2 100644
+index 58664a1f1d7..b388a72eb24 100644
 --- a/ojluni/src/main/native/FileInputStream.c
 +++ b/ojluni/src/main/native/FileInputStream.c
@@ -140,7 +140,7 @@ FileInputStream_available0(JNIEnv *env, jobject this) {
@ -473,7 +473,7 @@ index 58664a1f1d..b388a72eb2 100644
   NATIVE_METHOD(FileInputStream, skip0, "(J)J"),
   NATIVE_METHOD(FileInputStream, available0, "()I"),
 diff --git a/ojluni/src/main/native/FileKey.c b/ojluni/src/main/native/FileKey.c
-index c3b5d2a00f..61d3c2ae89 100644
+index c3b5d2a00fe..61d3c2ae896 100644
 --- a/ojluni/src/main/native/FileKey.c
 +++ b/ojluni/src/main/native/FileKey.c
@@ -68,7 +68,7 @@ FileKey_init(JNIEnv *env, jobject this, jobject fdo)
@ -486,7 +486,7 @@ index c3b5d2a00f..61d3c2ae89 100644
 };
 
 diff --git a/ojluni/src/main/native/FileOutputStream_md.c b/ojluni/src/main/native/FileOutputStream_md.c
-index 73218d482e..5bac6129ef 100644
+index 73218d482e1..5bac6129ef7 100644
 --- a/ojluni/src/main/native/FileOutputStream_md.c
 +++ b/ojluni/src/main/native/FileOutputStream_md.c
@@ -58,7 +58,7 @@ FileOutputStream_open0(JNIEnv *env, jobject this,
@ -499,7 +499,7 @@ index 73218d482e..5bac6129ef 100644
 };
 
 diff --git a/ojluni/src/main/native/FileSystemPreferences.c b/ojluni/src/main/native/FileSystemPreferences.c
-index 9a73150428..d49de07b61 100644
+index 9a731504281..d49de07b618 100644
 --- a/ojluni/src/main/native/FileSystemPreferences.c
 +++ b/ojluni/src/main/native/FileSystemPreferences.c
@@ -150,7 +150,7 @@ Java_java_util_prefs_FileSystemPreferences_unlockFile0(JNIEnv *env,
@ -512,7 +512,7 @@ index 9a73150428..d49de07b61 100644
     NATIVE_METHOD(FileSystemPreferences, unlockFile0, "(I)I"),
     NATIVE_METHOD(FileSystemPreferences, chmod, "(Ljava/lang/String;I)I"),
 diff --git a/ojluni/src/main/native/Float.c b/ojluni/src/main/native/Float.c
-index 956048d6b8..5bfdf58245 100644
+index 956048d6b8e..5bfdf58245d 100644
 --- a/ojluni/src/main/native/Float.c
 +++ b/ojluni/src/main/native/Float.c
@@ -59,7 +59,7 @@ Float_floatToRawIntBits(JNIEnv *env, jclass unused, jfloat v)
@ -525,7 +525,7 @@ index 956048d6b8..5bfdf58245 100644
   NATIVE_METHOD(Float, floatToRawIntBits, "(F)I"),
 };
 diff --git a/ojluni/src/main/native/IOUtil.c b/ojluni/src/main/native/IOUtil.c
-index 05949dab16..2ccb8795e4 100644
+index 05949dab164..2ccb8795e4a 100644
 --- a/ojluni/src/main/native/IOUtil.c
 +++ b/ojluni/src/main/native/IOUtil.c
@@ -206,7 +206,7 @@ fdval(JNIEnv *env, jobject fdo)
@ -538,7 +538,7 @@ index 05949dab16..2ccb8795e4 100644
   NATIVE_METHOD(IOUtil, fdLimit, "()I"),
   NATIVE_METHOD(IOUtil, drain, "(I)Z"),
 diff --git a/ojluni/src/main/native/Inflater.c b/ojluni/src/main/native/Inflater.c
-index c4c24f0fed..23b107426d 100644
+index c4c24f0fed1..23b107426db 100644
 --- a/ojluni/src/main/native/Inflater.c
 +++ b/ojluni/src/main/native/Inflater.c
@@ -201,7 +201,7 @@ Inflater_end(JNIEnv *env, jclass cls, jlong addr)
@ -551,7 +551,7 @@ index c4c24f0fed..23b107426d 100644
   NATIVE_METHOD(Inflater, setDictionary, "(J[BII)V"),
   NATIVE_METHOD(Inflater, inflateBytes, "(J[BII)I"),
 diff --git a/ojluni/src/main/native/MappedByteBuffer.c b/ojluni/src/main/native/MappedByteBuffer.c
-index 72e840a5c1..24bf6973c3 100644
+index 72e840a5c18..24bf6973c30 100644
 --- a/ojluni/src/main/native/MappedByteBuffer.c
 +++ b/ojluni/src/main/native/MappedByteBuffer.c
@@ -104,7 +104,7 @@ Java_java_nio_MappedByteBuffer_force0(JNIEnv *env, jobject obj, jobject fdo,
@ -564,7 +564,7 @@ index 72e840a5c1..24bf6973c3 100644
   NATIVE_METHOD(MappedByteBuffer, load0, "(JJ)V"),
   NATIVE_METHOD(MappedByteBuffer, force0, "(Ljava/io/FileDescriptor;JJ)V"),
 diff --git a/ojluni/src/main/native/Math.c b/ojluni/src/main/native/Math.c
-index 4bbcd1d0f1..f3423328d0 100644
+index 4bbcd1d0f1b..f3423328d0d 100644
 --- a/ojluni/src/main/native/Math.c
 +++ b/ojluni/src/main/native/Math.c
@@ -141,7 +141,7 @@ Math_rint(jdouble d) {
@ -577,7 +577,7 @@ index 4bbcd1d0f1..f3423328d0 100644
   FAST_NATIVE_METHOD(Math, acos, "(D)D"),
   FAST_NATIVE_METHOD(Math, asin, "(D)D"),
 diff --git a/ojluni/src/main/native/NativeThread.c b/ojluni/src/main/native/NativeThread.c
-index dc21e5dbc9..312b160a99 100644
+index dc21e5dbc90..312b160a993 100644
 --- a/ojluni/src/main/native/NativeThread.c
 +++ b/ojluni/src/main/native/NativeThread.c
@@ -108,7 +108,7 @@ NativeThread_signal(JNIEnv *env, jclass cl, jlong thread)
@ -590,7 +590,7 @@ index dc21e5dbc9..312b160a99 100644
   NATIVE_METHOD(NativeThread, signal, "(J)V"),
 };
 diff --git a/ojluni/src/main/native/Net.c b/ojluni/src/main/native/Net.c
-index bcf984e957..9b43e521b7 100644
+index bcf984e957b..9b43e521b79 100644
 --- a/ojluni/src/main/native/Net.c
 +++ b/ojluni/src/main/native/Net.c
@@ -868,7 +868,7 @@ handleSocketError(JNIEnv *env, jint errorValue) {
@ -603,7 +603,7 @@ index bcf984e957..9b43e521b7 100644
   NATIVE_METHOD(Net, isExclusiveBindAvailable, "()I"),
   NATIVE_METHOD(Net, canIPv6SocketJoinIPv4Group0, "()Z"),
 diff --git a/ojluni/src/main/native/ObjectInputStream.c b/ojluni/src/main/native/ObjectInputStream.c
-index 6f65dca5a5..6ba47e31dc 100644
+index 6f65dca5a56..6ba47e31dc1 100644
 --- a/ojluni/src/main/native/ObjectInputStream.c
 +++ b/ojluni/src/main/native/ObjectInputStream.c
@@ -175,7 +175,7 @@ Java_java_io_ObjectInputStream_bytesToDoubles(JNIEnv *env,
@ -616,7 +616,7 @@ index 6f65dca5a5..6ba47e31dc 100644
     NATIVE_METHOD(ObjectInputStream, bytesToDoubles, "([BI[DII)V"),
 };
 diff --git a/ojluni/src/main/native/ObjectOutputStream.c b/ojluni/src/main/native/ObjectOutputStream.c
-index 169a83f3f8..0e1479d6df 100644
+index 169a83f3f8d..0e1479d6df9 100644
 --- a/ojluni/src/main/native/ObjectOutputStream.c
 +++ b/ojluni/src/main/native/ObjectOutputStream.c
@@ -184,7 +184,7 @@ Java_java_io_ObjectOutputStream_doublesToBytes(JNIEnv *env,
@ -629,7 +629,7 @@ index 169a83f3f8..0e1479d6df 100644
     NATIVE_METHOD(ObjectOutputStream, doublesToBytes, "([DI[BII)V"),
 };
 diff --git a/ojluni/src/main/native/ObjectStreamClass.c b/ojluni/src/main/native/ObjectStreamClass.c
-index 3d3fdefa33..84cfcc43d3 100644
+index 3d3fdefa330..84cfcc43d3f 100644
 --- a/ojluni/src/main/native/ObjectStreamClass.c
 +++ b/ojluni/src/main/native/ObjectStreamClass.c
@@ -110,7 +110,7 @@ ObjectStreamClass_hasStaticInitializer(JNIEnv *env, jclass this,
@ -642,7 +642,7 @@ index 3d3fdefa33..84cfcc43d3 100644
 };
 
 diff --git a/ojluni/src/main/native/ProcessEnvironment_md.c b/ojluni/src/main/native/ProcessEnvironment_md.c
-index a59410badc..a3f46a4d4f 100644
+index a59410badc2..a3f46a4d4fd 100644
 --- a/ojluni/src/main/native/ProcessEnvironment_md.c
 +++ b/ojluni/src/main/native/ProcessEnvironment_md.c
@@ -91,7 +91,7 @@ ProcessEnvironment_environ(JNIEnv *env, jclass ign)
@ -655,7 +655,7 @@ index a59410badc..a3f46a4d4f 100644
 };
 
 diff --git a/ojluni/src/main/native/Runtime.c b/ojluni/src/main/native/Runtime.c
-index 749511eb08..5e8a2916f6 100644
+index 749511eb080..5e8a2916f6e 100644
 --- a/ojluni/src/main/native/Runtime.c
 +++ b/ojluni/src/main/native/Runtime.c
@@ -80,7 +80,7 @@ Runtime_nativeLoad(JNIEnv* env, jclass ignored, jstring javaFilename,
@ -668,7 +668,7 @@ index 749511eb08..5e8a2916f6 100644
   FAST_NATIVE_METHOD(Runtime, totalMemory, "()J"),
   FAST_NATIVE_METHOD(Runtime, maxMemory, "()J"),
 diff --git a/ojluni/src/main/native/ServerSocketChannelImpl.c b/ojluni/src/main/native/ServerSocketChannelImpl.c
-index 679811f96a..83a94f9b8e 100644
+index 679811f96ae..83a94f9b8e3 100644
 --- a/ojluni/src/main/native/ServerSocketChannelImpl.c
 +++ b/ojluni/src/main/native/ServerSocketChannelImpl.c
@@ -137,7 +137,7 @@ Java_sun_nio_ch_ServerSocketChannelImpl_accept0(JNIEnv *env, jobject this,
@ -681,7 +681,7 @@ index 679811f96a..83a94f9b8e 100644
   NATIVE_METHOD(Java_sun_nio_ch_ServerSocketChannelImpl, accept0,
                 "(Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;[Ljava/net/InetSocketAddress;)I"),
 diff --git a/ojluni/src/main/native/SocketChannelImpl.c b/ojluni/src/main/native/SocketChannelImpl.c
-index 94291659cf..9e54369054 100644
+index 94291659cf9..9e543690544 100644
 --- a/ojluni/src/main/native/SocketChannelImpl.c
 +++ b/ojluni/src/main/native/SocketChannelImpl.c
@@ -96,7 +96,7 @@ Java_sun_nio_ch_SocketChannelImpl_sendOutOfBandData(JNIEnv* env, jclass this,
@ -694,7 +694,7 @@ index 94291659cf..9e54369054 100644
   NATIVE_METHOD(SocketChannelImpl, sendOutOfBandData, "(Ljava/io/FileDescriptor;B)I"),
 };
 diff --git a/ojluni/src/main/native/SocketInputStream.c b/ojluni/src/main/native/SocketInputStream.c
-index dcea334fd1..aa10f4e9c1 100644
+index dcea334fd1f..aa10f4e9c1a 100644
 --- a/ojluni/src/main/native/SocketInputStream.c
 +++ b/ojluni/src/main/native/SocketInputStream.c
@@ -153,7 +153,7 @@ SocketInputStream_socketRead0(JNIEnv *env, jobject this,
@ -707,7 +707,7 @@ index dcea334fd1..aa10f4e9c1 100644
 };
 
 diff --git a/ojluni/src/main/native/SocketOutputStream.c b/ojluni/src/main/native/SocketOutputStream.c
-index bc3522bee3..d72fd1108b 100644
+index bc3522bee35..d72fd1108ba 100644
 --- a/ojluni/src/main/native/SocketOutputStream.c
 +++ b/ojluni/src/main/native/SocketOutputStream.c
@@ -128,7 +128,7 @@ SocketOutputStream_socketWrite0(JNIEnv *env, jobject this,
@ -720,7 +720,7 @@ index bc3522bee3..d72fd1108b 100644
 };
 
 diff --git a/ojluni/src/main/native/StrictMath.c b/ojluni/src/main/native/StrictMath.c
-index 7f9bbebcdf..24b29228a4 100644
+index 7f9bbebcdf7..24b29228a46 100644
 --- a/ojluni/src/main/native/StrictMath.c
 +++ b/ojluni/src/main/native/StrictMath.c
@@ -156,7 +156,7 @@ StrictMath_expm1(JNIEnv *env, jclass unused, jdouble d)
@ -733,7 +733,7 @@ index 7f9bbebcdf..24b29228a4 100644
   NATIVE_METHOD(StrictMath, sin, "(D)D"),
   NATIVE_METHOD(StrictMath, tan, "(D)D"),
 diff --git a/ojluni/src/main/native/System.c b/ojluni/src/main/native/System.c
-index 6cfee92e5a..6948219544 100644
+index 6cfee92e5af..69482195447 100644
 --- a/ojluni/src/main/native/System.c
 +++ b/ojluni/src/main/native/System.c
@@ -262,7 +262,7 @@ static jlong System_currentTimeMillis(JNIEnv* env, jclass unused) {
@ -746,7 +746,7 @@ index 6cfee92e5a..6948219544 100644
   NATIVE_METHOD(System, setErr0, "(Ljava/io/PrintStream;)V"),
   NATIVE_METHOD(System, setOut0, "(Ljava/io/PrintStream;)V"),
 diff --git a/ojluni/src/main/native/UNIXProcess_md.c b/ojluni/src/main/native/UNIXProcess_md.c
-index 40fdc18fb8..87ceaac4fe 100644
+index 40fdc18fb8a..87ceaac4fe9 100644
 --- a/ojluni/src/main/native/UNIXProcess_md.c
 +++ b/ojluni/src/main/native/UNIXProcess_md.c
@@ -991,7 +991,7 @@ UNIXProcess_destroyProcess(JNIEnv *env, jobject junk, jint pid)
@ -759,7 +759,7 @@ index 40fdc18fb8..87ceaac4fe 100644
   NATIVE_METHOD(UNIXProcess, forkAndExec, "([B[BI[BI[B[IZ)I"),
   NATIVE_METHOD(UNIXProcess, waitForProcessExit, "(I)I"),
 diff --git a/ojluni/src/main/native/UnixFileSystem_md.c b/ojluni/src/main/native/UnixFileSystem_md.c
-index 9c1ca05052..bc7ee22d57 100644
+index 9c1ca050524..bc7ee22d577 100644
 --- a/ojluni/src/main/native/UnixFileSystem_md.c
 +++ b/ojluni/src/main/native/UnixFileSystem_md.c
@@ -497,7 +497,7 @@ Java_java_io_UnixFileSystem_getSpace0(JNIEnv *env, jobject this,
@ -772,7 +772,7 @@ index 9c1ca05052..bc7ee22d57 100644
     NATIVE_METHOD(UnixFileSystem, canonicalize0, "(Ljava/lang/String;)Ljava/lang/String;"),
     NATIVE_METHOD(UnixFileSystem, getBooleanAttributes0, "(Ljava/lang/String;)I"),
 diff --git a/ojluni/src/main/native/ZipFile.c b/ojluni/src/main/native/ZipFile.c
-index daf5d8efff..78b26fdfa5 100644
+index daf5d8effff..78b26fdfa57 100644
 --- a/ojluni/src/main/native/ZipFile.c
 +++ b/ojluni/src/main/native/ZipFile.c
@@ -393,7 +393,7 @@ JarFile_getMetaInfEntryNames(JNIEnv *env, jobject obj)
--- a/Patches/LineageOS-18.1/android_libcore/0001-Network_Permission.patch
+++ b/Patches/LineageOS-18.1/android_libcore/0001-Network_Permission.patch
@ -9,7 +9,7 @@ Subject: [PATCH] don't throw SecurityException when INTERNET permission is
 1 file changed, 1 insertion(+), 10 deletions(-)

 diff --git a/ojluni/src/main/java/java/net/Inet6AddressImpl.java b/ojluni/src/main/java/java/net/Inet6AddressImpl.java
-index 84bcf17eda..fda9674e08 100644
+index 84bcf17edae..fda9674e08e 100644
 --- a/ojluni/src/main/java/java/net/Inet6AddressImpl.java
 +++ b/ojluni/src/main/java/java/net/Inet6AddressImpl.java
@@ -141,16 +141,7 @@ class Inet6AddressImpl implements InetAddressImpl {
--- a/Patches/LineageOS-18.1/android_libcore/0002-constify_JNINativeMethod.patch
+++ b/Patches/LineageOS-18.1/android_libcore/0002-constify_JNINativeMethod.patch
@ -56,7 +56,7 @@ Subject: [PATCH] constify JNINativeMethod tables
 49 files changed, 54 insertions(+), 54 deletions(-)

 diff --git a/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp b/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp
-index 9f2b429374..06d05f3b71 100644
+index 9f2b429374d..06d05f3b71f 100644
 --- a/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp
 +++ b/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp
@@ -24,7 +24,7 @@
@ -96,7 +96,7 @@ index 9f2b429374..06d05f3b71 100644
     NATIVE_METHOD(NativeTestTarget, emptyJniStaticMethod6_Critical, "(IIIIII)V"),
 };
 diff --git a/luni/src/main/native/android_system_OsConstants.cpp b/luni/src/main/native/android_system_OsConstants.cpp
-index 6cf2c8b30b..f22e1cb1d1 100644
+index 6cf2c8b30b6..f22e1cb1d13 100644
 --- a/luni/src/main/native/android_system_OsConstants.cpp
 +++ b/luni/src/main/native/android_system_OsConstants.cpp
@@ -708,7 +708,7 @@ static void OsConstants_initConstants(JNIEnv* env, jclass c) {
@ -109,7 +109,7 @@ index 6cf2c8b30b..f22e1cb1d1 100644
 };
 void register_android_system_OsConstants(JNIEnv* env) {
 diff --git a/luni/src/main/native/java_lang_StringToReal.cpp b/luni/src/main/native/java_lang_StringToReal.cpp
-index 7a49285639..edd71fad70 100644
+index 7a492856394..edd71fad700 100644
 --- a/luni/src/main/native/java_lang_StringToReal.cpp
 +++ b/luni/src/main/native/java_lang_StringToReal.cpp
@@ -892,7 +892,7 @@ static jdouble StringToReal_parseDblImpl(JNIEnv* env, jclass, jstring s, jint e)
@ -122,7 +122,7 @@ index 7a49285639..edd71fad70 100644
     NATIVE_METHOD(StringToReal, parseDblImpl, "(Ljava/lang/String;I)D"),
 };
 diff --git a/luni/src/main/native/java_lang_invoke_MethodHandle.cpp b/luni/src/main/native/java_lang_invoke_MethodHandle.cpp
-index 0441d4552d..3335c6de9a 100644
+index 0441d4552dc..3335c6de9ac 100644
 --- a/luni/src/main/native/java_lang_invoke_MethodHandle.cpp
 +++ b/luni/src/main/native/java_lang_invoke_MethodHandle.cpp
@@ -29,7 +29,7 @@ static jobject MethodHandle_invoke(JNIEnv* env, jobject, jobjectArray) {
@ -135,7 +135,7 @@ index 0441d4552d..3335c6de9a 100644
     NATIVE_METHOD(MethodHandle, invoke, "([Ljava/lang/Object;)Ljava/lang/Object;"),
 };
 diff --git a/luni/src/main/native/java_lang_invoke_VarHandle.cpp b/luni/src/main/native/java_lang_invoke_VarHandle.cpp
-index e1cc1c7f8b..9f5215a520 100644
+index e1cc1c7f8b5..9f5215a5204 100644
 --- a/luni/src/main/native/java_lang_invoke_VarHandle.cpp
 +++ b/luni/src/main/native/java_lang_invoke_VarHandle.cpp
@@ -210,7 +210,7 @@ static jboolean VarHandle_weakCompareAndSetRelease(JNIEnv* env, jobject, jobject
@ -148,7 +148,7 @@ index e1cc1c7f8b..9f5215a520 100644
   NATIVE_METHOD(VarHandle, compareAndExchangeAcquire, "([Ljava/lang/Object;)Ljava/lang/Object;"),
   NATIVE_METHOD(VarHandle, compareAndExchangeRelease, "([Ljava/lang/Object;)Ljava/lang/Object;"),
 diff --git a/luni/src/main/native/java_math_NativeBN.cpp b/luni/src/main/native/java_math_NativeBN.cpp
-index 5d085ec9ec..b8c46e6681 100644
+index 5d085ec9ec8..b8c46e6681b 100644
 --- a/luni/src/main/native/java_math_NativeBN.cpp
 +++ b/luni/src/main/native/java_math_NativeBN.cpp
@@ -526,7 +526,7 @@ static jboolean NativeBN_BN_primality_test(JNIEnv* env, jclass, jlong candidate,
@ -161,7 +161,7 @@ index 5d085ec9ec..b8c46e6681 100644
    NATIVE_METHOD(NativeBN, BN_add_word, "(JI)V"),
    NATIVE_METHOD(NativeBN, BN_bin2bn, "([BIZJ)V"),
 diff --git a/luni/src/main/native/libcore_icu_ICU.cpp b/luni/src/main/native/libcore_icu_ICU.cpp
-index 9879761e80..e8cbe0ab6f 100644
+index 9879761e806..e8cbe0ab6f6 100644
 --- a/luni/src/main/native/libcore_icu_ICU.cpp
 +++ b/luni/src/main/native/libcore_icu_ICU.cpp
@@ -651,7 +651,7 @@ static jstring ICU_getDefaultLocale(JNIEnv* env, jclass) {
@ -174,7 +174,7 @@ index 9879761e80..e8cbe0ab6f 100644
     NATIVE_METHOD(ICU, getBestDateTimePatternNative, "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"),
     NATIVE_METHOD(ICU, getCurrencyCode, "(Ljava/lang/String;)Ljava/lang/String;"),
 diff --git a/luni/src/main/native/libcore_icu_TimeZoneNames.cpp b/luni/src/main/native/libcore_icu_TimeZoneNames.cpp
-index db4c6f219f..f51ae12cd1 100644
+index db4c6f219fd..f51ae12cd11 100644
 --- a/luni/src/main/native/libcore_icu_TimeZoneNames.cpp
 +++ b/luni/src/main/native/libcore_icu_TimeZoneNames.cpp
@@ -97,7 +97,7 @@ static void TimeZoneNames_fillZoneStrings(JNIEnv* env, jclass, jstring javaLocal
@ -187,7 +187,7 @@ index db4c6f219f..f51ae12cd1 100644
 };
 void register_libcore_icu_TimeZoneNames(JNIEnv* env) {
 diff --git a/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp b/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp
-index 55803b8d8d..5b2627140b 100644
+index 55803b8d8d4..5b2627140b3 100644
 --- a/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp
 +++ b/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp
@@ -26,7 +26,7 @@ static void AsynchronousCloseMonitor_signalBlockedThreads(JNIEnv* env, jclass, j
@ -200,7 +200,7 @@ index 55803b8d8d..5b2627140b 100644
 };
 void register_libcore_io_AsynchronousCloseMonitor(JNIEnv* env) {
 diff --git a/luni/src/main/native/libcore_io_Linux.cpp b/luni/src/main/native/libcore_io_Linux.cpp
-index 9e44e63fe4..8fb6b56ac8 100644
+index 9e44e63fe44..8fb6b56ac82 100644
 --- a/luni/src/main/native/libcore_io_Linux.cpp
 +++ b/luni/src/main/native/libcore_io_Linux.cpp
@@ -2566,7 +2566,7 @@ static jint Linux_writev(JNIEnv* env, jobject, jobject javaFd, jobjectArray buff
@ -213,7 +213,7 @@ index 9e44e63fe4..8fb6b56ac8 100644
     NATIVE_METHOD(Linux, access, "(Ljava/lang/String;I)Z"),
     NATIVE_METHOD(Linux, android_fdsan_exchange_owner_tag, "(Ljava/io/FileDescriptor;JJ)V"),
 diff --git a/luni/src/main/native/libcore_io_Memory.cpp b/luni/src/main/native/libcore_io_Memory.cpp
-index a5b7b72a98..8400c5462d 100644
+index a5b7b72a98c..8400c5462de 100644
 --- a/luni/src/main/native/libcore_io_Memory.cpp
 +++ b/luni/src/main/native/libcore_io_Memory.cpp
@@ -289,7 +289,7 @@ static void Memory_unsafeBulkPut(JNIEnv* env, jclass, jbyteArray dstArray, jint
@ -226,7 +226,7 @@ index a5b7b72a98..8400c5462d 100644
     FAST_NATIVE_METHOD(Memory, peekByte, "(J)B"),
     NATIVE_METHOD(Memory, peekByteArray, "(J[BII)V"),
 diff --git a/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp b/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp
-index ded578a958..faaa5c7a7c 100644
+index ded578a9580..faaa5c7a7c4 100644
 --- a/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp
 +++ b/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp
@@ -29,7 +29,7 @@ static void NativeAllocationRegistry_applyFreeFunction(JNIEnv*,
@ -239,7 +239,7 @@ index ded578a958..faaa5c7a7c 100644
 };
 
 diff --git a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
-index 6df5bddf3b..68e19613b6 100644
+index 6df5bddf3bd..68e19613b6c 100644
 --- a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
 +++ b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
@@ -1365,7 +1365,7 @@ static void ExpatParser_staticInitialize(JNIEnv* env, jobject classObject, jstri
@ -261,7 +261,7 @@ index 6df5bddf3b..68e19613b6 100644
     NATIVE_METHOD(ExpatAttributes, getIndexForQName, "(JLjava/lang/String;)I"),
     NATIVE_METHOD(ExpatAttributes, getIndex, "(JLjava/lang/String;Ljava/lang/String;)I"),
 diff --git a/luni/src/main/native/sun_misc_Unsafe.cpp b/luni/src/main/native/sun_misc_Unsafe.cpp
-index 49848a2db2..87b2feac80 100644
+index 49848a2db2b..87b2feac807 100644
 --- a/luni/src/main/native/sun_misc_Unsafe.cpp
 +++ b/luni/src/main/native/sun_misc_Unsafe.cpp
@@ -23,7 +23,7 @@ static jobject Unsafe_allocateInstance(JNIEnv* env, jclass, jclass c) {
@ -274,7 +274,7 @@ index 49848a2db2..87b2feac80 100644
 };
 void register_sun_misc_Unsafe(JNIEnv* env) {
 diff --git a/ojluni/src/main/native/Adler32.c b/ojluni/src/main/native/Adler32.c
-index 11ef08d4c9..849df61067 100644
+index 11ef08d4c98..849df610674 100644
 --- a/ojluni/src/main/native/Adler32.c
 +++ b/ojluni/src/main/native/Adler32.c
@@ -70,7 +70,7 @@ Java_java_util_zip_Adler32_updateByteBuffer(JNIEnv *env, jclass cls, jint adler,
@ -287,7 +287,7 @@ index 11ef08d4c9..849df61067 100644
   NATIVE_METHOD(Adler32, updateBytes, "(I[BII)I"),
   NATIVE_METHOD(Adler32, updateByteBuffer, "(IJII)I"),
 diff --git a/ojluni/src/main/native/CRC32.c b/ojluni/src/main/native/CRC32.c
-index cec99de0eb..cb17feec59 100644
+index cec99de0eba..cb17feec591 100644
 --- a/ojluni/src/main/native/CRC32.c
 +++ b/ojluni/src/main/native/CRC32.c
@@ -74,7 +74,7 @@ CRC32_updateByteBuffer(JNIEnv *env, jclass cls, jint crc,
@ -300,7 +300,7 @@ index cec99de0eb..cb17feec59 100644
   NATIVE_METHOD(CRC32, updateBytes, "(I[BII)I"),
   NATIVE_METHOD(CRC32, updateByteBuffer, "(IJII)I"),
 diff --git a/ojluni/src/main/native/Character.cpp b/ojluni/src/main/native/Character.cpp
-index 9fb24c372c..a12ae6bd17 100644
+index 9fb24c372c3..a12ae6bd177 100644
 --- a/ojluni/src/main/native/Character.cpp
 +++ b/ojluni/src/main/native/Character.cpp
@@ -159,7 +159,7 @@ Character_getNameImpl(JNIEnv* env, jclass, jint codePoint) {
@ -313,7 +313,7 @@ index 9fb24c372c..a12ae6bd17 100644
   FAST_NATIVE_METHOD(Character, getDirectionalityImpl, "(I)B"),
   NATIVE_METHOD(Character, getNameImpl, "(I)Ljava/lang/String;"),
 diff --git a/ojluni/src/main/native/Console_md.c b/ojluni/src/main/native/Console_md.c
-index 13437be314..f87bd168b1 100644
+index 13437be314e..f87bd168b1a 100644
 --- a/ojluni/src/main/native/Console_md.c
 +++ b/ojluni/src/main/native/Console_md.c
@@ -72,7 +72,7 @@ Java_java_io_Console_echo(JNIEnv *env,
@ -326,7 +326,7 @@ index 13437be314..f87bd168b1 100644
     NATIVE_METHOD(Console, encoding, "()Ljava/lang/String;"),
     NATIVE_METHOD(Console, echo, "(Z)Z"),
 diff --git a/ojluni/src/main/native/DatagramChannelImpl.c b/ojluni/src/main/native/DatagramChannelImpl.c
-index 11d149ddcf..8a8444c8a2 100644
+index 11d149ddcf9..8a8444c8a2c 100644
 --- a/ojluni/src/main/native/DatagramChannelImpl.c
 +++ b/ojluni/src/main/native/DatagramChannelImpl.c
@@ -276,7 +276,7 @@ Java_sun_nio_ch_DatagramChannelImpl_send0(JNIEnv *env, jobject this,
@ -339,7 +339,7 @@ index 11d149ddcf..8a8444c8a2 100644
   NATIVE_METHOD(DatagramChannelImpl, disconnect0, "(Ljava/io/FileDescriptor;Z)V"),
   NATIVE_METHOD(DatagramChannelImpl, receive0, "(Ljava/io/FileDescriptor;JIZ)I"),
 diff --git a/ojluni/src/main/native/DatagramDispatcher.c b/ojluni/src/main/native/DatagramDispatcher.c
-index 36cc6cf4bc..39ff924179 100644
+index 36cc6cf4bc1..39ff9241791 100644
 --- a/ojluni/src/main/native/DatagramDispatcher.c
 +++ b/ojluni/src/main/native/DatagramDispatcher.c
@@ -139,7 +139,7 @@ Java_sun_nio_ch_DatagramDispatcher_writev0(JNIEnv *env, jclass clazz,
@ -352,7 +352,7 @@ index 36cc6cf4bc..39ff924179 100644
   NATIVE_METHOD(DatagramDispatcher, readv0, "(Ljava/io/FileDescriptor;JI)J"),
   NATIVE_METHOD(DatagramDispatcher, write0, "(Ljava/io/FileDescriptor;JI)I"),
 diff --git a/ojluni/src/main/native/Deflater.c b/ojluni/src/main/native/Deflater.c
-index 9ee032619d..2230f8c951 100644
+index 9ee032619dd..2230f8c9519 100644
 --- a/ojluni/src/main/native/Deflater.c
 +++ b/ojluni/src/main/native/Deflater.c
@@ -240,7 +240,7 @@ Deflater_end(JNIEnv *env, jclass cls, jlong addr)
@ -365,7 +365,7 @@ index 9ee032619d..2230f8c951 100644
   NATIVE_METHOD(Deflater, setDictionary, "(J[BII)V"),
   NATIVE_METHOD(Deflater, deflateBytes, "(J[BIII)I"),
 diff --git a/ojluni/src/main/native/Double.c b/ojluni/src/main/native/Double.c
-index 8382b88994..2bcb97a653 100644
+index 8382b889945..2bcb97a653f 100644
 --- a/ojluni/src/main/native/Double.c
 +++ b/ojluni/src/main/native/Double.c
@@ -63,7 +63,7 @@ Double_doubleToRawLongBits(JNIEnv *env, jclass unused, jdouble v)
@ -378,7 +378,7 @@ index 8382b88994..2bcb97a653 100644
   NATIVE_METHOD(Double, doubleToRawLongBits, "(D)J"),
 };
 diff --git a/ojluni/src/main/native/FileChannelImpl.c b/ojluni/src/main/native/FileChannelImpl.c
-index 51339dff9c..6d5c075e83 100644
+index 51339dff9c1..6d5c075e835 100644
 --- a/ojluni/src/main/native/FileChannelImpl.c
 +++ b/ojluni/src/main/native/FileChannelImpl.c
@@ -284,7 +284,7 @@ FileChannelImpl_transferTo0(JNIEnv *env, jobject this,
@ -391,7 +391,7 @@ index 51339dff9c..6d5c075e83 100644
   NATIVE_METHOD(FileChannelImpl, map0, "(IJJ)J"),
   NATIVE_METHOD(FileChannelImpl, unmap0, "(JJ)I"),
 diff --git a/ojluni/src/main/native/FileDescriptor_md.c b/ojluni/src/main/native/FileDescriptor_md.c
-index 0404263787..a00d799045 100644
+index 04042637876..a00d7990459 100644
 --- a/ojluni/src/main/native/FileDescriptor_md.c
 +++ b/ojluni/src/main/native/FileDescriptor_md.c
@@ -68,7 +68,7 @@ JNIEXPORT jboolean JNICALL FileDescriptor_isSocket(JNIEnv *env, jclass ignored,
@ -404,7 +404,7 @@ index 0404263787..a00d799045 100644
   NATIVE_METHOD(FileDescriptor, isSocket, "(I)Z"),
 };
 diff --git a/ojluni/src/main/native/FileDispatcherImpl.c b/ojluni/src/main/native/FileDispatcherImpl.c
-index 3e8e4f3e0f..facede4cf1 100644
+index 3e8e4f3e0f2..facede4cf14 100644
 --- a/ojluni/src/main/native/FileDispatcherImpl.c
 +++ b/ojluni/src/main/native/FileDispatcherImpl.c
@@ -287,7 +287,7 @@ FileDispatcherImpl_closeIntFD(JNIEnv *env, jclass clazz, jint fd)
@ -417,7 +417,7 @@ index 3e8e4f3e0f..facede4cf1 100644
   NATIVE_METHOD(FileDispatcherImpl, preClose0, "(Ljava/io/FileDescriptor;)V"),
   NATIVE_METHOD(FileDispatcherImpl, close0, "(Ljava/io/FileDescriptor;)V"),
 diff --git a/ojluni/src/main/native/FileInputStream.c b/ojluni/src/main/native/FileInputStream.c
-index 650cb6c904..bd2f64e68f 100644
+index 650cb6c9040..bd2f64e68f0 100644
 --- a/ojluni/src/main/native/FileInputStream.c
 +++ b/ojluni/src/main/native/FileInputStream.c
@@ -145,7 +145,7 @@ FileInputStream_available0(JNIEnv *env, jobject this) {
@ -430,7 +430,7 @@ index 650cb6c904..bd2f64e68f 100644
   NATIVE_METHOD(FileInputStream, available0, "()I"),
 };
 diff --git a/ojluni/src/main/native/FileKey.c b/ojluni/src/main/native/FileKey.c
-index c3b5d2a00f..61d3c2ae89 100644
+index c3b5d2a00fe..61d3c2ae896 100644
 --- a/ojluni/src/main/native/FileKey.c
 +++ b/ojluni/src/main/native/FileKey.c
@@ -68,7 +68,7 @@ FileKey_init(JNIEnv *env, jobject this, jobject fdo)
@ -443,7 +443,7 @@ index c3b5d2a00f..61d3c2ae89 100644
 };
 
 diff --git a/ojluni/src/main/native/FileSystemPreferences.c b/ojluni/src/main/native/FileSystemPreferences.c
-index 9a73150428..d49de07b61 100644
+index 9a731504281..d49de07b618 100644
 --- a/ojluni/src/main/native/FileSystemPreferences.c
 +++ b/ojluni/src/main/native/FileSystemPreferences.c
@@ -150,7 +150,7 @@ Java_java_util_prefs_FileSystemPreferences_unlockFile0(JNIEnv *env,
@ -456,7 +456,7 @@ index 9a73150428..d49de07b61 100644
     NATIVE_METHOD(FileSystemPreferences, unlockFile0, "(I)I"),
     NATIVE_METHOD(FileSystemPreferences, chmod, "(Ljava/lang/String;I)I"),
 diff --git a/ojluni/src/main/native/Float.c b/ojluni/src/main/native/Float.c
-index 956048d6b8..5bfdf58245 100644
+index 956048d6b8e..5bfdf58245d 100644
 --- a/ojluni/src/main/native/Float.c
 +++ b/ojluni/src/main/native/Float.c
@@ -59,7 +59,7 @@ Float_floatToRawIntBits(JNIEnv *env, jclass unused, jfloat v)
@ -469,7 +469,7 @@ index 956048d6b8..5bfdf58245 100644
   NATIVE_METHOD(Float, floatToRawIntBits, "(F)I"),
 };
 diff --git a/ojluni/src/main/native/IOUtil.c b/ojluni/src/main/native/IOUtil.c
-index 05949dab16..2ccb8795e4 100644
+index 05949dab164..2ccb8795e4a 100644
 --- a/ojluni/src/main/native/IOUtil.c
 +++ b/ojluni/src/main/native/IOUtil.c
@@ -206,7 +206,7 @@ fdval(JNIEnv *env, jobject fdo)
@ -482,7 +482,7 @@ index 05949dab16..2ccb8795e4 100644
   NATIVE_METHOD(IOUtil, fdLimit, "()I"),
   NATIVE_METHOD(IOUtil, drain, "(I)Z"),
 diff --git a/ojluni/src/main/native/Inflater.c b/ojluni/src/main/native/Inflater.c
-index c4c24f0fed..23b107426d 100644
+index c4c24f0fed1..23b107426db 100644
 --- a/ojluni/src/main/native/Inflater.c
 +++ b/ojluni/src/main/native/Inflater.c
@@ -201,7 +201,7 @@ Inflater_end(JNIEnv *env, jclass cls, jlong addr)
@ -495,7 +495,7 @@ index c4c24f0fed..23b107426d 100644
   NATIVE_METHOD(Inflater, setDictionary, "(J[BII)V"),
   NATIVE_METHOD(Inflater, inflateBytes, "(J[BII)I"),
 diff --git a/ojluni/src/main/native/MappedByteBuffer.c b/ojluni/src/main/native/MappedByteBuffer.c
-index 72e840a5c1..24bf6973c3 100644
+index 72e840a5c18..24bf6973c30 100644
 --- a/ojluni/src/main/native/MappedByteBuffer.c
 +++ b/ojluni/src/main/native/MappedByteBuffer.c
@@ -104,7 +104,7 @@ Java_java_nio_MappedByteBuffer_force0(JNIEnv *env, jobject obj, jobject fdo,
@ -508,7 +508,7 @@ index 72e840a5c1..24bf6973c3 100644
   NATIVE_METHOD(MappedByteBuffer, load0, "(JJ)V"),
   NATIVE_METHOD(MappedByteBuffer, force0, "(Ljava/io/FileDescriptor;JJ)V"),
 diff --git a/ojluni/src/main/native/Math.c b/ojluni/src/main/native/Math.c
-index 4bbcd1d0f1..f3423328d0 100644
+index 4bbcd1d0f1b..f3423328d0d 100644
 --- a/ojluni/src/main/native/Math.c
 +++ b/ojluni/src/main/native/Math.c
@@ -141,7 +141,7 @@ Math_rint(jdouble d) {
@ -521,7 +521,7 @@ index 4bbcd1d0f1..f3423328d0 100644
   FAST_NATIVE_METHOD(Math, acos, "(D)D"),
   FAST_NATIVE_METHOD(Math, asin, "(D)D"),
 diff --git a/ojluni/src/main/native/NativeThread.c b/ojluni/src/main/native/NativeThread.c
-index dc21e5dbc9..312b160a99 100644
+index dc21e5dbc90..312b160a993 100644
 --- a/ojluni/src/main/native/NativeThread.c
 +++ b/ojluni/src/main/native/NativeThread.c
@@ -108,7 +108,7 @@ NativeThread_signal(JNIEnv *env, jclass cl, jlong thread)
@ -534,7 +534,7 @@ index dc21e5dbc9..312b160a99 100644
   NATIVE_METHOD(NativeThread, signal, "(J)V"),
 };
 diff --git a/ojluni/src/main/native/Net.c b/ojluni/src/main/native/Net.c
-index bcf984e957..9b43e521b7 100644
+index bcf984e957b..9b43e521b79 100644
 --- a/ojluni/src/main/native/Net.c
 +++ b/ojluni/src/main/native/Net.c
@@ -868,7 +868,7 @@ handleSocketError(JNIEnv *env, jint errorValue) {
@ -547,7 +547,7 @@ index bcf984e957..9b43e521b7 100644
   NATIVE_METHOD(Net, isExclusiveBindAvailable, "()I"),
   NATIVE_METHOD(Net, canIPv6SocketJoinIPv4Group0, "()Z"),
 diff --git a/ojluni/src/main/native/ObjectInputStream.c b/ojluni/src/main/native/ObjectInputStream.c
-index 6f65dca5a5..6ba47e31dc 100644
+index 6f65dca5a56..6ba47e31dc1 100644
 --- a/ojluni/src/main/native/ObjectInputStream.c
 +++ b/ojluni/src/main/native/ObjectInputStream.c
@@ -175,7 +175,7 @@ Java_java_io_ObjectInputStream_bytesToDoubles(JNIEnv *env,
@ -560,7 +560,7 @@ index 6f65dca5a5..6ba47e31dc 100644
     NATIVE_METHOD(ObjectInputStream, bytesToDoubles, "([BI[DII)V"),
 };
 diff --git a/ojluni/src/main/native/ObjectOutputStream.c b/ojluni/src/main/native/ObjectOutputStream.c
-index 169a83f3f8..0e1479d6df 100644
+index 169a83f3f8d..0e1479d6df9 100644
 --- a/ojluni/src/main/native/ObjectOutputStream.c
 +++ b/ojluni/src/main/native/ObjectOutputStream.c
@@ -184,7 +184,7 @@ Java_java_io_ObjectOutputStream_doublesToBytes(JNIEnv *env,
@ -573,7 +573,7 @@ index 169a83f3f8..0e1479d6df 100644
     NATIVE_METHOD(ObjectOutputStream, doublesToBytes, "([DI[BII)V"),
 };
 diff --git a/ojluni/src/main/native/ObjectStreamClass.c b/ojluni/src/main/native/ObjectStreamClass.c
-index 3d3fdefa33..84cfcc43d3 100644
+index 3d3fdefa330..84cfcc43d3f 100644
 --- a/ojluni/src/main/native/ObjectStreamClass.c
 +++ b/ojluni/src/main/native/ObjectStreamClass.c
@@ -110,7 +110,7 @@ ObjectStreamClass_hasStaticInitializer(JNIEnv *env, jclass this,
@ -586,7 +586,7 @@ index 3d3fdefa33..84cfcc43d3 100644
 };
 
 diff --git a/ojluni/src/main/native/ProcessEnvironment_md.c b/ojluni/src/main/native/ProcessEnvironment_md.c
-index a59410badc..a3f46a4d4f 100644
+index a59410badc2..a3f46a4d4fd 100644
 --- a/ojluni/src/main/native/ProcessEnvironment_md.c
 +++ b/ojluni/src/main/native/ProcessEnvironment_md.c
@@ -91,7 +91,7 @@ ProcessEnvironment_environ(JNIEnv *env, jclass ign)
@ -599,7 +599,7 @@ index a59410badc..a3f46a4d4f 100644
 };
 
 diff --git a/ojluni/src/main/native/Runtime.c b/ojluni/src/main/native/Runtime.c
-index 749511eb08..5e8a2916f6 100644
+index 749511eb080..5e8a2916f6e 100644
 --- a/ojluni/src/main/native/Runtime.c
 +++ b/ojluni/src/main/native/Runtime.c
@@ -80,7 +80,7 @@ Runtime_nativeLoad(JNIEnv* env, jclass ignored, jstring javaFilename,
@ -612,7 +612,7 @@ index 749511eb08..5e8a2916f6 100644
   FAST_NATIVE_METHOD(Runtime, totalMemory, "()J"),
   FAST_NATIVE_METHOD(Runtime, maxMemory, "()J"),
 diff --git a/ojluni/src/main/native/ServerSocketChannelImpl.c b/ojluni/src/main/native/ServerSocketChannelImpl.c
-index 679811f96a..83a94f9b8e 100644
+index 679811f96ae..83a94f9b8e3 100644
 --- a/ojluni/src/main/native/ServerSocketChannelImpl.c
 +++ b/ojluni/src/main/native/ServerSocketChannelImpl.c
@@ -137,7 +137,7 @@ Java_sun_nio_ch_ServerSocketChannelImpl_accept0(JNIEnv *env, jobject this,
@ -625,7 +625,7 @@ index 679811f96a..83a94f9b8e 100644
   NATIVE_METHOD(Java_sun_nio_ch_ServerSocketChannelImpl, accept0,
                 "(Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;[Ljava/net/InetSocketAddress;)I"),
 diff --git a/ojluni/src/main/native/SocketChannelImpl.c b/ojluni/src/main/native/SocketChannelImpl.c
-index 94291659cf..9e54369054 100644
+index 94291659cf9..9e543690544 100644
 --- a/ojluni/src/main/native/SocketChannelImpl.c
 +++ b/ojluni/src/main/native/SocketChannelImpl.c
@@ -96,7 +96,7 @@ Java_sun_nio_ch_SocketChannelImpl_sendOutOfBandData(JNIEnv* env, jclass this,
@ -638,7 +638,7 @@ index 94291659cf..9e54369054 100644
   NATIVE_METHOD(SocketChannelImpl, sendOutOfBandData, "(Ljava/io/FileDescriptor;B)I"),
 };
 diff --git a/ojluni/src/main/native/SocketInputStream.c b/ojluni/src/main/native/SocketInputStream.c
-index dcea334fd1..aa10f4e9c1 100644
+index dcea334fd1f..aa10f4e9c1a 100644
 --- a/ojluni/src/main/native/SocketInputStream.c
 +++ b/ojluni/src/main/native/SocketInputStream.c
@@ -153,7 +153,7 @@ SocketInputStream_socketRead0(JNIEnv *env, jobject this,
@ -651,7 +651,7 @@ index dcea334fd1..aa10f4e9c1 100644
 };
 
 diff --git a/ojluni/src/main/native/SocketOutputStream.c b/ojluni/src/main/native/SocketOutputStream.c
-index bc3522bee3..d72fd1108b 100644
+index bc3522bee35..d72fd1108ba 100644
 --- a/ojluni/src/main/native/SocketOutputStream.c
 +++ b/ojluni/src/main/native/SocketOutputStream.c
@@ -128,7 +128,7 @@ SocketOutputStream_socketWrite0(JNIEnv *env, jobject this,
@ -664,7 +664,7 @@ index bc3522bee3..d72fd1108b 100644
 };
 
 diff --git a/ojluni/src/main/native/StrictMath.c b/ojluni/src/main/native/StrictMath.c
-index 7f9bbebcdf..24b29228a4 100644
+index 7f9bbebcdf7..24b29228a46 100644
 --- a/ojluni/src/main/native/StrictMath.c
 +++ b/ojluni/src/main/native/StrictMath.c
@@ -156,7 +156,7 @@ StrictMath_expm1(JNIEnv *env, jclass unused, jdouble d)
@ -677,7 +677,7 @@ index 7f9bbebcdf..24b29228a4 100644
   NATIVE_METHOD(StrictMath, sin, "(D)D"),
   NATIVE_METHOD(StrictMath, tan, "(D)D"),
 diff --git a/ojluni/src/main/native/System.c b/ojluni/src/main/native/System.c
-index 39332ce5ed..582e06d1e0 100644
+index 39332ce5ed8..582e06d1e07 100644
 --- a/ojluni/src/main/native/System.c
 +++ b/ojluni/src/main/native/System.c
@@ -261,7 +261,7 @@ static jlong System_currentTimeMillis() {
@ -690,7 +690,7 @@ index 39332ce5ed..582e06d1e0 100644
   NATIVE_METHOD(System, setErr0, "(Ljava/io/PrintStream;)V"),
   NATIVE_METHOD(System, setOut0, "(Ljava/io/PrintStream;)V"),
 diff --git a/ojluni/src/main/native/UNIXProcess_md.c b/ojluni/src/main/native/UNIXProcess_md.c
-index 40fdc18fb8..87ceaac4fe 100644
+index 40fdc18fb8a..87ceaac4fe9 100644
 --- a/ojluni/src/main/native/UNIXProcess_md.c
 +++ b/ojluni/src/main/native/UNIXProcess_md.c
@@ -991,7 +991,7 @@ UNIXProcess_destroyProcess(JNIEnv *env, jobject junk, jint pid)
@ -703,7 +703,7 @@ index 40fdc18fb8..87ceaac4fe 100644
   NATIVE_METHOD(UNIXProcess, forkAndExec, "([B[BI[BI[B[IZ)I"),
   NATIVE_METHOD(UNIXProcess, waitForProcessExit, "(I)I"),
 diff --git a/ojluni/src/main/native/UnixFileSystem_md.c b/ojluni/src/main/native/UnixFileSystem_md.c
-index 9c1ca05052..bc7ee22d57 100644
+index 9c1ca050524..bc7ee22d577 100644
 --- a/ojluni/src/main/native/UnixFileSystem_md.c
 +++ b/ojluni/src/main/native/UnixFileSystem_md.c
@@ -497,7 +497,7 @@ Java_java_io_UnixFileSystem_getSpace0(JNIEnv *env, jobject this,
@ -716,7 +716,7 @@ index 9c1ca05052..bc7ee22d57 100644
     NATIVE_METHOD(UnixFileSystem, canonicalize0, "(Ljava/lang/String;)Ljava/lang/String;"),
     NATIVE_METHOD(UnixFileSystem, getBooleanAttributes0, "(Ljava/lang/String;)I"),
 diff --git a/ojluni/src/main/native/ZipFile.c b/ojluni/src/main/native/ZipFile.c
-index daf5d8efff..78b26fdfa5 100644
+index daf5d8effff..78b26fdfa57 100644
 --- a/ojluni/src/main/native/ZipFile.c
 +++ b/ojluni/src/main/native/ZipFile.c
@@ -393,7 +393,7 @@ JarFile_getMetaInfEntryNames(JNIEnv *env, jobject obj)
--- a/Patches/LineageOS-18.1/android_libcore/0003-Exec_Based_Spawning-1.patch
+++ b/Patches/LineageOS-18.1/android_libcore/0003-Exec_Based_Spawning-1.patch
@ -9,7 +9,7 @@ Subject: [PATCH] add parameter for avoiding full preload with exec
 2 files changed, 4 insertions(+), 4 deletions(-)

 diff --git a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
-index 7e8fe3651e..de5a056143 100644
+index 7e8fe3651ec..de5a0561430 100644
 --- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
 +++ b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
@@ -48,7 +48,7 @@ public final class ZygoteHooks {
@ -31,7 +31,7 @@ index 7e8fe3651e..de5a056143 100644
         CacheValue.setStrength(CacheValue.Strength.SOFT);
 
 diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt
-index 15a0a48d8c..ac810f45fa 100644
+index 15a0a48d8c5..ac810f45faf 100644
 --- a/mmodules/core_platform_api/api/platform/current-api.txt
 +++ b/mmodules/core_platform_api/api/platform/current-api.txt
@@ -745,8 +745,8 @@ package dalvik.system {
--- a/Patches/LineageOS-18.1/android_libcore/0003-Exec_Based_Spawning-2.patch
+++ b/Patches/LineageOS-18.1/android_libcore/0003-Exec_Based_Spawning-2.patch
@ -8,7 +8,7 @@ Subject: [PATCH] disable ICU cache pinning for exec spawning
 1 file changed, 15 insertions(+), 11 deletions(-)

 diff --git a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
-index de5a056143..e77cec2517 100644
+index de5a0561430..e77cec25172 100644
 --- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
 +++ b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
@@ -49,15 +49,17 @@ public final class ZygoteHooks {
--- a/Patches/LineageOS-19.1/android_frameworks_base/0023-Skip_Screen_Animation.patch
+++ b/Patches/LineageOS-19.1/android_frameworks_base/0023-Skip_Screen_Animation.patch
@ -14,10 +14,10 @@ Change-Id: I87276128456afd9f535742477d9f76d025a12539
 1 file changed, 1 insertion(+), 2 deletions(-)

 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
-index 7141e2801f10..dbc620f4b8f2 100644
+index 6caf96f885a8..14880bbfe882 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
-@@ -3933,8 +3933,7 @@ public class StatusBar extends SystemUI implements
+@@ -3944,8 +3944,7 @@ public class StatusBar extends SystemUI implements
 
         boolean launchingAffordanceWithPreview =
                 mNotificationPanelViewController.isLaunchingAffordanceWithPreview();
--- a/Patches/LineageOS-19.1/android_frameworks_base/0024-Burnin_Protection.patch
+++ b/Patches/LineageOS-19.1/android_frameworks_base/0024-Burnin_Protection.patch
@ -151,7 +151,7 @@ index d7b6fe9c708f..ae6c080a2f60 100644
     }
 
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
-index dbc620f4b8f2..8595aa23d316 100644
+index 14880bbfe882..57db9fa28e20 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -230,6 +230,7 @@ import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController;
@ -192,7 +192,7 @@ index dbc620f4b8f2..8595aa23d316 100644
             if (mLaunchCameraOnFinishedGoingToSleep) {
                 mLaunchCameraOnFinishedGoingToSleep = false;
 
-@@ -3792,6 +3802,9 @@ public class StatusBar extends SystemUI implements
+@@ -3803,6 +3813,9 @@ public class StatusBar extends SystemUI implements
                 }
             }
             updateScrimController();
--- a/Patches/LineageOS-19.1/android_frameworks_base/326692.patch
+++ b/Patches/LineageOS-19.1/android_frameworks_base/326692.patch
@ -14,10 +14,10 @@ Change-Id: I5f98259eb992b2f43872f957fcb0092412fe558c
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
-index 6552e1e9c522..7141e2801f10 100644
+index ea951d79ad63..6caf96f885a8 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
-@@ -3933,7 +3933,8 @@ public class StatusBar extends SystemUI implements
+@@ -3944,7 +3944,8 @@ public class StatusBar extends SystemUI implements
 
         boolean launchingAffordanceWithPreview =
                 mNotificationPanelViewController.isLaunchingAffordanceWithPreview();
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@ -73,7 +73,7 @@ sed -i '296iLOCAL_AAPT_FLAGS += --auto-add-overlay' core/package_internal.mk;
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk; fi; #Replace the Messaging app with Silence
 awk -i inplace '!/Email/' target/product/core.mk; #Remove Email
 awk -i inplace '!/Exchange2/' target/product/core.mk;
-sed -i 's/2021-06-05/2022-09-05/' core/version_defaults.mk; #Bump Security String #n-asb-2022-09 #XXX
+sed -i 's/2021-06-05/2022-10-05/' core/version_defaults.mk; #Bump Security String #n-asb-2022-10 #XXX
 fi;

 if enterAndClear "device/qcom/sepolicy"; then
@ -109,6 +109,7 @@ applyPatch "$DOS_PATCHES/android_external_libnfc-nci/318515.patch"; #n-asb-2021-
 applyPatch "$DOS_PATCHES/android_external_libnfc-nci/332458.patch"; #n-asb-2022-06 Out of Bounds Read in nfa_dm_check_set_config
 applyPatch "$DOS_PATCHES/android_external_libnfc-nci/332459.patch"; #n-asb-2022-06 OOBR in nfc_ncif_proc_ee_discover_req()
 applyPatch "$DOS_PATCHES/android_external_libnfc-nci/332460.patch"; #n-asb-2022-06 Double Free in ce_t4t_data_cback
+applyPatch "$DOS_PATCHES/android_external_libnfc-nci/341071.patch"; #n-asb-2022-10 The length of a packet should be non-zero
 fi;

 if enterAndClear "external/sonivox"; then
@ -379,6 +380,7 @@ applyPatch "$DOS_PATCHES/android_system_bt/334877.patch"; #n-asb-2022-08 Removin
 applyPatch "$DOS_PATCHES/android_system_bt/337998.patch"; #n-asb-2022-09 Fix OOB in BNEP_Write
 applyPatch "$DOS_PATCHES/android_system_bt/337999.patch"; #n-asb-2022-09 Fix OOB in bnep_is_packet_allowed
 applyPatch "$DOS_PATCHES/android_system_bt/338000.patch"; #n-asb-2022-09 Fix OOB in reassemble_and_dispatch
+applyPatch "$DOS_PATCHES/android_system_bt/341070.patch"; #n-asb-2022-10 Fix potential interger overflow when parsing vendor response
 applyPatch "$DOS_PATCHES/android_system_bt/229574.patch"; #Increase maximum Bluetooth SBC codec bitrate for SBC HD (ValdikSS)
 applyPatch "$DOS_PATCHES/android_system_bt/229575.patch"; #Explicit SBC Dual Channel (SBC HD) support (ValdikSS)
 applyPatch "$DOS_PATCHES/android_system_bt/242134.patch"; #avrc_bld_get_attrs_rsp - fix attribute length position off by one (cprhokie)
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@ -61,7 +61,7 @@ buildAll() {
 	#SD820
 	buildDevice griffin;
 	#SD730
-	buildDevice davinci avb; #missing deps
+	buildDevice davinci avb; #broken - missing deps
 	#SD660
 	buildDevice Amber verity;
 	#SD765
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@ -93,7 +93,7 @@ buildAll() {
 	buildDevice us996;
 	buildDevice vs995;
 	buildDevice oneplus3 verity; #needs manual patching - broken yyloc
-	buildDevice z2_plus verity;
+	buildDevice z2_plus verity; #broken
 	#SD821
 	buildDevice marlin verity;
 	buildDevice sailfish verity;
--- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_essential_msm8998.sh
+++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_essential_msm8998.sh
@ -129,9 +129,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch
@ -152,5 +149,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch
-editKernelLocalversion "-dos.p152"
+editKernelLocalversion "-dos.p149"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-19.1/Patch.sh
+++ b/Scripts/LineageOS-19.1/Patch.sh
@ -477,6 +477,7 @@ cd "$DOS_BUILD_BASE";
 sed -i "s/CONFIG_PREEMPT_TRACER=n/CONFIG_PREEMPT_TRACER=y/" kernel/fairphone/sdm632/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile
 sed -i "s/CONFIG_DEBUG_NOTIFIERS=y/# CONFIG_DEBUG_NOTIFIERS is not set/" kernel/google/msm-4.9/arch/arm64/configs/*_defconfig; #Likely breaks boot
 echo -e "\nCONFIG_DEBUG_FS=y" >> kernel/oneplus/sm8150/arch/arm64/configs/vendor/sm8150-perf_defconfig;
+echo -e "\nCONFIG_DEBUG_FS=n" >> kernel/oneplus/sm8250/arch/arm64/configs/vendor/kona-perf_defconfig;

 sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
 rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true;