From 5fe9573b5dca5de8d789459eedb1df49497f3ae3 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 29 Jul 2015 10:40:24 -0700 Subject: Fix the Oem marker written to Call log backup. The addCallToBackup() of CallLogBackupAgent.java wrote the OEM maker as: data.wirteInt(END_OEM_DATA_MAKER + 1) but while restoring it, we just readInt() and compare the retrieved marker with END_OEM_DATA_MAKER, so it always fails. Detected via CTS test failure in b/22776570. BUG: 22776570 Change-Id: Ifc76ae9e66deec81edd2b049116f0eb6d260adf9 --- src/com/android/providers/calllogbackup/CallLogBackupAgent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/providers/calllogbackup/CallLogBackupAgent.java b/src/com/android/providers/calllogbackup/CallLogBackupAgent.java index 7d43fd1..8f211b6 100644 --- a/src/com/android/providers/calllogbackup/CallLogBackupAgent.java +++ b/src/com/android/providers/calllogbackup/CallLogBackupAgent.java @@ -379,7 +379,7 @@ public class CallLogBackupAgent extends BackupAgent { data.writeUTF(oemData.namespace); data.writeInt(oemData.bytes.length); data.write(oemData.bytes); - data.writeInt(END_OEM_DATA_MARKER + 1); + data.writeInt(END_OEM_DATA_MARKER); data.flush(); -- cgit v1.2.3