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

Commit c3a27297 authored by Hans Boehm's avatar Hans Boehm Committed by Gerrit Code Review
Browse files

Merge "Don't preload into nonexistent zygote"

parents f3265025 c8e95b93

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

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