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

Commit d3f18b80 authored by Ben Murdoch's avatar Ben Murdoch
Browse files

Fix crash with HTML5 video. 

Add missing check for native HTTP stack inside
CookieManager.getCookie(WebAddress) and
CookieManager.setCookie(WebAddress) - private APIs that now
will throw an exception as the legacy cookie table no longer
exists with WebViewDatabase version 11.

Bug: 5690908
Change-Id: I51ae848d03b04d6021d314dda4a199675e38ab02
parent 41a5774a

core/java/android/webkit/CookieManager.java

+11 −0
Original line number Diff line number Diff line
@@ -345,6 +345,11 @@ public final class CookieManager { 
     * a system private class.

     */

    public synchronized void setCookie(WebAddress uri, String value) {

        if (JniUtil.useChromiumHttpStack()) {

            nativeSetCookie(uri.toString(), value, false);

            return;

        }



        if (value != null && value.length() > MAX_COOKIE_LENGTH) {

            return;

        }
@@ -500,6 +505,10 @@ public final class CookieManager { 
     * is a system private class.

     */

    public synchronized String getCookie(WebAddress uri) {

        if (JniUtil.useChromiumHttpStack()) {

            return nativeGetCookie(uri.toString(), false);

        }



        if (!mAcceptCookie || uri == null) {

            return null;

        }
@@ -573,6 +582,8 @@ public final class CookieManager { 
     * {@hide}  Too late to release publically.

     */

    public void waitForCookieOperationsToComplete() {

        // Note that this function is applicable for both the java

        // and native http stacks, and works correctly with either.

        synchronized (this) {

            while (pendingCookieOperations > 0) {

                try {