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

Merge "Don't redundantly call transport.finishRestore()" into mnc-dev

Browse Source
This commit is contained in:
Chris Tate
2015-07-28 22:56:41 +00:00
committed by Android (Google) Code Review
parent 5faa033615 6ab2fb61f0
commit 751a96a040
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() { public void run() {
// clean up the session's bookkeeping // clean up the session's bookkeeping
synchronized (mSession) { synchronized (mSession) {
try { mSession.mRestoreTransport = null;
if (mSession.mRestoreTransport != null) { mSession.mEnded = true;
mSession.mRestoreTransport.finishRestore();
}
} catch (Exception e) {
Slog.e(TAG, "Error in finishRestore", e);
} finally {
mSession.mRestoreTransport = null;
mSession.mEnded = true;
}
} }
// clean up the BackupManagerImpl side of the bookkeeping // clean up the BackupManagerImpl side of the bookkeeping