Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't preload into nonexistent zygote" am: c3a27297c4 am: 3aab9125d9 am: 80b4f59eec

Browse Source 
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>
This commit is contained in:
Hans Boehm
2022-04-20 20:36:51 +00:00
committed by Automerger Merge Worker
parent d8f121a6fd 80b4f59eec
commit 87503f91cf
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/SystemServer.java
View File

@@ -1459,8 +1459,9 @@ public final class SystemServer implements Dumpable {
Slog.i(TAG, SECONDARY_ZYGOTE_PRELOAD); Slog.i(TAG, SECONDARY_ZYGOTE_PRELOAD);
TimingsTraceAndSlog traceLog = TimingsTraceAndSlog.newAsyncLog(); TimingsTraceAndSlog traceLog = TimingsTraceAndSlog.newAsyncLog();
traceLog.traceBegin(SECONDARY_ZYGOTE_PRELOAD); traceLog.traceBegin(SECONDARY_ZYGOTE_PRELOAD);
if (!Process.ZYGOTE_PROCESS.preloadDefault(Build.SUPPORTED_32_BIT_ABIS[0])) { String[] abis32 = Build.SUPPORTED_32_BIT_ABIS;
Slog.e(TAG, "Unable to preload default resources"); if (abis32.length > 0 && !Process.ZYGOTE_PROCESS.preloadDefault(abis32[0])) {
Slog.e(TAG, "Unable to preload default resources for secondary");
} }
traceLog.traceEnd(); traceLog.traceEnd();
} catch (Exception ex) { } catch (Exception ex) {