commit 8bfb64b61aa3bf5c9c6c04ff5df70be0bd7cd342
author Linux Build Service Account <lnxbuild@localhost> Thu Sep 26 00:09:24 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 26 00:09:23 2013 -0700
tree 654473905ed8bebf7412e86ae85dd11e9aa03087
parent 0a2947edcd890ac44769d62d44cd30addba5a5bd
parent 29c2059b32ca3ce50ecfdca0adeb542810cb80c8

Merge "Browser: Fix NPE when save tabs' view state"

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 852aa25..e33a56b 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -1884,6 +1884,8 @@
             return false;
         }
         long size = savedFile.length();
+        if (values == null)
+            return false;
         values.put(Snapshots.VIEWSTATE_PATH, path);
         values.put(Snapshots.VIEWSTATE_SIZE, size);
         return true;