Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev

Browse Source 
* commit 'c0a2254e083f7d2f38052012363cd71d1a6657dc':
  Clean up properly if outcall for doRestoreFinished() fails
This commit is contained in:
Chris Tate
2015-08-18 01:13:24 +00:00
committed by Android Git Automerger
parent 0c61fe7606 c0a2254e08
commit b16cd62c67
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -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 // If we get this far, the callback or timeout will schedule the
// next restore state, so we're done // next restore state, so we're done
} catch (Exception e) { } catch (Exception e) {
Slog.e(TAG, "Unable to finalize restore of " + mCurrentPackage.packageName); final String packageName = mCurrentPackage.packageName;
executeNextState(UnifiedRestoreState.FINAL); Slog.e(TAG, "Unable to finalize restore of " + packageName);
EventLog.writeEvent(EventLogTags.RESTORE_AGENT_FAILURE,
packageName, e.toString());
keyValueAgentErrorCleanup();
executeNextState(UnifiedRestoreState.RUNNING_QUEUE);
} }
} }