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

Commit fc424478 authored by Gustav Sennton's avatar Gustav Sennton
Browse files

Add missing traces for WebView loading steps. 

Ever since the refactoring of WebViewFactory - to support using one out
of a list of WebViewProviders - we cover less of the loading code with
traces, this CL fixes this.

Bug: 26409579

Change-Id: I9d74321806037ea34a5ace8fc75b07ca771ab7d9
parent 56a99538

core/java/android/webkit/WebViewFactory.java

+15 −6
Original line number Diff line number Diff line
@@ -270,6 +270,9 @@ public final class WebViewFactory { 
    }



    private static Class<WebViewFactoryProvider> getProviderClass() {

        try {

            Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW,

                    "WebViewFactory.waitForProviderAndSetPackageInfo()");

            try {

                // First fetch the package info so we can log the webview package version.

                int res = waitForProviderAndSetPackageInfo();
@@ -278,11 +281,15 @@ public final class WebViewFactory { 
                            "Failed to load WebView provider, error: "

                            + getWebViewPreparationErrorReason(res));

                }

            } finally {

                Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW);

            }

            Log.i(LOGTAG, "Loading " + sPackageInfo.packageName + " version " +

                sPackageInfo.versionName + " (code " + sPackageInfo.versionCode + ")");



            Application initialApplication = AppGlobals.getInitialApplication();

            Context webViewContext = null;

            Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "initialApplication.createPackageContext()");

            try {

                // Construct a package context to load the Java code into the current app.

                // This is done as early as possible since by constructing a package context we
@@ -293,6 +300,8 @@ public final class WebViewFactory { 
                        Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY);

            } catch (PackageManager.NameNotFoundException e) {

                throw new MissingWebViewPackageException(e);

            } finally {

                Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW);

            }



            Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.loadNativeLibrary()");