commit 751a96a040ada09199ca3356d9a515ec090d1237
author Chris Tate <ctate@android.com> Tue Jul 28 22:56:41 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 28 22:56:41 2015 +0000
tree c8be98d60cac7a29253876bc6106699a78f34185
parent 5faa033615dcb4297fcb6a81828099285364942d
parent 6ab2fb61f08d87e01874114c3c204166a287e92c

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

services/backup/java/com/android/server/backup/BackupManagerService.java

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 @@
             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