Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7208b98 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 7462251b: Merge "Don\'t hang in restore if the transport reports failure" into ics-factoryrom

* commit '7462251b':
  Don't hang in restore if the transport reports failure
parents 3a6c2e98 7462251b
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -4374,8 +4374,13 @@ class BackupManagerService extends IBackupManager.Stub {
                            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;
                }