diff options
| author | Chris Tate <ctate@android.com> | 2015-08-18 01:07:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-18 01:07:50 +0000 |
| commit | c0a2254e083f7d2f38052012363cd71d1a6657dc (patch) | |
| tree | 09a67f2be69c469866cf6aadc4cedb500fed07c1 /services | |
| parent | 7aa6fc67d7c1c02cd2e99e8d94b4c0b8918c4d3f (diff) | |
| parent | d71d7c350c76d3494dd6688c26a837fa41ea18f8 (diff) | |
| download | frameworks_base-c0a2254e083f7d2f38052012363cd71d1a6657dc.zip frameworks_base-c0a2254e083f7d2f38052012363cd71d1a6657dc.tar.gz frameworks_base-c0a2254e083f7d2f38052012363cd71d1a6657dc.tar.bz2 | |
Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 83b953e..8d9c965 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -7848,8 +7848,12 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF // If we get this far, the callback or timeout will schedule the // next restore state, so we're done } catch (Exception e) { - Slog.e(TAG, "Unable to finalize restore of " + mCurrentPackage.packageName); - executeNextState(UnifiedRestoreState.FINAL); + final String packageName = mCurrentPackage.packageName; + Slog.e(TAG, "Unable to finalize restore of " + packageName); + EventLog.writeEvent(EventLogTags.RESTORE_AGENT_FAILURE, + packageName, e.toString()); + keyValueAgentErrorCleanup(); + executeNextState(UnifiedRestoreState.RUNNING_QUEUE); } } |