Merge "Add call Id information to call log provider."

2 files changed, 32 insertions, 1 deletions

diff --git a/src/com/android/providers/contacts/CallLogDatabaseHelper.java b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
index 9aed6d0a..edf7a24a 100644
--- a/src/com/android/providers/contacts/CallLogDatabaseHelper.java
+++ b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
@@ -39,7 +39,7 @@ import com.android.providers.contacts.util.PropertyUtils;
 public class CallLogDatabaseHelper {
     private static final String TAG = "CallLogDatabaseHelper";
 
-    private static final int DATABASE_VERSION = 6;
+    private static final int DATABASE_VERSION = 7;
 
     private static final boolean DEBUG = false; // DON'T SUBMIT WITH TRUE
 
@@ -152,6 +152,13 @@ public class CallLogDatabaseHelper {
                     Calls.CALL_SCREENING_COMPONENT_NAME + " TEXT," +
                     Calls.CALL_SCREENING_APP_NAME + " TEXT," +
                     Calls.BLOCK_REASON + " INTEGER NOT NULL DEFAULT 0," +
+                    Calls.CALL_ID_PACKAGE_NAME + " TEXT NULL, " +
+                    Calls.CALL_ID_APP_NAME + " TEXT NULL, " +
+                    Calls.CALL_ID_NAME + " TEXT NULL, " +
+                    Calls.CALL_ID_DESCRIPTION + " TEXT NULL, " +
+                    Calls.CALL_ID_DETAILS + " TEXT NULL, " +
+                    Calls.CALL_ID_NUISANCE_CONFIDENCE + " INTEGER NULL, " +
+
                     Voicemails._DATA + " TEXT," +
                     Voicemails.HAS_CONTENT + " INTEGER," +
                     Voicemails.MIME_TYPE + " TEXT," +
@@ -211,6 +218,10 @@ public class CallLogDatabaseHelper {
             if (oldVersion < 6) {
                 upgradeToVersion6(db);
             }
+
+            if (oldVersion < 7) {
+                upgradeToVersion7(db);
+            }
         }
     }
 
@@ -298,6 +309,19 @@ public class CallLogDatabaseHelper {
     }
 
     /**
+     * Add {@link android.telecom.CallIdentification} columns.
+     * @param db DB to upgrade
+     */
+    private void upgradeToVersion7(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE calls ADD call_id_package_name TEXT NULL");
+        db.execSQL("ALTER TABLE calls ADD call_id_app_name TEXT NULL");
+        db.execSQL("ALTER TABLE calls ADD call_id_name TEXT NULL");
+        db.execSQL("ALTER TABLE calls ADD call_id_description TEXT NULL");
+        db.execSQL("ALTER TABLE calls ADD call_id_details TEXT NULL");
+        db.execSQL("ALTER TABLE calls ADD call_id_nuisance_confidence INTEGER NULL");
+    }
+
+    /**
      * Perform the migration from the contacts2.db (of the latest version) to the current calllog/
      * voicemail status tables.
      */
diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java
index ff3e65c6..6ae2289a 100644
--- a/src/com/android/providers/contacts/CallLogProvider.java
+++ b/src/com/android/providers/contacts/CallLogProvider.java
@@ -161,6 +161,13 @@ public class CallLogProvider extends ContentProvider {
             .put(Calls.CALL_SCREENING_COMPONENT_NAME, Calls.CALL_SCREENING_COMPONENT_NAME);
         sCallsProjectionMap.put(Calls.CALL_SCREENING_APP_NAME, Calls.CALL_SCREENING_APP_NAME);
         sCallsProjectionMap.put(Calls.BLOCK_REASON, Calls.BLOCK_REASON);
+        sCallsProjectionMap.put(Calls.CALL_ID_PACKAGE_NAME, Calls.CALL_ID_PACKAGE_NAME);
+        sCallsProjectionMap.put(Calls.CALL_ID_APP_NAME, Calls.CALL_ID_APP_NAME);
+        sCallsProjectionMap.put(Calls.CALL_ID_NAME, Calls.CALL_ID_NAME);
+        sCallsProjectionMap.put(Calls.CALL_ID_DESCRIPTION, Calls.CALL_ID_DESCRIPTION);
+        sCallsProjectionMap.put(Calls.CALL_ID_DETAILS, Calls.CALL_ID_DETAILS);
+        sCallsProjectionMap.put(Calls.CALL_ID_NUISANCE_CONFIDENCE,
+                Calls.CALL_ID_NUISANCE_CONFIDENCE);
     }
 
     private static final String ALLOWED_PACKAGE_FOR_TESTING = "com.android.providers.contacts";