commit e659d7b3363a01d238197c65ab032b73c2a0b9d4
author John Reck <jreck@google.com> Thu Oct 13 15:51:02 2011 -0700
committer John Reck <jreck@google.com> Thu Oct 13 15:51:02 2011 -0700
tree e125555d4d6ddf5545c26a56099084534a30e711
parent 132eedfc1cf97456cf03d55968bed4bc9e4eb817

Expand scope of try/catch

 Bug: 5458165

Change-Id: I6e2ca495189179086e313e0ed61217649a9b1e8a

src/com/android/browser/CrashRecoveryHandler.java

diff --git a/src/com/android/browser/CrashRecoveryHandler.java b/src/com/android/browser/CrashRecoveryHandler.java
index 396985a..3202016 100644
--- a/src/com/android/browser/CrashRecoveryHandler.java
+++ b/src/com/android/browser/CrashRecoveryHandler.java
@@ -200,12 +200,13 @@
             parcel.unmarshall(data, 0, data.length);
             parcel.setDataPosition(0);
             state = parcel.readBundle();
+            if (state != null && !state.isEmpty()) {
+                return state;
+            }
         } catch (FileNotFoundException e) {
             // No state to recover
-            state = null;
         } catch (Throwable e) {
             Log.w(LOGTAG, "Failed to recover state!", e);
-            state = null;
         } finally {
             parcel.recycle();
             if (fin != null) {
@@ -214,9 +215,6 @@
                 } catch (IOException e) { }
             }
         }
-        if (state != null && !state.isEmpty()) {
-            return state;
-        }
         return null;
     }