commit 0b9aca339b46a2b0938a185c7b9ac0c9c18849ea
author Joël Stemmer <jstemmer@google.com> Tue Jan 30 17:02:40 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 30 17:02:40 2024 +0000
tree c1a22fb51598cbbb6752d5fbcd7c651b41548a41
parent 4185ad40fe6b3ffb0bb5330497772471f7cf73ef
parent aa74ed121ff2ba0535aa32f2c8159526fbc6a4d7

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

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

diff --git a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java
index 0559708..d85dd87 100644
--- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java
+++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java
@@ -732,6 +732,7 @@
                     BackupManagerMonitor.LOG_EVENT_CATEGORY_BACKUP_MANAGER_POLICY,
                     monitoringExtras);
             EventLog.writeEvent(EventLogTags.RESTORE_TRANSPORT_FAILURE);
+            mStatus = BackupTransport.TRANSPORT_ERROR;
             nextState = UnifiedRestoreState.FINAL;
         } finally {
             executeNextState(nextState);