diff options
| author | Hans Boehm <hboehm@google.com> | 2022-04-20 20:36:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-20 20:36:51 +0000 |
| commit | 87503f91cf7cc284086394dac8f93f231ab5f36c (patch) | |
| tree | ba4c8c55cb722e79e329fa4693887018d28d2420 /services/java/com | |
| parent | d8f121a6fdaa0da30d23a5544ee4ae9d395f3496 (diff) | |
| parent | 80b4f59eec2b6d5648d91edc804262cc762936a3 (diff) | |
Merge "Don't preload into nonexistent zygote" am: c3a27297c4 am: 3aab9125d9 am: 80b4f59eec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067474
Change-Id: Ic146cd903313a76e93f39dace347382b5d4bb484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 2b431b6c3ea5..dc2b6f8d3b64 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1459,8 +1459,9 @@ public final class SystemServer implements Dumpable { Slog.i(TAG, SECONDARY_ZYGOTE_PRELOAD); TimingsTraceAndSlog traceLog = TimingsTraceAndSlog.newAsyncLog(); traceLog.traceBegin(SECONDARY_ZYGOTE_PRELOAD); - if (!Process.ZYGOTE_PROCESS.preloadDefault(Build.SUPPORTED_32_BIT_ABIS[0])) { - Slog.e(TAG, "Unable to preload default resources"); + String[] abis32 = Build.SUPPORTED_32_BIT_ABIS; + if (abis32.length > 0 && !Process.ZYGOTE_PROCESS.preloadDefault(abis32[0])) { + Slog.e(TAG, "Unable to preload default resources for secondary"); } traceLog.traceEnd(); } catch (Exception ex) { |