diff options
| author | Christopher Tate <ctate@google.com> | 2012-03-23 17:45:15 -0700 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2012-03-23 17:47:58 -0700 |
| commit | 0abf6a001461a4c2ea31ddc44a60b003b4e0554d (patch) | |
| tree | 5abf436d6a7b166f9084d60482ca933ca8716d6f /services/java/com/android/server/BackupManagerService.java | |
| parent | 243806cfeb72e46b39994b2ec3b0908fc7fcc973 (diff) | |
Don't crash when wiping backup data redundantly in the local transport
Previously, if using the "local" debugging transport:
adb shell bmgr wipe com.android.browser
adb shell bmgr wipe com.android.browser
... would bring down the runtime. This no longer happens. The fix
covers two aspects of the situation: 1. the local transport no longer
blows up in this use case, and 2. the backup manager itself now catches
blowups on the part of the transport, and tidies up after them.
Bug 6205185
Change-Id: Ieb9b8827a62523148ad5a0ec15b05a954d198b3d
Diffstat (limited to 'services/java/com/android/server/BackupManagerService.java')
| -rw-r--r-- | services/java/com/android/server/BackupManagerService.java | 2 |
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 bd122707b810..bd8ae17d2297 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -4693,6 +4693,8 @@ class BackupManagerService extends IBackupManager.Stub { mTransport.clearBackupData(mPackage); } catch (RemoteException e) { // can't happen; the transport is local + } catch (Exception e) { + Slog.e(TAG, "Transport threw attempting to clear data for " + mPackage); } finally { try { // TODO - need to handle failures |