commit 3e826c99b9cc8d38b6c2f19bd4160ee21b5ca47b
author Kristian Monsen <kristianm@google.com> Fri Feb 18 16:01:47 2011 +0000
committer Kristian Monsen <kristianm@google.com> Mon Feb 21 15:19:54 2011 +0000
tree a8e70976f4bcce818c58c1658f3bc2e0c31f7a3c
parent 25474a2230152700e5f7eb7e1495be40c6bd26a8

Part of fix for bug 3424424 Browser hanging

Not calling redundant android stack cookie code when the chrome
stack is enabled.

Change-Id: I6faea89295e0cae02f5aa19a6ddeec43a4b73a44

core/java/android/webkit/CookieSyncManager.java

diff --git a/core/java/android/webkit/CookieSyncManager.java b/core/java/android/webkit/CookieSyncManager.java
index 8393980..313f755 100644
--- a/core/java/android/webkit/CookieSyncManager.java
+++ b/core/java/android/webkit/CookieSyncManager.java
@@ -178,14 +178,16 @@
             return;
         }
 
-        manager.flushCookieStore();
+        if (JniUtil.useChromiumHttpStack()) {
+            manager.flushCookieStore();
+        } else {
+            ArrayList<Cookie> cookieList = manager.getUpdatedCookiesSince(mLastUpdate);
+            mLastUpdate = System.currentTimeMillis();
+            syncFromRamToFlash(cookieList);
 
-        ArrayList<Cookie> cookieList = manager.getUpdatedCookiesSince(mLastUpdate);
-        mLastUpdate = System.currentTimeMillis();
-        syncFromRamToFlash(cookieList);
-
-        ArrayList<Cookie> lruList = manager.deleteLRUDomain();
-        syncFromRamToFlash(lruList);
+            ArrayList<Cookie> lruList = manager.deleteLRUDomain();
+            syncFromRamToFlash(lruList);
+        }
 
         if (DebugFlags.COOKIE_SYNC_MANAGER) {
             Log.v(LOGTAG, "CookieSyncManager::syncFromRamToFlash DONE");