209481c53e
1114c3c1d4cdac1943345e1abb8050412e07ab8c240044836677c561811fad7a848373ef89646bdeb12a70bbac4ad414dcaa35b4cd877e3a98634286bb114c2635390c11add34a4bc611a2b51906de10527787f3c8ffde474ad7aa87e487c4c906fe9722c69c3eecd4b2303adccc5bb05db6f7536b49768824802a832bce6dcc23683d3d5c4d382eda592b791029f28b53c01013a992c7169750efbf6bced563b6f26aad3c7d750da3180f9a868773a29b7283b3fa09cf133136b6501a01ce5f617c309c0988806ec3ef1Signed-off-by: Tad <tad@spotco.us>
58 lines
2.5 KiB
Diff
58 lines
2.5 KiB
Diff
From 2a70bbac4a8342175971498084494845b4f24546 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Micay <danielmicay@gmail.com>
|
|
Date: Tue, 14 May 2019 14:34:32 -0400
|
|
Subject: [PATCH] disable JCA provider warm up for exec spawning
|
|
|
|
---
|
|
.../com/android/internal/os/ZygoteInit.java | 22 ++++++++++---------
|
|
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 04a323254c72..ad3b95ec67fc 100644
|
|
--- a/core/java/com/android/internal/os/ZygoteInit.java
|
|
+++ b/core/java/com/android/internal/os/ZygoteInit.java
|
|
@@ -159,7 +159,7 @@ static void preload(TimingsTraceLog bootTimingsTraceLog, boolean fullPreload) {
|
|
WebViewFactory.prepareWebViewInZygote();
|
|
}
|
|
endPreload(fullPreload);
|
|
- warmUpJcaProviders();
|
|
+ warmUpJcaProviders(fullPreload);
|
|
Log.d(TAG, "end preload");
|
|
|
|
sPreloadComplete = true;
|
|
@@ -229,7 +229,7 @@ private static void preloadTextResources() {
|
|
* By doing it here we avoid that each app does it when requesting a service from the provider
|
|
* for the first time.
|
|
*/
|
|
- private static void warmUpJcaProviders() {
|
|
+ private static void warmUpJcaProviders(boolean fullPreload) {
|
|
long startTime = SystemClock.uptimeMillis();
|
|
Trace.traceBegin(
|
|
Trace.TRACE_TAG_DALVIK, "Starting installation of AndroidKeyStoreProvider");
|
|
@@ -241,15 +241,17 @@ private static void warmUpJcaProviders() {
|
|
+ (SystemClock.uptimeMillis() - startTime) + "ms.");
|
|
Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
|
|
|
|
- startTime = SystemClock.uptimeMillis();
|
|
- Trace.traceBegin(
|
|
- Trace.TRACE_TAG_DALVIK, "Starting warm up of JCA providers");
|
|
- for (Provider p : Security.getProviders()) {
|
|
- p.warmUpServiceProvision();
|
|
+ if (fullPreload) {
|
|
+ startTime = SystemClock.uptimeMillis();
|
|
+ Trace.traceBegin(
|
|
+ Trace.TRACE_TAG_DALVIK, "Starting warm up of JCA providers");
|
|
+ for (Provider p : Security.getProviders()) {
|
|
+ p.warmUpServiceProvision();
|
|
+ }
|
|
+ Log.i(TAG, "Warmed up JCA providers in "
|
|
+ + (SystemClock.uptimeMillis() - startTime) + "ms.");
|
|
+ Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
|
|
}
|
|
- Log.i(TAG, "Warmed up JCA providers in "
|
|
- + (SystemClock.uptimeMillis() - startTime) + "ms.");
|
|
- Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
|
|
}
|
|
|
|
/**
|