diff options
| author | Christopher Tate <ctate@google.com> | 2015-07-28 13:59:35 -0700 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2015-07-28 14:04:04 -0700 |
| commit | 6ab2fb61f08d87e01874114c3c204166a287e92c (patch) | |
| tree | 11f764b6ed3bb80d9efb4c43bf644bd4296a5718 /services | |
| parent | bdbec480e8598bd959a2fc047cfad8b72c8a645b (diff) | |
| download | frameworks_base-6ab2fb61f08d87e01874114c3c204166a287e92c.zip frameworks_base-6ab2fb61f08d87e01874114c3c204166a287e92c.tar.gz frameworks_base-6ab2fb61f08d87e01874114c3c204166a287e92c.tar.bz2 | |
Don't redundantly call transport.finishRestore()
The RestoreSession is no longer responsible for calling finishRestore();
that happens as part of tidying up after running the restore itself,
even in failure cases.
Bug 22640096
Change-Id: I0be52af2ae8c2c1ac685e9904ccb8120f7fcf522
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 |