commit d85a37d3cce49352453b0f41b43da863c7639120
author John Reck <jreck@google.com> Wed Jun 08 11:01:29 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 08 11:01:29 2011 -0700
tree 1a3d0b15ef7ca05f96eb5ea453026c31f261c830
parent 2ea0f5a1f04ac6021959372d2fd012a521dedf07
parent 3b8a7db6eaf0e574ab1d547e65283e208e773065

am 3b8a7db6: DO NOT MERGE Fix NPE in Tab.saveState()

* commit '3b8a7db6eaf0e574ab1d547e65283e208e773065':
  DO NOT MERGE Fix NPE in Tab.saveState()

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 1d84088..c68b45c 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);