Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-04-01 00:17:51 -04:00
parent 8dbdc0f31e
commit 987122f99e
27 changed files with 78 additions and 77 deletions

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Sat, 14 Mar 2015 18:10:20 -0400 Date: Sat, 14 Mar 2015 18:10:20 -0400
Subject: [PATCH] add exec-based spawning support 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 index f0e779694c90..9f41a4136db9 100644
--- a/core/java/com/android/internal/os/WrapperInit.java --- a/core/java/com/android/internal/os/WrapperInit.java
+++ b/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 * 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. * 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 index f537e3e2897b..7d51be259c20 100644
--- a/core/java/com/android/internal/os/ZygoteConnection.java --- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/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"); throw new IllegalStateException("WrapperInit.execApplication unexpectedly returned");
} else { } else {
if (!isZygote) { if (!isZygote) {

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 21 May 2019 23:54:20 -0400 Date: Tue, 21 May 2019 23:54:20 -0400
Subject: [PATCH] disable exec spawning when using debugging options 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 index 7d51be259c20..48a68d96e84c 100644
--- a/core/java/com/android/internal/os/ZygoteConnection.java --- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/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"); throw new IllegalStateException("WrapperInit.execApplication unexpectedly returned");
} else { } else {
if (!isZygote) { if (!isZygote) {

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:24:21 -0400 Date: Tue, 14 May 2019 14:24:21 -0400
Subject: [PATCH] add parameter for avoiding full preload with exec 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 index 10edd64e0f95..3ba4664ae8cf 100644
--- a/core/java/com/android/internal/os/ExecInit.java --- a/core/java/com/android/internal/os/ExecInit.java
+++ b/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. // Mimic system Zygote preloading.
ZygoteInit.preload(new TimingsTraceLog("ExecInitTiming", 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 index da195601f725..6acaccbbc3ef 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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; private static boolean sPreloadComplete;
@ -34,7 +34,7 @@ index da195601f725..6acaccbbc3ef 100644
Log.d(TAG, "begin preload"); Log.d(TAG, "begin preload");
bootTimingsTraceLog.traceBegin("BeginIcuCachePinning"); bootTimingsTraceLog.traceBegin("BeginIcuCachePinning");
beginIcuCachePinning(); beginIcuCachePinning();
@@ -149,6 +149,10 @@ static void preload(TimingsTraceLog bootTimingsTraceLog) { @@ -149,6 +149,10 @@ public class ZygoteInit {
sPreloadComplete = true; sPreloadComplete = true;
} }

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:28:27 -0400 Date: Tue, 14 May 2019 14:28:27 -0400
Subject: [PATCH] disable OpenGL preloading for exec spawning 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 index 6acaccbbc3ef..09ec9f235451 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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"); Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadAppProcessHALs");
nativePreloadAppProcessHALs(); nativePreloadAppProcessHALs();
Trace.traceEnd(Trace.TRACE_TAG_DALVIK); Trace.traceEnd(Trace.TRACE_TAG_DALVIK);

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:28:52 -0400 Date: Tue, 14 May 2019 14:28:52 -0400
Subject: [PATCH] disable resource preloading for exec spawning 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 index 09ec9f235451..17bdfaa79d0b 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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"); bootTimingsTraceLog.traceBegin("PreloadClasses");
preloadClasses(); preloadClasses();
bootTimingsTraceLog.traceEnd(); // PreloadClasses bootTimingsTraceLog.traceEnd(); // PreloadClasses

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:29:36 -0400 Date: Tue, 14 May 2019 14:29:36 -0400
Subject: [PATCH] disable ICU cache pinning for exec spawning 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 index 17bdfaa79d0b..1dfe23e32937 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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) { static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) {
Log.d(TAG, "begin preload"); Log.d(TAG, "begin preload");
@ -26,7 +26,7 @@ index 17bdfaa79d0b..1dfe23e32937 100644
bootTimingsTraceLog.traceBegin("PreloadClasses"); bootTimingsTraceLog.traceBegin("PreloadClasses");
preloadClasses(); preloadClasses();
bootTimingsTraceLog.traceEnd(); // 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, // Ask the WebViewFactory to do any initialization that must run in the zygote process,
// for memory sharing purposes. // for memory sharing purposes.
WebViewFactory.prepareWebViewInZygote(); WebViewFactory.prepareWebViewInZygote();

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:30:59 -0400 Date: Tue, 14 May 2019 14:30:59 -0400
Subject: [PATCH] disable class preloading for exec spawning 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 index 1dfe23e32937..fae438512d8f 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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(); beginIcuCachePinning();
bootTimingsTraceLog.traceEnd(); // BeginIcuCachePinning bootTimingsTraceLog.traceEnd(); // BeginIcuCachePinning
} }

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:31:29 -0400 Date: Tue, 14 May 2019 14:31:29 -0400
Subject: [PATCH] disable WebView reservation for exec spawning 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 index fae438512d8f..75d10f6d92a8 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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(); preloadSharedLibraries();
preloadTextResources(); preloadTextResources();

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:34:32 -0400 Date: Tue, 14 May 2019 14:34:32 -0400
Subject: [PATCH] disable JCA provider warm up for exec spawning 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 index 75d10f6d92a8..214dbd451099 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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) { if (fullPreload) {
endIcuCachePinning(); endIcuCachePinning();
} }
@ -20,7 +20,7 @@ index 75d10f6d92a8..214dbd451099 100644
Log.d(TAG, "end preload"); Log.d(TAG, "end preload");
sPreloadComplete = true; 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 * By doing it here we avoid that each app does it when requesting a service from the
* provider for the first time. * provider for the first time.
*/ */
@ -29,7 +29,7 @@ index 75d10f6d92a8..214dbd451099 100644
long startTime = SystemClock.uptimeMillis(); long startTime = SystemClock.uptimeMillis();
Trace.traceBegin( Trace.traceBegin(
Trace.TRACE_TAG_DALVIK, "Starting installation of AndroidKeyStoreProvider"); 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."); + (SystemClock.uptimeMillis() - startTime) + "ms.");
Trace.traceEnd(Trace.TRACE_TAG_DALVIK); Trace.traceEnd(Trace.TRACE_TAG_DALVIK);

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 15:11:59 -0400 Date: Tue, 14 May 2019 15:11:59 -0400
Subject: [PATCH] avoid AssetManager errors with exec spawning Subject: [PATCH] avoid AssetManager errors with exec spawning

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Wed, 8 Apr 2020 10:42:11 -0400 Date: Wed, 8 Apr 2020 10:42:11 -0400
Subject: [PATCH] enable -ftrivial-auto-var-init=zero Subject: [PATCH] enable -ftrivial-auto-var-init=zero

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Sat, 14 Mar 2015 18:10:20 -0400 Date: Sat, 14 Mar 2015 18:10:20 -0400
Subject: [PATCH] add exec-based spawning support 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 index f0e779694c90..9f41a4136db9 100644
--- a/core/java/com/android/internal/os/WrapperInit.java --- a/core/java/com/android/internal/os/WrapperInit.java
+++ b/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 * 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. * 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); OsConstants._LINUX_CAPABILITY_VERSION_3, 0);
StructCapUserData[] data; StructCapUserData[] data;
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java 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 --- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/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.net.LocalSocket;
import android.os.Parcel; import android.os.Parcel;
import android.os.Process; import android.os.Process;
@ -156,7 +156,7 @@ index e556dd4d8243..1054d2fb9b13 100644
import android.os.Trace; import android.os.Trace;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Os; 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"); throw new IllegalStateException("WrapperInit.execApplication unexpectedly returned");
} else { } else {
if (!isZygote) { if (!isZygote) {

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:34:32 -0400 Date: Tue, 14 May 2019 14:34:32 -0400
Subject: [PATCH] disable JCA provider warm up for exec spawning 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(-) 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 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 --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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(); WebViewFactory.prepareWebViewInZygote();
} }
endPreload(fullPreload); endPreload(fullPreload);
@ -20,7 +20,7 @@ index 94e58405ce63..dbd24ef27d26 100644
Log.d(TAG, "end preload"); Log.d(TAG, "end preload");
sPreloadComplete = true; 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 * By doing it here we avoid that each app does it when requesting a service from the provider
* for the first time. * for the first time.
*/ */
@ -29,7 +29,7 @@ index 94e58405ce63..dbd24ef27d26 100644
long startTime = SystemClock.uptimeMillis(); long startTime = SystemClock.uptimeMillis();
Trace.traceBegin( Trace.traceBegin(
Trace.TRACE_TAG_DALVIK, "Starting installation of AndroidKeyStoreProvider"); 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."); + (SystemClock.uptimeMillis() - startTime) + "ms.");
Trace.traceEnd(Trace.TRACE_TAG_DALVIK); Trace.traceEnd(Trace.TRACE_TAG_DALVIK);

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Wed, 11 Sep 2019 06:57:24 -0400 Date: Wed, 11 Sep 2019 06:57:24 -0400
Subject: [PATCH] disable preloading classloaders for exec spawning 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(-) 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 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 --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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(); preloadClasses();
bootTimingsTraceLog.traceEnd(); // PreloadClasses bootTimingsTraceLog.traceEnd(); // PreloadClasses
} }

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Wed, 11 Sep 2019 06:58:51 -0400 Date: Wed, 11 Sep 2019 06:58:51 -0400
Subject: [PATCH] disable preloading HALs for exec spawning 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(-) 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 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 --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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(); preloadResources();
bootTimingsTraceLog.traceEnd(); // PreloadResources bootTimingsTraceLog.traceEnd(); // PreloadResources
} }

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 15:11:59 -0400 Date: Tue, 14 May 2019 15:11:59 -0400
Subject: [PATCH] avoid AssetManager errors with exec spawning Subject: [PATCH] avoid AssetManager errors with exec spawning

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 21 May 2019 23:54:20 -0400 Date: Tue, 21 May 2019 23:54:20 -0400
Subject: [PATCH] disable exec spawning when using debugging options Subject: [PATCH] disable exec spawning when using debugging options
@ -10,10 +10,10 @@ spawning when doing debugging.
1 file changed, 2 insertions(+), 1 deletion(-) 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 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 --- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/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"); throw new IllegalStateException("WrapperInit.execApplication unexpectedly returned");
} else { } else {
if (!isZygote) { if (!isZygote) {

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:24:21 -0400 Date: Tue, 14 May 2019 14:24:21 -0400
Subject: [PATCH] add parameter for avoiding full preload with exec 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 index 10edd64e0f95..3ba4664ae8cf 100644
--- a/core/java/com/android/internal/os/ExecInit.java --- a/core/java/com/android/internal/os/ExecInit.java
+++ b/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. // Mimic system Zygote preloading.
ZygoteInit.preload(new TimingsTraceLog("ExecInitTiming", ZygoteInit.preload(new TimingsTraceLog("ExecInitTiming",
@ -22,10 +22,10 @@ index 10edd64e0f95..3ba4664ae8cf 100644
// Launch the application. // Launch the application.
String[] runtimeArgs = new String[args.length - 1]; 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 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 --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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; private static ClassLoader sCachedSystemServerClassLoader = null;
@ -34,7 +34,7 @@ index 7ec8309e47de..e59cb784dc78 100644
Log.d(TAG, "begin preload"); Log.d(TAG, "begin preload");
bootTimingsTraceLog.traceBegin("BeginPreload"); bootTimingsTraceLog.traceBegin("BeginPreload");
beginPreload(); beginPreload();
@@ -164,6 +164,10 @@ static void preload(TimingsTraceLog bootTimingsTraceLog) { @@ -164,6 +164,10 @@ public class ZygoteInit {
sPreloadComplete = true; sPreloadComplete = true;
} }

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Wed, 11 Sep 2019 06:43:55 -0400 Date: Wed, 11 Sep 2019 06:43:55 -0400
Subject: [PATCH] pass through fullPreload to libcore 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(-) 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 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 --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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) { static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) {
Log.d(TAG, "begin preload"); Log.d(TAG, "begin preload");
bootTimingsTraceLog.traceBegin("BeginPreload"); bootTimingsTraceLog.traceBegin("BeginPreload");
@ -20,7 +20,7 @@ index e59cb784dc78..22e3f549dad5 100644
bootTimingsTraceLog.traceEnd(); // BeginPreload bootTimingsTraceLog.traceEnd(); // BeginPreload
bootTimingsTraceLog.traceBegin("PreloadClasses"); bootTimingsTraceLog.traceBegin("PreloadClasses");
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, // Ask the WebViewFactory to do any initialization that must run in the zygote process,
// for memory sharing purposes. // for memory sharing purposes.
WebViewFactory.prepareWebViewInZygote(); WebViewFactory.prepareWebViewInZygote();
@ -29,7 +29,7 @@ index e59cb784dc78..22e3f549dad5 100644
warmUpJcaProviders(); warmUpJcaProviders();
Log.d(TAG, "end preload"); 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)); preload(new TimingsTraceLog("ZygoteInitTiming_lazy", Trace.TRACE_TAG_DALVIK));
} }

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:28:27 -0400 Date: Tue, 14 May 2019 14:28:27 -0400
Subject: [PATCH] disable OpenGL preloading for exec spawning 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(-) 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 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 --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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"); Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadAppProcessHALs");
nativePreloadAppProcessHALs(); nativePreloadAppProcessHALs();
Trace.traceEnd(Trace.TRACE_TAG_DALVIK); Trace.traceEnd(Trace.TRACE_TAG_DALVIK);

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:28:52 -0400 Date: Tue, 14 May 2019 14:28:52 -0400
Subject: [PATCH] disable resource preloading for exec spawning 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(-) 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 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 --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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"); bootTimingsTraceLog.traceBegin("CacheNonBootClasspathClassLoaders");
cacheNonBootClasspathClassLoaders(); cacheNonBootClasspathClassLoaders();
bootTimingsTraceLog.traceEnd(); // CacheNonBootClasspathClassLoaders bootTimingsTraceLog.traceEnd(); // CacheNonBootClasspathClassLoaders

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:30:59 -0400 Date: Tue, 14 May 2019 14:30:59 -0400
Subject: [PATCH] disable class preloading for exec spawning 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(-) 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 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 --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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"); bootTimingsTraceLog.traceBegin("BeginPreload");
beginPreload(fullPreload); beginPreload(fullPreload);
bootTimingsTraceLog.traceEnd(); // BeginPreload bootTimingsTraceLog.traceEnd(); // BeginPreload

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 14 May 2019 14:31:29 -0400 Date: Tue, 14 May 2019 14:31:29 -0400
Subject: [PATCH] disable WebView reservation for exec spawning 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(-) 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 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 --- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/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(); preloadSharedLibraries();
preloadTextResources(); preloadTextResources();

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Wed, 11 Sep 2019 06:46:38 -0400 Date: Wed, 11 Sep 2019 06:46:38 -0400
Subject: [PATCH] add parameter for avoiding full preload with exec 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 index 13769e137e..af3b9cfe8b 100644
--- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java --- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
+++ b/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. * Called when the zygote begins preloading classes and data.
*/ */
@libcore.api.CorePlatformApi @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. // 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 // Without this, any references created immediately below or during class preloading
// would be collected when the Zygote GC runs in gcAndFinalize(). // 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. * Called when the zygote has completed preloading classes and data.
*/ */
@libcore.api.CorePlatformApi @libcore.api.CorePlatformApi

View File

@ -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 <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Wed, 11 Sep 2019 06:47:11 -0400 Date: Wed, 11 Sep 2019 06:47:11 -0400
Subject: [PATCH] disable ICU cache pinning for exec spawning 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 index af3b9cfe8b..35e880558a 100644
--- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java --- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
+++ b/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 @libcore.api.CorePlatformApi
public static void onBeginPreload(boolean fullPreload) { 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 @libcore.api.CorePlatformApi
public static void onEndPreload(boolean fullPreload) { public static void onEndPreload(boolean fullPreload) {

View File

@ -11,10 +11,10 @@ RANDOMIZATION_ALWAYS is set as the default option
3 files changed, 29 insertions(+), 9 deletions(-) 3 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/res/values/arrays.xml b/res/values/arrays.xml 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 --- a/res/values/arrays.xml
+++ b/res/values/arrays.xml +++ b/res/values/arrays.xml
@@ -1120,7 +1120,8 @@ @@ -1239,7 +1239,8 @@
</string-array> </string-array>
<string-array name="wifi_privacy_entries"> <string-array name="wifi_privacy_entries">
@ -24,7 +24,7 @@ index b983f467df..e1e7581deb 100644
<item>Use device MAC</item> <item>Use device MAC</item>
</string-array> </string-array>
@@ -1136,6 +1137,7 @@ @@ -1255,6 +1256,7 @@
</string-array> </string-array>
<string-array name="wifi_privacy_values" translatable="false"> <string-array name="wifi_privacy_values" translatable="false">

View File

@ -37,6 +37,7 @@ enableAVB() {
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";
sed -i 's/--set_hashtree_disabled_flag//' *.mk &>/dev/null || true; 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; 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"; echo "Enabled AVB for $1";
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
fi; fi;