From 3b8a7db6eaf0e574ab1d547e65283e208e773065 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 8 Jun 2011 09:21:48 -0700
Subject: [PATCH] DO NOT MERGE Fix NPE in Tab.saveState()

 Bug: 4560461

Change-Id: I38df19ee264e4dd66b117a73fbe3ce5362bd76e1
---
 src/com/android/browser/Tab.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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