summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/BackupManagerService.java
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2012-03-23 14:01:40 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-23 14:01:40 -0700
commit5b6f07b46122a0a1f057b28f1c07cbc74e592660 (patch)
tree1afef69430d6403f4c751d70d7b2fdb59f199855 /services/java/com/android/server/BackupManagerService.java
parent0aa4713e47a53377720a043cf1b043ce31cb73da (diff)
parentaa0c02d22182011b2add83b56ef96a303fa53ee0 (diff)
downloadframeworks_base-5b6f07b46122a0a1f057b28f1c07cbc74e592660.zip
frameworks_base-5b6f07b46122a0a1f057b28f1c07cbc74e592660.tar.gz
frameworks_base-5b6f07b46122a0a1f057b28f1c07cbc74e592660.tar.bz2
Merge "Deal gracefully with fatal exceptions during full backup"
Diffstat (limited to 'services/java/com/android/server/BackupManagerService.java')
-rw-r--r--services/java/com/android/server/BackupManagerService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java
index be2e549..bd12270 100644
--- a/services/java/com/android/server/BackupManagerService.java
+++ b/services/java/com/android/server/BackupManagerService.java
@@ -2557,6 +2557,8 @@ class BackupManagerService extends IBackupManager.Stub {
finalizeBackup(out);
} catch (RemoteException e) {
Slog.e(TAG, "App died during full backup");
+ } catch (Exception e) {
+ Slog.e(TAG, "Internal exception during full backup", e);
} finally {
tearDown(pkg);
try {