Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

packages-apps-Browser: Commit

packages/apps/Browser


Commit MetaInfo

Revision3b8a7db6eaf0e574ab1d547e65283e208e773065 (tree)
Time2011-06-09 01:21:48
AuthorJohn Reck <jreck@goog...>
CommiterJohn Reck

Log Message

DO NOT MERGE Fix NPE in Tab.saveState()

Bug: 4560461

Change-Id: I38df19ee264e4dd66b117a73fbe3ce5362bd76e1

Change Summary

Incremental Difference

--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -1920,10 +1920,10 @@ class Tab {
19201920 final WebHistoryItem item = list != null ? list.getCurrentItem() : null;
19211921 populatePickerData(item);
19221922
1923- if (mPickerData.mUrl != null) {
1923+ if (mPickerData != null && mPickerData.mUrl != null) {
19241924 mSavedState.putString(CURRURL, mPickerData.mUrl);
19251925 }
1926- if (mPickerData.mTitle != null) {
1926+ if (mPickerData != null && mPickerData.mTitle != null) {
19271927 mSavedState.putString(CURRTITLE, mPickerData.mTitle);
19281928 }
19291929 mSavedState.putBoolean(CLOSEONEXIT, mCloseOnExit);
Show on old repository browser