summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/CrashRecoveryHandler.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-10-13 15:51:02 -0700
committerJohn Reck <jreck@google.com>2011-10-13 15:51:02 -0700
commite659d7b3363a01d238197c65ab032b73c2a0b9d4 (patch)
treee125555d4d6ddf5545c26a56099084534a30e711 /src/com/android/browser/CrashRecoveryHandler.java
parent132eedfc1cf97456cf03d55968bed4bc9e4eb817 (diff)
downloadandroid_packages_apps_Gello-e659d7b3363a01d238197c65ab032b73c2a0b9d4.tar.gz
android_packages_apps_Gello-e659d7b3363a01d238197c65ab032b73c2a0b9d4.tar.bz2
android_packages_apps_Gello-e659d7b3363a01d238197c65ab032b73c2a0b9d4.zip
Expand scope of try/catch
Bug: 5458165 Change-Id: I6e2ca495189179086e313e0ed61217649a9b1e8a
Diffstat (limited to 'src/com/android/browser/CrashRecoveryHandler.java')
-rw-r--r--src/com/android/browser/CrashRecoveryHandler.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/com/android/browser/CrashRecoveryHandler.java b/src/com/android/browser/CrashRecoveryHandler.java
index 396985ab..3202016e 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;
}