commit aed9c54d8e67bb683a5a415b3775525a3ac00508
author John Reck <jreck@google.com> Fri May 27 16:08:53 2011 -0700
committer John Reck <jreck@google.com> Fri May 27 16:08:53 2011 -0700
tree e82411fbc093c966790e4cd70f04f2ccebcdef22
parent 9465f4db222d280118ecd9a45261a62389dda520

Prevent crashing in CrashRecoveryHandler

 Catch Throwable instead of Exception
 Don't save screenshots for crash recovery

Change-Id: I22c36dc644ae597c609880d2ced79436918d83a6

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 4097334..98d209e 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -1706,6 +1706,15 @@
         return mSavedState;
     }
 
+    Bundle getSavedState(boolean saveImages) {
+        if (saveImages && mScreenshot != null) {
+            Bundle b = new Bundle(mSavedState);
+            b.putParcelable(SCREENSHOT, mScreenshot);
+            return b;
+        }
+        return mSavedState;
+    }
+
     /**
      * Set the saved state.
      */
@@ -1739,9 +1748,6 @@
         if (mParent != null) {
             mSavedState.putLong(PARENTTAB, mParent.mId);
         }
-        if (mScreenshot != null) {
-            mSavedState.putParcelable(SCREENSHOT, mScreenshot);
-        }
         mSavedState.putBoolean(USERAGENT,
                 mSettings.hasDesktopUseragent(getWebView()));
         return true;