DO NOT MERGE Fix NPE in Tab.saveState()

 Bug: 4560461

Change-Id: I38df19ee264e4dd66b117a73fbe3ce5362bd76e1

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 6eaf4b1..bde2fa7 100644 (file)
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -1920,10 +1920,10 @@ class Tab {
         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);