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

Commit 42bc2ff5 authored by Dave Bort's avatar Dave Bort
Browse files

Remove references to android.util.Config 

The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
parent 61805637

core/java/android/webkit/BrowserFrame.java

+4 −5
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.net.WebAddress; 
import android.net.http.SslCertificate;

import android.os.Handler;

import android.os.Message;

import android.util.Config;

import android.util.Log;

import android.util.TypedValue;
@@ -120,7 +119,7 @@ class BrowserFrame extends Handler { 
        mDatabase = WebViewDatabase.getInstance(context);

        mWebViewCore = w;



        if (Config.LOGV) {

        if (WebView.LOGV_ENABLED) {

            Log.v(LOGTAG, "BrowserFrame constructor: this=" + this);

        }

    }
@@ -331,7 +330,7 @@ class BrowserFrame extends Handler { 
        switch (msg.what) {

            case FRAME_COMPLETED: {

                if (mSettings.getSavePassword() && hasPasswordField()) {

                    if (Config.DEBUG) {

                    if (WebView.DEBUG) {

                        Assert.assertNotNull(mCallbackProxy.getBackForwardList()

                                .getCurrentItem());

                    }
@@ -480,7 +479,7 @@ class BrowserFrame extends Handler { 
            }

            if (mSettings.getSavePassword() && hasPasswordField()) {

                try {

                    if (Config.DEBUG) {

                    if (WebView.DEBUG) {

                        Assert.assertNotNull(mCallbackProxy.getBackForwardList()

                                .getCurrentItem());

                    }
@@ -528,7 +527,7 @@ class BrowserFrame extends Handler { 
        // is this resource the main-frame top-level page?

        boolean isMainFramePage = mIsMainFrame;



        if (Config.LOGV) {

        if (WebView.LOGV_ENABLED) {

            Log.v(LOGTAG, "startLoadingResource: url=" + url + ", method="

                    + method + ", postData=" + postData + ", isHighPriority="

                    + isHighPriority + ", isMainFramePage=" + isMainFramePage);

core/java/android/webkit/CacheManager.java

+2 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.webkit; 
import android.content.Context;

import android.net.http.Headers;

import android.os.FileUtils;

import android.util.Config;

import android.util.Log;

import java.io.File;

import java.io.FileInputStream;
@@ -322,7 +321,7 @@ public final class CacheManager { 
            }

        }



        if (Config.LOGV) {

        if (WebView.LOGV_ENABLED) {

            Log.v(LOGTAG, "getCacheFile for url " + url);

        }
@@ -416,7 +415,7 @@ public final class CacheManager { 


        mDataBase.addCache(url, cacheRet);



        if (Config.LOGV) {

        if (WebView.LOGV_ENABLED) {

            Log.v(LOGTAG, "saveCacheFile for url " + url);

        }

    }

core/java/android/webkit/CallbackProxy.java

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.os.Handler; 
import android.os.Message;

import android.os.SystemClock;

import android.provider.Browser;

import android.util.Config;

import android.util.Log;

import android.view.KeyEvent;

import android.view.LayoutInflater;
@@ -822,7 +821,7 @@ class CallbackProxy extends Handler { 
            String password, Message resumeMsg) {

        // resumeMsg should be null at this point because we want to create it

        // within the CallbackProxy.

        if (Config.DEBUG) {

        if (WebView.DEBUG) {

            junit.framework.Assert.assertNull(resumeMsg);

        }

        resumeMsg = obtainMessage(NOTIFY);

core/java/android/webkit/CookieManager.java

+6 −7
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.webkit; 


import android.net.ParseException;

import android.net.WebAddress;

import android.util.Config;

import android.util.Log;



import java.util.ArrayList;
@@ -263,7 +262,7 @@ public final class CookieManager { 
        if (!mAcceptCookie || uri == null) {

            return;

        }

        if (Config.LOGV) {

        if (WebView.LOGV_ENABLED) {

            Log.v(LOGTAG, "setCookie: uri: " + uri + " value: " + value);

        }
@@ -428,12 +427,12 @@ public final class CookieManager { 
            }

        }

        if (ret.length() > 0) {

            if (Config.LOGV) {

            if (WebView.LOGV_ENABLED) {

                Log.v(LOGTAG, "getCookie: uri: " + uri + " value: " + ret);

            }

            return ret.toString();

        } else {

            if (Config.LOGV) {

            if (WebView.LOGV_ENABLED) {

                Log.v(LOGTAG, "getCookie: uri: " + uri

                        + " But can't find cookie.");

            }
@@ -589,7 +588,7 @@ public final class CookieManager { 
            Iterator<ArrayList<Cookie>> listIter = cookieLists.iterator();

            while (listIter.hasNext() && count < MAX_RAM_COOKIES_COUNT) {

                ArrayList<Cookie> list = listIter.next();

                if (Config.DEBUG) {

                if (WebView.DEBUG) {

                    Iterator<Cookie> iter = list.iterator();

                    while (iter.hasNext() && count < MAX_RAM_COOKIES_COUNT) {

                        Cookie cookie = iter.next();
@@ -609,7 +608,7 @@ public final class CookieManager { 


        ArrayList<Cookie> retlist = new ArrayList<Cookie>();

        if (mapSize >= MAX_RAM_DOMAIN_COUNT || count >= MAX_RAM_COOKIES_COUNT) {

            if (Config.DEBUG) {

            if (WebView.DEBUG) {

                Log.v(LOGTAG, count + " cookies used " + byteCount

                        + " bytes with " + mapSize + " domains");

            }
@@ -617,7 +616,7 @@ public final class CookieManager { 
            int toGo = mapSize / 10 + 1;

            while (toGo-- > 0){

                String domain = domains[toGo].toString();

                if (Config.LOGV) {

                if (WebView.LOGV_ENABLED) {

                    Log.v(LOGTAG, "delete domain: " + domain

                            + " from RAM cache");

                }

core/java/android/webkit/CookieSyncManager.java

+2 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.webkit;



import android.content.Context;

import android.util.Config;

import android.util.Log;

import android.webkit.CookieManager.Cookie;
@@ -162,7 +161,7 @@ public final class CookieSyncManager extends WebSyncManager { 
    }



    protected void syncFromRamToFlash() {

        if (Config.LOGV) {

        if (WebView.LOGV_ENABLED) {

            Log.v(LOGTAG, "CookieSyncManager::syncFromRamToFlash STARTS");

        }
@@ -179,7 +178,7 @@ public final class CookieSyncManager extends WebSyncManager { 
                CookieManager.getInstance().deleteLRUDomain();

        syncFromRamToFlash(lruList);



        if (Config.LOGV) {

        if (WebView.LOGV_ENABLED) {

            Log.v(LOGTAG, "CookieSyncManager::syncFromRamToFlash DONE");

        }

    }