Merge "Code cleanup to conform to style guide / linter." am: f5ff8f0661

am: 420eec4f52

Change-Id: If4634a4d8026c1df1c581b120527926fbee68a0e
This commit is contained in:
Christian Wailes
2019-01-23 18:23:25 -08:00
committed by android-build-merger
7 changed files with 169 additions and 138 deletions

View File

@@ -806,7 +806,7 @@ public final class SystemServer {
TimingsTraceLog traceLog = new TimingsTraceLog(
SYSTEM_SERVER_TIMING_ASYNC_TAG, Trace.TRACE_TAG_SYSTEM_SERVER);
traceLog.traceBegin(SECONDARY_ZYGOTE_PRELOAD);
if (!Process.zygoteProcess.preloadDefault(Build.SUPPORTED_32_BIT_ABIS[0])) {
if (!Process.ZYGOTE_PROCESS.preloadDefault(Build.SUPPORTED_32_BIT_ABIS[0])) {
Slog.e(TAG, "Unable to preload default resources");
}
traceLog.traceEnd();