From ddb5278dcbf94588b529daaa53c641a95a4669d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Tor=C3=A5s=20Halseth?= Date: Fri, 21 Apr 2017 18:00:28 +0100 Subject: [PATCH] Add log before doRestoreFinished is called on BackupAgent. This is added because only logging before doRestore was previously shown, which meant that if the doRestoreFinished timed out, it would in the logs look like it was the doRestore timing out. Test: adb shell bmgr restore com.android.calllogbackup Bug: 36507762 Change-Id: I2bd6e59ed0c5b0128eaca41b627356d459000065 --- .../java/com/android/server/backup/BackupManagerService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index aa5083dfeb15c..7aaf0f4f661de 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -9187,6 +9187,9 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF // state RESTORE_FINISHED : provide the "no more data" signpost callback at the end private void restoreFinished() { + if (DEBUG) { + Slog.d(TAG, "restoreFinished packageName=" + mCurrentPackage.packageName); + } try { prepareOperationTimeout(mEphemeralOpToken, TIMEOUT_RESTORE_FINISHED_INTERVAL, this, OP_TYPE_RESTORE_WAIT);