commit 447b89d91843abbc8ba1912eef6f2ce4225265a9
author tonyzhu <tonyzhu@google.com> Mon Oct 22 18:49:59 2018 +0800
committer tonyzhu <tonyzhu@google.com> Tue Nov 06 16:31:09 2018 +0800
tree 1cb602b7799b1de255af3cad702ed6891adb638c
parent cbf73a6daf3aacbe9a3c4fb287dfbd591aeacdee

[Call Screening]Logging of calls blocked by call blocking feature, call screening app.

Change method parameters to match the mothod involved.

Bug: 113304142
Test: atest CallLogBackupAgentTest pass.
Change-Id: Ia0d04b7f44a5dc9174f5bd5c5993d865342b47f1

src/com/android/calllogbackup/CallLogBackupAgent.java

diff --git a/src/com/android/calllogbackup/CallLogBackupAgent.java b/src/com/android/calllogbackup/CallLogBackupAgent.java
index 5a36c02..4717496 100644
--- a/src/com/android/calllogbackup/CallLogBackupAgent.java
+++ b/src/com/android/calllogbackup/CallLogBackupAgent.java
@@ -77,6 +77,9 @@
         Long dataUsage;
         int features;
         int addForAllUsers = 1;
+        int callBlockReason = Calls.BLOCK_REASON_NOT_BLOCKED;
+        String callScreeningAppName = null;
+        String callScreeningComponentName = null;
         @Override
         public String toString() {
             if (isDebug()) {
@@ -104,7 +107,7 @@
 
     /** Current version of CallLogBackup. Used to track the backup format. */
     @VisibleForTesting
-    static final int VERSION = 1005;
+    static final int VERSION = 1006;
     /** Version indicating that there exists no previous backup entry. */
     @VisibleForTesting
     static final int VERSION_NO_PREVIOUS_STATE = 0;
@@ -133,6 +136,9 @@
         CallLog.Calls.DATA_USAGE,
         CallLog.Calls.FEATURES,
         CallLog.Calls.ADD_FOR_ALL_USERS,
+        CallLog.Calls.BLOCK_REASON,
+        CallLog.Calls.CALL_SCREENING_APP_NAME,
+        CallLog.Calls.CALL_SCREENING_COMPONENT_NAME,
     };
 
     /** ${inheritDoc} */
@@ -261,8 +267,11 @@
         boolean addForAllUsers = call.addForAllUsers == 1;
         // We backup the calllog in the user running this backup agent, so write calls to this user.
         Calls.addCall(null /* CallerInfo */, this, call.number, call.postDialDigits, call.viaNumber,
-                call.numberPresentation, call.type, call.features, handle, call.date,
-                (int) call.duration, dataUsage, addForAllUsers, null, true /* is_read */);
+            call.numberPresentation, call.type, call.features, handle, call.date,
+            (int) call.duration, dataUsage, addForAllUsers, null, true /* isRead */,
+            call.callBlockReason /*callBlockReason*/,
+            call.callScreeningAppName /*callScreeningAppName*/,
+            call.callScreeningComponentName /*callScreeningComponentName*/);
     }
 
     @VisibleForTesting
@@ -363,6 +372,12 @@
                 call.viaNumber = readString(dataInput);
             }
 
+            if(version >= 1006) {
+                call.callBlockReason = dataInput.readInt();
+                call.callScreeningAppName = readString(dataInput);
+                call.callScreeningComponentName = readString(dataInput);
+            }
+
             return call;
         } catch (IOException e) {
             Log.e(TAG, "Error reading call data for " + callId, e);
@@ -391,6 +406,11 @@
         call.dataUsage = cursor.getLong(cursor.getColumnIndex(CallLog.Calls.DATA_USAGE));
         call.features = cursor.getInt(cursor.getColumnIndex(CallLog.Calls.FEATURES));
         call.addForAllUsers = cursor.getInt(cursor.getColumnIndex(Calls.ADD_FOR_ALL_USERS));
+        call.callBlockReason = cursor.getInt(cursor.getColumnIndex(CallLog.Calls.BLOCK_REASON));
+        call.callScreeningAppName = cursor
+            .getString(cursor.getColumnIndex(CallLog.Calls.CALL_SCREENING_APP_NAME));
+        call.callScreeningComponentName = cursor
+            .getString(cursor.getColumnIndex(CallLog.Calls.CALL_SCREENING_COMPONENT_NAME));
         return call;
     }
 
@@ -423,6 +443,10 @@
 
             writeString(data, call.viaNumber);
 
+            data.writeInt(call.callBlockReason);
+            writeString(data, call.callScreeningAppName);
+            writeString(data, call.callScreeningComponentName);
+
             data.flush();
 
             output.writeEntityHeader(Integer.toString(call.id), baos.size());