commit 17f41872cac002cf4aa7d0e27ebfcc9d782c7873
author Hall Liu <hallliu@google.com> Wed Oct 14 15:13:51 2015 -0700
committer Hall Liu <hallliu@google.com> Thu Oct 15 16:09:42 2015 -0700
tree 3979ca2a6ebd874e9ea60c5ef9958b659a3645e5
parent d8a020c98d0f53acb0c10465848a9b6096f88739

Add support for post dial digits to logs

Bug: 24955678
Change-Id: I4304146ceb446145faeeaf06641c8d8547607f79

src/com/android/providers/contacts/CallLogProvider.java

diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java
index f83e4a7..13264a9 100644
--- a/src/com/android/providers/contacts/CallLogProvider.java
+++ b/src/com/android/providers/contacts/CallLogProvider.java
@@ -116,6 +116,7 @@
         sCallsProjectionMap = new HashMap<String, String>();
         sCallsProjectionMap.put(Calls._ID, Calls._ID);
         sCallsProjectionMap.put(Calls.NUMBER, Calls.NUMBER);
+        sCallsProjectionMap.put(Calls.POST_DIAL_DIGITS, Calls.POST_DIAL_DIGITS);
         sCallsProjectionMap.put(Calls.NUMBER_PRESENTATION, Calls.NUMBER_PRESENTATION);
         sCallsProjectionMap.put(Calls.DATE, Calls.DATE);
         sCallsProjectionMap.put(Calls.DURATION, Calls.DURATION);

src/com/android/providers/contacts/ContactsDatabaseHelper.java

diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index 10f6a2d..c9d3e60 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -128,7 +128,7 @@
      *   1100-1199 N
      * </pre>
      */
-    static final int DATABASE_VERSION = 1105;
+    static final int DATABASE_VERSION = 1106;
 
     public interface Tables {
         public static final String CONTACTS = "contacts";
@@ -3035,6 +3035,11 @@
             oldVersion = 1105;
         }
 
+        if (oldVersion < 1106) {
+            upgradeToVersion1106(db);
+            oldVersion = 1106;
+        }
+
         if (upgradeViewsAndTriggers) {
             createContactsViews(db);
             createGroupsView(db);
@@ -4616,6 +4621,10 @@
                 "account_id);");
     }
 
+    public void upgradeToVersion1106(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE calls ADD post_dial_digits TEXT NOT NULL DEFAULT ''");
+    }
+
     /**
      * Generate hash_id from data1, data2 and data15 columns.
      * If one of data1 and data2 is not null, using data1 and data2 to get hash_id,