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

Commit 7444d0e8 authored by Jonathan Dixon's avatar Jonathan Dixon Committed by The Android Automerger
Browse files

Fix CookieSyncManager for WebViewClassic 

Add a workaround to ensure that the WebViewDatabase and JniUtil can
still be initialized as side effect of making a CookieSyncManager

This was collateral damage from the fixes for Bug 10932261

Change-Id: If5ba65a7822d5b0afc14139dd84125058bf96897
parent 3d5b8cde

core/java/android/webkit/CookieSyncManager.java

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ public final class CookieSyncManager extends WebSyncManager { 
        if (context == null) {

            throw new IllegalArgumentException("Invalid context argument");

        }

        // TODO: Remove this workaround after webview classic is no longer supported.

        if (WebViewFactory.getProvider().getClass().getName().contains("WebViewClassic")) {

            WebViewDatabase.getInstance(context);

        }



        setGetInstanceIsAllowed();

        return getInstance();