Merge "Don't hang in restore if the transport reports failure" into ics-factoryrom

Author: Christopher Tate

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

@@ -4372,8 +4372,13 @@ void initiateOneRestore(PackageInfo app, int appVersionCode, IBackupAgent agent,
                             ParcelFileDescriptor.MODE_TRUNCATE);
 
                 if (mTransport.getRestoreData(mBackupData) != BackupConstants.TRANSPORT_OK) {
+                    // Transport-level failure, so we wind everything up and
+                    // terminate the restore operation.
                     Slog.e(TAG, "Error getting restore data for " + packageName);
                     EventLog.writeEvent(EventLogTags.RESTORE_TRANSPORT_FAILURE);
+                    mBackupData.close();
+                    mBackupDataName.delete();
+                    executeNextState(RestoreState.FINAL);
                     return;
                 }