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

Commit b591d007 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by android-build-team Robot
Browse files

Partially revert "Handle WebView assets correctly when multiple APKs are used." 

This reverts the WebViewFactory changes from commit
527fa8f4 which appear to have changed
the way that the asset path is updated in an incompatible way.

Bug: 124116212
Fixes: 128489090
Test: launch affected applications
Change-Id: Id53dedef4fa55a6b8cea8a60326a4b8acd3422f8
(cherry picked from commit 3b6554e2)
parent 371277bb

core/java/android/webkit/WebViewFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -448,7 +448,8 @@ public final class WebViewFactory { 


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

            try {

                new WebViewDelegate().addWebViewAssetPath(initialApplication);

                initialApplication.getAssets().addAssetPathAsSharedLibrary(

                        webViewContext.getApplicationInfo().sourceDir);

                ClassLoader clazzLoader = webViewContext.getClassLoader();



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