commit 111b7f6f1b256bb4261aa671d33060b0009095db
author John Reck <jreck@google.com> Wed Dec 01 10:29:49 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 01 10:29:49 2010 -0800
tree b7b7ce0a6a96d0b99f5fdc96e47733712e92578c
parent cf981978202920aa6662e899a5905c23e02d4d9f
parent 93aa074eb80dd6785d379a2b6c162f8619ee50d0

Merge "Fixes bookmark scrolling highlight"

src/com/android/browser/BrowserHistoryPage.java

diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java
index a3ce0b4..5cd9545 100644
--- a/src/com/android/browser/BrowserHistoryPage.java
+++ b/src/com/android/browser/BrowserHistoryPage.java
@@ -366,7 +366,10 @@
                 mMostVisited.close();
             }
             mMostVisited = cursor;
-            mMostVisited.registerDataSetObserver(mDataSetObserver);
+            if (mMostVisited != null) {
+                mMostVisited.registerDataSetObserver(mDataSetObserver);
+            }
+            notifyDataSetChanged();
         }
 
         @Override

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 2392103..b4699e3 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -548,6 +548,7 @@
             Log.e(LOGTAG, "BrowserActivity is already paused.");
             return;
         }
+        CookieManager.getInstance().flushCookieStore();
         mActivityPaused = true;
         Tab tab = mTabControl.getCurrentTab();
         if (tab != null) {