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

Commit 6a4d0a6a authored by Iain Merrick's avatar Iain Merrick Committed by Android (Google) Code Review
Browse files

Merge "*Don't* disable CacheManager when using Chromium HTTP stack."

parents d085e1c3 811665e9

core/java/android/webkit/CacheManager.java

+0 −9
Original line number Diff line number Diff line
@@ -181,11 +181,6 @@ public final class CacheManager { 
            removeAllCacheFiles();

            mClearCacheOnInit = false;

        }

        // If we're using the Chrome HTTP stack, disable the cache.

        // Chrome has its own cache, and we don't provide programmatic access to it.

        if (JniUtil.useChromiumHttpStack()) {

            setCacheDisabled(true);

        }

    }

    

    /**
@@ -238,10 +233,6 @@ public final class CacheManager { 
        if (mDisabled) {

            removeAllCacheFiles();

        }

        if (!mDisabled && JniUtil.useChromiumHttpStack()) {

            Log.w(LOGTAG, "CacheManager enabled, but it will not work as "

                    + "expected because the Chrome HTTP stack is in use.");

        }

    }



    /**