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 77990af509796..8cbb5dc03b9ec 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java @@ -900,9 +900,6 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { mAgent.doRestoreFinished(mEphemeralOpToken, backupManagerService.getBackupManagerBinder()); - // Ask the agent for logs after doRestoreFinished() to allow it to finalize its logs. - BackupManagerMonitorUtils.monitorAgentLoggingResults(mMonitor, mCurrentPackage, mAgent); - // If we get this far, the callback or timeout will schedule the // next restore state, so we're done } catch (Exception e) { @@ -1323,6 +1320,11 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { EventLog.writeEvent(EventLogTags.RESTORE_PACKAGE, mCurrentPackage.packageName, size); + // Ask the agent for logs after doRestoreFinished() has completed executing to allow + // it to finalize its logs. + BackupManagerMonitorUtils.monitorAgentLoggingResults(mMonitor, mCurrentPackage, + mAgent); + // Just go back to running the restore queue keyValueAgentCleanup();