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

Commit 2cfb7e39 authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov Committed by Automerger Merge Worker
Browse files

Merge "Retrieve BackupAgent logs after onRestoreFinished completes execution"... 

Merge "Retrieve BackupAgent logs after onRestoreFinished completes execution" into udc-dev am: cdafea74 am: 629c5d83

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23155130



Change-Id: I099426f082f7ef143f1d5675ffc6c29289990009
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e218fa41 629c5d83

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

+5 −3
Original line number Diff line number Diff line
@@ -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();