Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Retrieve BackupAgent logs after onRestoreFinished completes execution" into udc-dev

Browse Source
This commit is contained in:
Ruslan Tkhakokhov
2023-05-12 20:02:17 +00:00
committed by Android (Google) Code Review
parent 1677bc98b1 2865eb7b21
commit cdafea74a5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java
View File

@@ -900,9 +900,6 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask {
mAgent.doRestoreFinished(mEphemeralOpToken, mAgent.doRestoreFinished(mEphemeralOpToken,
backupManagerService.getBackupManagerBinder()); 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 // If we get this far, the callback or timeout will schedule the
// next restore state, so we're done // next restore state, so we're done
} catch (Exception e) { } catch (Exception e) {
@@ -1323,6 +1320,11 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask {
EventLog.writeEvent(EventLogTags.RESTORE_PACKAGE, EventLog.writeEvent(EventLogTags.RESTORE_PACKAGE,
mCurrentPackage.packageName, size); 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 // Just go back to running the restore queue
keyValueAgentCleanup(); keyValueAgentCleanup();