summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Menke <grantmenke@google.com>2023-05-02 23:27:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-02 23:27:20 +0000
commitc46b0b52ab1933ae9f7a77e13e398720a85fa4a6 (patch)
treebd7ea01673df3ee3660759e7e385aab52777f9d8
parentb2919ce877e19cb1b27b5925e58321c1cfd7ba33 (diff)
parente225f918a40322f7f16f007987d965dbcab56bee (diff)
downloadCallLogProvider-c46b0b52ab1933ae9f7a77e13e398720a85fa4a6.tar.gz
Report existing calls as successful backups in CallLogBackupAgent. am: 1eac75a439 am: e225f918a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CallLogProvider/+/22975967 Change-Id: Ic38e6d266f762e13bcccd41ba0de0835c5b2b0a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--src/com/android/calllogbackup/CallLogBackupAgent.java1
-rw-r--r--tests/src/com/android/calllogbackup/CallLogBackupAgentTest.java4
2 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/calllogbackup/CallLogBackupAgent.java b/src/com/android/calllogbackup/CallLogBackupAgent.java
index b0b0c1c..4bb55b0 100644
--- a/src/com/android/calllogbackup/CallLogBackupAgent.java
+++ b/src/com/android/calllogbackup/CallLogBackupAgent.java
@@ -302,6 +302,7 @@ public class CallLogBackupAgent extends BackupAgent {
// This call still exists in the current call log so delete it from the
// "callsToRemove" set since we want to keep it.
callsToRemove.remove(call.id);
+ mBackupRestoreEventLoggerProxy.logItemsBackedUp(CALLLOGS, /* count */ 1);
}
}
diff --git a/tests/src/com/android/calllogbackup/CallLogBackupAgentTest.java b/tests/src/com/android/calllogbackup/CallLogBackupAgentTest.java
index 96ac049..de681e5 100644
--- a/tests/src/com/android/calllogbackup/CallLogBackupAgentTest.java
+++ b/tests/src/com/android/calllogbackup/CallLogBackupAgentTest.java
@@ -371,6 +371,10 @@ public class CallLogBackupAgentTest extends AndroidTestCase {
mCallLogBackupAgent.runBackup(state, mBackupDataOutput, calls);
+ // Ensure the {@link BackupRestoreEventLogger} is informed of the 2 backed up calls:
+ assertEquals(backupRestoreLoggerSuccessCount, 2);
+ assertEquals(backupRestoreLoggerFailCount, 0);
+
InOrder inOrder = Mockito.inOrder(mBackupDataOutput);
inOrder.verify(mBackupDataOutput).writeEntityHeader(eq("102"), Matchers.anyInt());
inOrder.verify(mBackupDataOutput).