commit c09178aaafcbf614830a1d56237b6dff31f634d7
author The Android Automerger <android-build@android.com> Thu Jun 09 13:45:29 2011 -0700
committer The Android Automerger <android-build@android.com> Thu Jun 09 13:45:29 2011 -0700
tree 6d3f3e3e75fdb6bf13f1fe5b0b0261529780ceb4
parent 3b8a7db6eaf0e574ab1d547e65283e208e773065
parent 4d2700f74c328e084c0034709571f72c87e5fd82

merge in gingerbread-release history after reset to gingerbread

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 6eaf4b1..bde2fa7 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -1920,10 +1920,10 @@
         final WebHistoryItem item = list != null ? list.getCurrentItem() : null;
         populatePickerData(item);
 
-        if (mPickerData.mUrl != null) {
+        if (mPickerData != null && mPickerData.mUrl != null) {
             mSavedState.putString(CURRURL, mPickerData.mUrl);
         }
-        if (mPickerData.mTitle != null) {
+        if (mPickerData != null && mPickerData.mTitle != null) {
             mSavedState.putString(CURRTITLE, mPickerData.mTitle);
         }
         mSavedState.putBoolean(CLOSEONEXIT, mCloseOnExit);