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

Commit d48a25b8 authored by Gustav Sennton's avatar Gustav Sennton Committed by Android (Google) Code Review
Browse files

Merge "Don't run WebView-preparation during an encryption boot phase." into nyc-dev

parents b21622d4 c7db48b0

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

+6 −4
Original line number Diff line number Diff line
@@ -1279,10 +1279,12 @@ public final class SystemServer { 
                }

                Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);



                if (!mOnlyCore) {

                    Slog.i(TAG, "WebViewFactory preparation");

                    Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "WebViewFactoryPreparation");

                    mWebViewUpdateService.prepareWebViewInSystemServer();

                    Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

                }



                Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "StartSystemUI");

                try {