commit 6c702eed5791d0d46fbe3dfd3054549997f218dc
author John Reck <jreck@google.com> Fri Jan 07 09:41:53 2011 -0800
committer John Reck <jreck@google.com> Fri Jan 07 09:41:53 2011 -0800
tree ef325c0f170969c491b4f3390829c0282d2acf58
parent 2ab6d2509cc1d9d55a97935501689fe08f8baf0c

Fix NPE in queryIsBookmark

 Bug: 3326838
 Fixed a case where a Tab can have a null URL and added null checks
 to the DataController.

Change-Id: I9b27479c522928cde5d427919f2f921ca94aec5d

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index c4edda6..320d3b3 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -546,6 +546,9 @@
             mInPageLoad = false;
             // Sync state (in case of stop/timeout)
             mCurrentState.mUrl = view.getUrl();
+            if (mCurrentState.mUrl == null) {
+                mCurrentState.mUrl = url != null ? url : "";
+            }
             mCurrentState.mTitle = view.getTitle();
             mCurrentState.mFavicon = view.getFavicon();
             if (!URLUtil.isHttpsUrl(mCurrentState.mUrl)) {