Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cb22623 authored by Hans Boehm's avatar Hans Boehm Committed by Automerger Merge Worker
Browse files

Merge "Don't preload into nonexistent zygote" am: c3a27297 am: 3aab9125... 

Merge "Don't preload into nonexistent zygote" am: c3a27297 am: 3aab9125 am: 80b4f59e am: 87503f91 am: 908445b3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067474



Change-Id: I68a8fe8a6646e69a4dde907c63e3bc9d46e66ac8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 887a5ee1 908445b3

services/java/com/android/server/SystemServer.java

+3 −2
Original line number Diff line number Diff line
@@ -1440,8 +1440,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) {