summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrace Jia <xiaotonj@google.com>2020-11-04 22:41:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-04 22:41:14 +0000
commitf783ac3a6257abda6fc7435d46b14469e14b93dd (patch)
tree5ffea3631feb8ffbf984a2df8ae8a25d3ce698c6
parent7a537a1775ca06ed54735ed835c2f66b465a0394 (diff)
parent84ad642f5d27aa77f296db8309e7ef8fde0f35da (diff)
downloadCallLogProvider-f783ac3a6257abda6fc7435d46b14469e14b93dd.tar.gz
Add missed information relative field. am: 368da290fc am: 8904174583 am: 84ad642f5d
Original change: https://android-review.googlesource.com/c/platform/packages/providers/CallLogProvider/+/1167406 Change-Id: I9e224b8ff1ac341efa3726210cf2b45797e6ab2d
-rw-r--r--src/com/android/calllogbackup/CallLogBackupAgent.java18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/com/android/calllogbackup/CallLogBackupAgent.java b/src/com/android/calllogbackup/CallLogBackupAgent.java
index ca0613b..d589708 100644
--- a/src/com/android/calllogbackup/CallLogBackupAgent.java
+++ b/src/com/android/calllogbackup/CallLogBackupAgent.java
@@ -16,6 +16,8 @@
package com.android.calllogbackup;
+import static android.provider.CallLog.Calls.MISSED_REASON_NOT_MISSED;
+
import android.app.backup.BackupAgent;
import android.app.backup.BackupDataInput;
import android.app.backup.BackupDataOutput;
@@ -78,6 +80,7 @@ public class CallLogBackupAgent extends BackupAgent {
int callBlockReason = Calls.BLOCK_REASON_NOT_BLOCKED;
String callScreeningAppName = null;
String callScreeningComponentName = null;
+ long missedReason = MISSED_REASON_NOT_MISSED;
@Override
public String toString() {
@@ -106,7 +109,7 @@ public class CallLogBackupAgent extends BackupAgent {
/** Current version of CallLogBackup. Used to track the backup format. */
@VisibleForTesting
- static final int VERSION = 1007;
+ static final int VERSION = 1008;
/** Version indicating that there exists no previous backup entry. */
@VisibleForTesting
static final int VERSION_NO_PREVIOUS_STATE = 0;
@@ -137,7 +140,8 @@ public class CallLogBackupAgent extends BackupAgent {
CallLog.Calls.ADD_FOR_ALL_USERS,
CallLog.Calls.BLOCK_REASON,
CallLog.Calls.CALL_SCREENING_APP_NAME,
- CallLog.Calls.CALL_SCREENING_COMPONENT_NAME
+ CallLog.Calls.CALL_SCREENING_COMPONENT_NAME,
+ CallLog.Calls.MISSED_REASON
};
/** ${inheritDoc} */
@@ -270,7 +274,8 @@ public class CallLogBackupAgent extends BackupAgent {
(int) call.duration, dataUsage, addForAllUsers, null, true /* isRead */,
call.callBlockReason /*callBlockReason*/,
call.callScreeningAppName /*callScreeningAppName*/,
- call.callScreeningComponentName /*callScreeningComponentName*/);
+ call.callScreeningComponentName /*callScreeningComponentName*/,
+ call.missedReason);
}
@VisibleForTesting
@@ -386,6 +391,9 @@ public class CallLogBackupAgent extends BackupAgent {
readString(dataInput);
readInteger(dataInput);
}
+ if (version >= 1008) {
+ call.missedReason = dataInput.readLong();
+ }
return call;
} catch (IOException e) {
Log.e(TAG, "Error reading call data for " + callId, e);
@@ -419,6 +427,8 @@ public class CallLogBackupAgent extends BackupAgent {
.getString(cursor.getColumnIndex(CallLog.Calls.CALL_SCREENING_APP_NAME));
call.callScreeningComponentName = cursor
.getString(cursor.getColumnIndex(CallLog.Calls.CALL_SCREENING_COMPONENT_NAME));
+ call.missedReason = cursor
+ .getInt(cursor.getColumnIndex(CallLog.Calls.MISSED_REASON));
return call;
}
@@ -464,6 +474,8 @@ public class CallLogBackupAgent extends BackupAgent {
writeString(data, "");
writeInteger(data, null);
+ data.writeLong(call.missedReason);
+
data.flush();
output.writeEntityHeader(Integer.toString(call.id), baos.size());