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

Commit 0b9aca33 authored by Joël Stemmer's avatar Joël Stemmer Committed by Android (Google) Code Review
Browse files

Merge "Set `mStatus` when `dispatchNextRestore` encounters a transport error" into main

parents 4185ad40 aa74ed12

services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -732,6 +732,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { 
                    BackupManagerMonitor.LOG_EVENT_CATEGORY_BACKUP_MANAGER_POLICY,

                    BackupManagerMonitor.LOG_EVENT_CATEGORY_BACKUP_MANAGER_POLICY,

                    monitoringExtras);

                    monitoringExtras);

            EventLog.writeEvent(EventLogTags.RESTORE_TRANSPORT_FAILURE);

            EventLog.writeEvent(EventLogTags.RESTORE_TRANSPORT_FAILURE);

            mStatus = BackupTransport.TRANSPORT_ERROR;

            nextState = UnifiedRestoreState.FINAL;

            nextState = UnifiedRestoreState.FINAL;

        } finally {

        } finally {

            executeNextState(nextState);

            executeNextState(nextState);