diff options
| author | John Reck <jreck@google.com> | 2011-10-13 16:33:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-13 16:33:38 -0700 |
| commit | 4ec6e1e521951a3b3d521a20122ba7100dbd6cc8 (patch) | |
| tree | 83c9a9fff134f2342c1665c4ea28d5821793ad10 | |
| parent | 1024c1765e892432975510dddc784c1360975247 (diff) | |
| parent | e659d7b3363a01d238197c65ab032b73c2a0b9d4 (diff) | |
| download | packages_apps_Browser-4ec6e1e521951a3b3d521a20122ba7100dbd6cc8.zip packages_apps_Browser-4ec6e1e521951a3b3d521a20122ba7100dbd6cc8.tar.gz packages_apps_Browser-4ec6e1e521951a3b3d521a20122ba7100dbd6cc8.tar.bz2 | |
Merge "Expand scope of try/catch" into ics-mr0
| -rw-r--r-- | src/com/android/browser/CrashRecoveryHandler.java | 8 |
1 files changed, 3 insertions, 5 deletions
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 @@ public class CrashRecoveryHandler { 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 @@ public class CrashRecoveryHandler { } catch (IOException e) { } } } - if (state != null && !state.isEmpty()) { - return state; - } return null; } |