summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2015-07-29 10:40:24 -0700
committerRoshan Pius <rpius@google.com>2015-07-29 10:41:24 -0700
commit5fe9573b5dca5de8d789459eedb1df49497f3ae3 (patch)
treeaf87b7dd6b8119240d83ac0f3520ee621cc22b8f
parentf128d20ada7474e5714f81533b8f77e915315c1a (diff)
downloadandroid_packages_providers_CallLogProvider-5fe9573b5dca5de8d789459eedb1df49497f3ae3.tar.gz
android_packages_providers_CallLogProvider-5fe9573b5dca5de8d789459eedb1df49497f3ae3.tar.bz2
android_packages_providers_CallLogProvider-5fe9573b5dca5de8d789459eedb1df49497f3ae3.zip
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
-rw-r--r--src/com/android/providers/calllogbackup/CallLogBackupAgent.java2
1 files changed, 1 insertions, 1 deletions
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();