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

am 403e22b9: am 751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev

Browse Source 
* commit '403e22b97dc3763e55bf2fb9ab0d681e7ee6c828':
  Don't redundantly call transport.finishRestore()
This commit is contained in:
Chris Tate
2015-07-28 23:43:42 +00:00
committed by Android Git Automerger
parent f8c9937836 403e22b97d
commit 6613ec44a5
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9535,16 +9535,8 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
public void run() {
// clean up the session's bookkeeping
synchronized (mSession) {
try {
if (mSession.mRestoreTransport != null) {
mSession.mRestoreTransport.finishRestore();
}
} catch (Exception e) {
Slog.e(TAG, "Error in finishRestore", e);
} finally {
mSession.mRestoreTransport = null;
mSession.mEnded = true;
}
mSession.mRestoreTransport = null;
mSession.mEnded = true;
}
// clean up the BackupManagerImpl side of the bookkeeping