diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-1.patch b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-1.patch index a9284e34..c0d90002 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-1.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-1.patch @@ -1,4 +1,4 @@ -From 750efbf6bce8bbe850679eb6a90b00108314226c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sat, 14 Mar 2015 18:10:20 -0400 Subject: [PATCH] add exec-based spawning support @@ -135,7 +135,7 @@ diff --git a/core/java/com/android/internal/os/WrapperInit.java b/core/java/com/ index f0e779694c90..9f41a4136db9 100644 --- a/core/java/com/android/internal/os/WrapperInit.java +++ b/core/java/com/android/internal/os/WrapperInit.java -@@ -183,7 +183,7 @@ private static Runnable wrapperInit(int targetSdkVersion, String[] argv) { +@@ -183,7 +183,7 @@ public class WrapperInit { * This is acceptable here as failure will leave the wrapped app with strictly less * capabilities, which may make it crash, but not exceed its allowances. */ @@ -148,7 +148,7 @@ diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java index f537e3e2897b..7d51be259c20 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java -@@ -880,6 +880,13 @@ private Runnable handleChildProc(Arguments parsedArgs, FileDescriptor[] descript +@@ -880,6 +880,13 @@ class ZygoteConnection { throw new IllegalStateException("WrapperInit.execApplication unexpectedly returned"); } else { if (!isZygote) { diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-10.patch b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-10.patch index 73eb19d1..218976a3 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-10.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-10.patch @@ -1,4 +1,4 @@ -From 8806ec3ef166fe1fd1eeb690ace6dd5a7682195c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 21 May 2019 23:54:20 -0400 Subject: [PATCH] disable exec spawning when using debugging options @@ -13,7 +13,7 @@ diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java index 7d51be259c20..48a68d96e84c 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java -@@ -880,7 +880,7 @@ private Runnable handleChildProc(Arguments parsedArgs, FileDescriptor[] descript +@@ -880,7 +880,7 @@ class ZygoteConnection { throw new IllegalStateException("WrapperInit.execApplication unexpectedly returned"); } else { if (!isZygote) { diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-2.patch b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-2.patch index 5a6eacd4..73dd1584 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-2.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-2.patch @@ -1,4 +1,4 @@ -From ed563b6f26452581f9dba1c1ef245e893f5045ca Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:24:21 -0400 Subject: [PATCH] add parameter for avoiding full preload with exec @@ -12,7 +12,7 @@ diff --git a/core/java/com/android/internal/os/ExecInit.java b/core/java/com/and index 10edd64e0f95..3ba4664ae8cf 100644 --- a/core/java/com/android/internal/os/ExecInit.java +++ b/core/java/com/android/internal/os/ExecInit.java -@@ -33,7 +33,7 @@ public static void main(String[] args) { +@@ -33,7 +33,7 @@ public class ExecInit { // Mimic system Zygote preloading. ZygoteInit.preload(new TimingsTraceLog("ExecInitTiming", @@ -25,7 +25,7 @@ diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/a index da195601f725..6acaccbbc3ef 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -120,7 +120,7 @@ +@@ -120,7 +120,7 @@ public class ZygoteInit { private static boolean sPreloadComplete; @@ -34,7 +34,7 @@ index da195601f725..6acaccbbc3ef 100644 Log.d(TAG, "begin preload"); bootTimingsTraceLog.traceBegin("BeginIcuCachePinning"); beginIcuCachePinning(); -@@ -149,6 +149,10 @@ static void preload(TimingsTraceLog bootTimingsTraceLog) { +@@ -149,6 +149,10 @@ public class ZygoteInit { sPreloadComplete = true; } diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-3.patch b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-3.patch index fd5e290e..85b9954e 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-3.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-3.patch @@ -1,4 +1,4 @@ -From aad3c7d750f9814344514cb187112e50574bb382 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:28:27 -0400 Subject: [PATCH] disable OpenGL preloading for exec spawning @@ -11,7 +11,7 @@ diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/a index 6acaccbbc3ef..09ec9f235451 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -134,9 +134,11 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -134,9 +134,11 @@ public class ZygoteInit { Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadAppProcessHALs"); nativePreloadAppProcessHALs(); Trace.traceEnd(Trace.TRACE_TAG_DALVIK); diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-4.patch b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-4.patch index dcb8a244..24b9d2ed 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-4.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-4.patch @@ -1,4 +1,4 @@ -From da3180f9a8e75b10826ce2faf046c0f3912dfd59 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:28:52 -0400 Subject: [PATCH] disable resource preloading for exec spawning @@ -11,7 +11,7 @@ diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/a index 09ec9f235451..17bdfaa79d0b 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -128,9 +128,11 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -128,9 +128,11 @@ public class ZygoteInit { bootTimingsTraceLog.traceBegin("PreloadClasses"); preloadClasses(); bootTimingsTraceLog.traceEnd(); // PreloadClasses diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-5.patch b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-5.patch index 8f1b4a2a..18cd0892 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-5.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-5.patch @@ -1,4 +1,4 @@ -From 68773a29b77d6e87201b3af1b0b21e9385a1bdb0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:29:36 -0400 Subject: [PATCH] disable ICU cache pinning for exec spawning @@ -11,7 +11,7 @@ diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/a index 17bdfaa79d0b..1dfe23e32937 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -122,9 +122,11 @@ +@@ -122,9 +122,11 @@ public class ZygoteInit { static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { Log.d(TAG, "begin preload"); @@ -26,7 +26,7 @@ index 17bdfaa79d0b..1dfe23e32937 100644 bootTimingsTraceLog.traceBegin("PreloadClasses"); preloadClasses(); bootTimingsTraceLog.traceEnd(); // PreloadClasses -@@ -146,7 +148,9 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -146,7 +148,9 @@ public class ZygoteInit { // Ask the WebViewFactory to do any initialization that must run in the zygote process, // for memory sharing purposes. WebViewFactory.prepareWebViewInZygote(); diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-6.patch b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-6.patch index 64af40ee..0f5b610a 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-6.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-6.patch @@ -1,4 +1,4 @@ -From 283b3fa09c002861fa5525a2be8071953e05e794 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:30:59 -0400 Subject: [PATCH] disable class preloading for exec spawning @@ -11,7 +11,7 @@ diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/a index 1dfe23e32937..fae438512d8f 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -127,9 +127,11 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -127,9 +127,11 @@ public class ZygoteInit { beginIcuCachePinning(); bootTimingsTraceLog.traceEnd(); // BeginIcuCachePinning } diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-7.patch b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-7.patch index 4e63c251..03973e1c 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-7.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-7.patch @@ -1,4 +1,4 @@ -From f133136b65841735895ec15acdd2c60ecd45e72d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:31:29 -0400 Subject: [PATCH] disable WebView reservation for exec spawning @@ -11,7 +11,7 @@ diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/a index fae438512d8f..75d10f6d92a8 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -147,9 +147,11 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -147,9 +147,11 @@ public class ZygoteInit { } preloadSharedLibraries(); preloadTextResources(); diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-8.patch b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-8.patch index 0704594e..2823c300 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-8.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-8.patch @@ -1,4 +1,4 @@ -From 01a01ce5f6570f31232bc488da5683481ca32388 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:34:32 -0400 Subject: [PATCH] disable JCA provider warm up for exec spawning @@ -11,7 +11,7 @@ diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/a index 75d10f6d92a8..214dbd451099 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -155,7 +155,7 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -155,7 +155,7 @@ public class ZygoteInit { if (fullPreload) { endIcuCachePinning(); } @@ -20,7 +20,7 @@ index 75d10f6d92a8..214dbd451099 100644 Log.d(TAG, "end preload"); sPreloadComplete = true; -@@ -223,7 +223,7 @@ private static void preloadTextResources() { +@@ -223,7 +223,7 @@ public class ZygoteInit { * By doing it here we avoid that each app does it when requesting a service from the * provider for the first time. */ @@ -29,7 +29,7 @@ index 75d10f6d92a8..214dbd451099 100644 long startTime = SystemClock.uptimeMillis(); Trace.traceBegin( Trace.TRACE_TAG_DALVIK, "Starting installation of AndroidKeyStoreProvider"); -@@ -235,15 +235,17 @@ private static void warmUpJcaProviders() { +@@ -235,15 +235,17 @@ public class ZygoteInit { + (SystemClock.uptimeMillis() - startTime) + "ms."); Trace.traceEnd(Trace.TRACE_TAG_DALVIK); diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-9.patch b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-9.patch index 7ce1df69..fdf4cd19 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-9.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0010-Exec_Based_Spawning-9.patch @@ -1,4 +1,4 @@ -From 17c309c0988ccea718ee0779d23387d6af40a80d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 15:11:59 -0400 Subject: [PATCH] avoid AssetManager errors with exec spawning diff --git a/Patches/LineageOS-17.1/android_build_soong/0002-auto_var_init.patch b/Patches/LineageOS-17.1/android_build_soong/0002-auto_var_init.patch index 89dfb955..8db8b948 100644 --- a/Patches/LineageOS-17.1/android_build_soong/0002-auto_var_init.patch +++ b/Patches/LineageOS-17.1/android_build_soong/0002-auto_var_init.patch @@ -1,4 +1,4 @@ -From af24d46eff1f846432eb5e9ff8365edde901addd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 8 Apr 2020 10:42:11 -0400 Subject: [PATCH] enable -ftrivial-auto-var-init=zero diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-1.patch b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-1.patch index f741a569..bc59aa39 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-1.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-1.patch @@ -1,4 +1,4 @@ -From 527787f3c82d385c98c2e954bbbf092937100085 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sat, 14 Mar 2015 18:10:20 -0400 Subject: [PATCH] add exec-based spawning support @@ -135,7 +135,7 @@ diff --git a/core/java/com/android/internal/os/WrapperInit.java b/core/java/com/ index f0e779694c90..9f41a4136db9 100644 --- a/core/java/com/android/internal/os/WrapperInit.java +++ b/core/java/com/android/internal/os/WrapperInit.java -@@ -183,7 +183,7 @@ private static Runnable wrapperInit(int targetSdkVersion, String[] argv) { +@@ -183,7 +183,7 @@ public class WrapperInit { * This is acceptable here as failure will leave the wrapped app with strictly less * capabilities, which may make it crash, but not exceed its allowances. */ @@ -145,10 +145,10 @@ index f0e779694c90..9f41a4136db9 100644 OsConstants._LINUX_CAPABILITY_VERSION_3, 0); StructCapUserData[] data; diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java -index e556dd4d8243..1054d2fb9b13 100644 +index 52d0adba0a05..96348aa30b87 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java -@@ -33,6 +33,7 @@ +@@ -33,6 +33,7 @@ import android.net.Credentials; import android.net.LocalSocket; import android.os.Parcel; import android.os.Process; @@ -156,7 +156,7 @@ index e556dd4d8243..1054d2fb9b13 100644 import android.os.Trace; import android.system.ErrnoException; import android.system.Os; -@@ -596,6 +597,13 @@ private Runnable handleChildProc(ZygoteArguments parsedArgs, FileDescriptor[] de +@@ -595,6 +596,13 @@ class ZygoteConnection { throw new IllegalStateException("WrapperInit.execApplication unexpectedly returned"); } else { if (!isZygote) { diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-10.patch b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-10.patch index 5edae6e6..00a8e3b0 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-10.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-10.patch @@ -1,4 +1,4 @@ -From ce6dcc2368fbf817c1c7ae2595b0367750b741dc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:34:32 -0400 Subject: [PATCH] disable JCA provider warm up for exec spawning @@ -8,10 +8,10 @@ Subject: [PATCH] disable JCA provider warm up for exec spawning 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java -index 94e58405ce63..dbd24ef27d26 100644 +index b711db51db05..209b9f6855fd 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -166,7 +166,7 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -166,7 +166,7 @@ public class ZygoteInit { WebViewFactory.prepareWebViewInZygote(); } endPreload(fullPreload); @@ -20,7 +20,7 @@ index 94e58405ce63..dbd24ef27d26 100644 Log.d(TAG, "end preload"); sPreloadComplete = true; -@@ -230,7 +230,7 @@ private static void preloadTextResources() { +@@ -230,7 +230,7 @@ public class ZygoteInit { * By doing it here we avoid that each app does it when requesting a service from the provider * for the first time. */ @@ -29,7 +29,7 @@ index 94e58405ce63..dbd24ef27d26 100644 long startTime = SystemClock.uptimeMillis(); Trace.traceBegin( Trace.TRACE_TAG_DALVIK, "Starting installation of AndroidKeyStoreProvider"); -@@ -242,15 +242,17 @@ private static void warmUpJcaProviders() { +@@ -242,15 +242,17 @@ public class ZygoteInit { + (SystemClock.uptimeMillis() - startTime) + "ms."); Trace.traceEnd(Trace.TRACE_TAG_DALVIK); diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-11.patch b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-11.patch index dc8f4972..af3e2803 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-11.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-11.patch @@ -1,4 +1,4 @@ -From 3d3d5c4d38a1614ba6e9c8baa517516bdb647223 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 11 Sep 2019 06:57:24 -0400 Subject: [PATCH] disable preloading classloaders for exec spawning @@ -8,10 +8,10 @@ Subject: [PATCH] disable preloading classloaders for exec spawning 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java -index dbd24ef27d26..bf6234b565e1 100644 +index 209b9f6855fd..31c6ce82ca93 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -142,9 +142,11 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -142,9 +142,11 @@ public class ZygoteInit { preloadClasses(); bootTimingsTraceLog.traceEnd(); // PreloadClasses } diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-12.patch b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-12.patch index 6d6eaae6..5e7eaebf 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-12.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-12.patch @@ -1,4 +1,4 @@ -From 2eda592b79edd89907769fbc9e8ad175523bff0b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 11 Sep 2019 06:58:51 -0400 Subject: [PATCH] disable preloading HALs for exec spawning @@ -8,10 +8,10 @@ Subject: [PATCH] disable preloading HALs for exec spawning 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java -index bf6234b565e1..b00fd9969a54 100644 +index 31c6ce82ca93..9bdea9b4164c 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -152,9 +152,11 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -152,9 +152,11 @@ public class ZygoteInit { preloadResources(); bootTimingsTraceLog.traceEnd(); // PreloadResources } diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-2.patch b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-2.patch index c71f386a..86f8e448 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-2.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-2.patch @@ -1,4 +1,4 @@ -From ffde474ad7e72c72367f16a231bc30ea8ee3311b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 15:11:59 -0400 Subject: [PATCH] avoid AssetManager errors with exec spawning diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-3.patch b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-3.patch index e381b7b9..e23e9b6a 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-3.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-3.patch @@ -1,4 +1,4 @@ -From aa87e487c42e3f23b42ac151fc6a37f5cb4751e7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 21 May 2019 23:54:20 -0400 Subject: [PATCH] disable exec spawning when using debugging options @@ -10,10 +10,10 @@ spawning when doing debugging. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java -index 1054d2fb9b13..b420385b1de6 100644 +index 96348aa30b87..a3051979e341 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java -@@ -597,7 +597,8 @@ private Runnable handleChildProc(ZygoteArguments parsedArgs, FileDescriptor[] de +@@ -596,7 +596,8 @@ class ZygoteConnection { throw new IllegalStateException("WrapperInit.execApplication unexpectedly returned"); } else { if (!isZygote) { diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-4.patch b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-4.patch index cba4be2a..fb8f5f7f 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-4.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-4.patch @@ -1,4 +1,4 @@ -From c906fe97221c7f48d5e8a6be508fb85f8df113b1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:24:21 -0400 Subject: [PATCH] add parameter for avoiding full preload with exec @@ -12,7 +12,7 @@ diff --git a/core/java/com/android/internal/os/ExecInit.java b/core/java/com/and index 10edd64e0f95..3ba4664ae8cf 100644 --- a/core/java/com/android/internal/os/ExecInit.java +++ b/core/java/com/android/internal/os/ExecInit.java -@@ -33,7 +33,7 @@ public static void main(String[] args) { +@@ -33,7 +33,7 @@ public class ExecInit { // Mimic system Zygote preloading. ZygoteInit.preload(new TimingsTraceLog("ExecInitTiming", @@ -22,10 +22,10 @@ index 10edd64e0f95..3ba4664ae8cf 100644 // Launch the application. String[] runtimeArgs = new String[args.length - 1]; diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java -index 7ec8309e47de..e59cb784dc78 100644 +index 226f03ff9abb..4f89585af067 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -132,7 +132,7 @@ +@@ -132,7 +132,7 @@ public class ZygoteInit { */ private static ClassLoader sCachedSystemServerClassLoader = null; @@ -34,7 +34,7 @@ index 7ec8309e47de..e59cb784dc78 100644 Log.d(TAG, "begin preload"); bootTimingsTraceLog.traceBegin("BeginPreload"); beginPreload(); -@@ -164,6 +164,10 @@ static void preload(TimingsTraceLog bootTimingsTraceLog) { +@@ -164,6 +164,10 @@ public class ZygoteInit { sPreloadComplete = true; } diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-5.patch b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-5.patch index d67d996e..ff173120 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-5.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-5.patch @@ -1,4 +1,4 @@ -From c69c3eecd4f34a932760303e10e3a47798335f7e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 11 Sep 2019 06:43:55 -0400 Subject: [PATCH] pass through fullPreload to libcore @@ -8,10 +8,10 @@ Subject: [PATCH] pass through fullPreload to libcore 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java -index e59cb784dc78..22e3f549dad5 100644 +index 4f89585af067..51e0e82ea152 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -135,7 +135,7 @@ +@@ -135,7 +135,7 @@ public class ZygoteInit { static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { Log.d(TAG, "begin preload"); bootTimingsTraceLog.traceBegin("BeginPreload"); @@ -20,7 +20,7 @@ index e59cb784dc78..22e3f549dad5 100644 bootTimingsTraceLog.traceEnd(); // BeginPreload bootTimingsTraceLog.traceBegin("PreloadClasses"); preloadClasses(); -@@ -157,7 +157,7 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -157,7 +157,7 @@ public class ZygoteInit { // Ask the WebViewFactory to do any initialization that must run in the zygote process, // for memory sharing purposes. WebViewFactory.prepareWebViewInZygote(); @@ -29,7 +29,7 @@ index e59cb784dc78..22e3f549dad5 100644 warmUpJcaProviders(); Log.d(TAG, "end preload"); -@@ -175,14 +175,14 @@ public static void lazyPreload() { +@@ -175,14 +175,14 @@ public class ZygoteInit { preload(new TimingsTraceLog("ZygoteInitTiming_lazy", Trace.TRACE_TAG_DALVIK)); } diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-6.patch b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-6.patch index 5053a7b8..a9697fa4 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-6.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-6.patch @@ -1,4 +1,4 @@ -From b2303adccc82b89f19a6f4af8834443fa7e01b67 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:28:27 -0400 Subject: [PATCH] disable OpenGL preloading for exec spawning @@ -8,10 +8,10 @@ Subject: [PATCH] disable OpenGL preloading for exec spawning 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java -index 22e3f549dad5..37be8d97987a 100644 +index 51e0e82ea152..4ae9a57749fb 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -149,9 +149,11 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -149,9 +149,11 @@ public class ZygoteInit { Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadAppProcessHALs"); nativePreloadAppProcessHALs(); Trace.traceEnd(Trace.TRACE_TAG_DALVIK); diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-7.patch b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-7.patch index 290ec13f..11d20bb0 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-7.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-7.patch @@ -1,4 +1,4 @@ -From 5bb05db6f73992cc345d3662652bea024f3ace3b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:28:52 -0400 Subject: [PATCH] disable resource preloading for exec spawning @@ -8,10 +8,10 @@ Subject: [PATCH] disable resource preloading for exec spawning 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java -index 37be8d97987a..34c9f8530a72 100644 +index 4ae9a57749fb..23858572ce8c 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -143,9 +143,11 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -143,9 +143,11 @@ public class ZygoteInit { bootTimingsTraceLog.traceBegin("CacheNonBootClasspathClassLoaders"); cacheNonBootClasspathClassLoaders(); bootTimingsTraceLog.traceEnd(); // CacheNonBootClasspathClassLoaders diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-8.patch b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-8.patch index d3d7d826..283359d7 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-8.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-8.patch @@ -1,4 +1,4 @@ -From 536b4976880224d8518e9208f4e3caacf79e64c9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:30:59 -0400 Subject: [PATCH] disable class preloading for exec spawning @@ -8,10 +8,10 @@ Subject: [PATCH] disable class preloading for exec spawning 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java -index 34c9f8530a72..0404ef53ca01 100644 +index 23858572ce8c..c5ae8f3de0be 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -137,9 +137,11 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -137,9 +137,11 @@ public class ZygoteInit { bootTimingsTraceLog.traceBegin("BeginPreload"); beginPreload(fullPreload); bootTimingsTraceLog.traceEnd(); // BeginPreload diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-9.patch b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-9.patch index 81398351..d33158ea 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-9.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0010-Exec_Based_Spawning-9.patch @@ -1,4 +1,4 @@ -From 24802a832b514452df5cea11759be8d33a7b8bc0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 May 2019 14:31:29 -0400 Subject: [PATCH] disable WebView reservation for exec spawning @@ -8,10 +8,10 @@ Subject: [PATCH] disable WebView reservation for exec spawning 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java -index 0404ef53ca01..94e58405ce63 100644 +index c5ae8f3de0be..b711db51db05 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java -@@ -160,9 +160,11 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) { +@@ -160,9 +160,11 @@ public class ZygoteInit { } preloadSharedLibraries(); preloadTextResources(); diff --git 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 index c6ca6acc..752db56e 100644 --- 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 @@ -1,4 +1,4 @@ -From 29f28b53c0cc85612e66485bc250fc57d82bc622 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 11 Sep 2019 06:46:38 -0400 Subject: [PATCH] add parameter for avoiding full preload with exec @@ -12,7 +12,7 @@ diff --git a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java b/dalvik/src/ma index 13769e137e..af3b9cfe8b 100644 --- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java +++ b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java -@@ -47,7 +47,7 @@ private ZygoteHooks() { +@@ -47,7 +47,7 @@ public final class ZygoteHooks { * Called when the zygote begins preloading classes and data. */ @libcore.api.CorePlatformApi @@ -21,7 +21,7 @@ index 13769e137e..af3b9cfe8b 100644 // Pin ICU data in memory from this point that would normally be held by soft references. // Without this, any references created immediately below or during class preloading // would be collected when the Zygote GC runs in gcAndFinalize(). -@@ -64,7 +64,7 @@ public static void onBeginPreload() { +@@ -64,7 +64,7 @@ public final class ZygoteHooks { * Called when the zygote has completed preloading classes and data. */ @libcore.api.CorePlatformApi diff --git 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 index 8563d322..05b2934c 100644 --- 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 @@ -1,4 +1,4 @@ -From 13a992c716f9b39920a7b37af2f447ced8e45c15 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 11 Sep 2019 06:47:11 -0400 Subject: [PATCH] disable ICU cache pinning for exec spawning @@ -11,7 +11,7 @@ diff --git a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java b/dalvik/src/ma index af3b9cfe8b..35e880558a 100644 --- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java +++ b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java -@@ -48,15 +48,17 @@ private ZygoteHooks() { +@@ -48,15 +48,17 @@ public final class ZygoteHooks { */ @libcore.api.CorePlatformApi public static void onBeginPreload(boolean fullPreload) { @@ -38,7 +38,7 @@ index af3b9cfe8b..35e880558a 100644 } } -@@ -65,8 +67,10 @@ public static void onBeginPreload(boolean fullPreload) { +@@ -65,8 +67,10 @@ public final class ZygoteHooks { */ @libcore.api.CorePlatformApi public static void onEndPreload(boolean fullPreload) { diff --git a/Patches/LineageOS-17.1/android_packages_apps_Settings/0010-Random_MAC-1.patch b/Patches/LineageOS-17.1/android_packages_apps_Settings/0010-Random_MAC-1.patch index 82b641c6..068b072a 100644 --- a/Patches/LineageOS-17.1/android_packages_apps_Settings/0010-Random_MAC-1.patch +++ b/Patches/LineageOS-17.1/android_packages_apps_Settings/0010-Random_MAC-1.patch @@ -11,10 +11,10 @@ RANDOMIZATION_ALWAYS is set as the default option 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml -index b983f467df..e1e7581deb 100644 +index 0a9a9a31e8..6d95bcc58b 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml -@@ -1120,7 +1120,8 @@ +@@ -1239,7 +1239,8 @@ @@ -24,7 +24,7 @@ index b983f467df..e1e7581deb 100644 Use device MAC -@@ -1136,6 +1137,7 @@ +@@ -1255,6 +1256,7 @@ diff --git a/Scripts/Common/Enable_Verity.sh b/Scripts/Common/Enable_Verity.sh index 3e10863d..6efc7809 100644 --- a/Scripts/Common/Enable_Verity.sh +++ b/Scripts/Common/Enable_Verity.sh @@ -37,6 +37,7 @@ enableAVB() { cd "$DOS_BUILD_BASE/$1"; sed -i 's/--set_hashtree_disabled_flag//' *.mk &>/dev/null || true; sed -i 's/AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3/AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2/' *.mk &>/dev/null || true; + #TODO: investigate BOARD_AVB_RECOVERY_KEY_PATH echo "Enabled AVB for $1"; cd "$DOS_BUILD_BASE"; fi;