diff options
| author | Chris Tate <ctate@android.com> | 2015-07-28 22:56:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-28 22:56:41 +0000 |
| commit | 751a96a040ada09199ca3356d9a515ec090d1237 (patch) | |
| tree | c8be98d60cac7a29253876bc6106699a78f34185 /services | |
| parent | 5faa033615dcb4297fcb6a81828099285364942d (diff) | |
| parent | 6ab2fb61f08d87e01874114c3c204166a287e92c (diff) | |
| download | frameworks_base-751a96a040ada09199ca3356d9a515ec090d1237.zip frameworks_base-751a96a040ada09199ca3356d9a515ec090d1237.tar.gz frameworks_base-751a96a040ada09199ca3356d9a515ec090d1237.tar.bz2 | |
Merge "Don't redundantly call transport.finishRestore()" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index bf41f0f..a0aa569 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -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 |