commit b838ed7178aa531547196f541f4ff4dca719e8f2
author Hall Liu <hallliu@google.com> Wed Oct 14 15:13:51 2015 -0700
committer Hall Liu <hallliu@google.com> Fri Oct 16 15:40:44 2015 -0700
tree 93759ccb33160118ff8337e748bfba5a5790dcdf
parent 349e0f4b527d73ed575d4c33eed1e99599e5acf6

Add support for post dial digits to logs

Bug: 24955678
Change-Id: I37c55887e21a216cf209dc0238e3f54671a8fc7c

src/com/android/calllogbackup/CallLogBackupAgent.java

diff --git a/src/com/android/calllogbackup/CallLogBackupAgent.java b/src/com/android/calllogbackup/CallLogBackupAgent.java
index a6f7c85..ead4e73 100644
--- a/src/com/android/calllogbackup/CallLogBackupAgent.java
+++ b/src/com/android/calllogbackup/CallLogBackupAgent.java
@@ -24,8 +24,6 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.os.ParcelFileDescriptor;
-import android.os.UserHandle;
-import android.os.UserManager;
 import android.provider.CallLog;
 import android.provider.CallLog.Calls;
 import android.provider.Settings;
@@ -67,6 +65,7 @@
         long date;
         long duration;
         String number;
+        String postDialDigits;
         int type;
         int numberPresentation;
         String accountComponentName;
@@ -119,6 +118,7 @@
         CallLog.Calls.DATE,
         CallLog.Calls.DURATION,
         CallLog.Calls.NUMBER,
+        CallLog.Calls.POST_DIAL_DIGITS,
         CallLog.Calls.TYPE,
         CallLog.Calls.COUNTRY_ISO,
         CallLog.Calls.GEOCODED_LOCATION,
@@ -259,9 +259,9 @@
             handle = new PhoneAccountHandle(
                     ComponentName.unflattenFromString(call.accountComponentName), call.accountId);
         }
-        Calls.addCall(null /* CallerInfo */, this, call.number, call.numberPresentation, call.type,
-                call.features, handle, call.date, (int) call.duration,
-                dataUsage, true /* addForAllUsers */, true /* is_read */);
+        Calls.addCall(null /* CallerInfo */, this, call.number, call.postDialDigits,
+                call.numberPresentation, call.type, call.features, handle, call.date,
+                (int) call.duration, dataUsage, true /* addForAllUsers */, true /* is_read */);
     }
 
     @VisibleForTesting
@@ -326,6 +326,7 @@
                 call.date = dataInput.readLong();
                 call.duration = dataInput.readLong();
                 call.number = readString(dataInput);
+                call.postDialDigits = readString(dataInput);
                 call.type = dataInput.readInt();
                 call.numberPresentation = dataInput.readInt();
                 call.accountComponentName = readString(dataInput);
@@ -363,6 +364,8 @@
         call.date = cursor.getLong(cursor.getColumnIndex(CallLog.Calls.DATE));
         call.duration = cursor.getLong(cursor.getColumnIndex(CallLog.Calls.DURATION));
         call.number = cursor.getString(cursor.getColumnIndex(CallLog.Calls.NUMBER));
+        call.postDialDigits = cursor.getString(
+                cursor.getColumnIndex(CallLog.Calls.POST_DIAL_DIGITS));
         call.type = cursor.getInt(cursor.getColumnIndex(CallLog.Calls.TYPE));
         call.numberPresentation =
                 cursor.getInt(cursor.getColumnIndex(CallLog.Calls.NUMBER_PRESENTATION));
@@ -386,6 +389,7 @@
             data.writeLong(call.date);
             data.writeLong(call.duration);
             writeString(data, call.number);
+            writeString(data, call.postDialDigits);
             data.writeInt(call.type);
             data.writeInt(call.numberPresentation);
             writeString(data, call.accountComponentName);