diff options
author | Tyler Gunn <tgunn@google.com> | 2014-07-10 08:12:27 -0700 |
---|---|---|
committer | Tyler Gunn <tgunn@google.com> | 2014-07-10 08:12:27 -0700 |
commit | a315de3cb1c62569f7de1f25ec5b4ad425ebdf07 (patch) | |
tree | 946cc33500711ce47e30d70884b53ea7bd2b0350 /src | |
parent | 2ce22af86c7d6ea3c7d2944666609cbdbf9adc53 (diff) | |
download | packages_providers_ContactsProvider-a315de3cb1c62569f7de1f25ec5b4ad425ebdf07.zip packages_providers_ContactsProvider-a315de3cb1c62569f7de1f25ec5b4ad425ebdf07.tar.gz packages_providers_ContactsProvider-a315de3cb1c62569f7de1f25ec5b4ad425ebdf07.tar.bz2 |
Add features and data_usage columns to calls table.
Bug: 16015261
Change-Id: I08d28a5af5b52cc8ca2e03e6db82f68807c1f69f
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/providers/contacts/CallLogProvider.java | 2 | ||||
-rw-r--r-- | src/com/android/providers/contacts/ContactsDatabaseHelper.java | 22 |
2 files changed, 21 insertions, 3 deletions
diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java index a4e642c..886f484 100644 --- a/src/com/android/providers/contacts/CallLogProvider.java +++ b/src/com/android/providers/contacts/CallLogProvider.java @@ -74,7 +74,9 @@ public class CallLogProvider extends ContentProvider { sCallsProjectionMap.put(Calls.NUMBER_PRESENTATION, Calls.NUMBER_PRESENTATION); sCallsProjectionMap.put(Calls.DATE, Calls.DATE); sCallsProjectionMap.put(Calls.DURATION, Calls.DURATION); + sCallsProjectionMap.put(Calls.DATA_USAGE, Calls.DATA_USAGE); sCallsProjectionMap.put(Calls.TYPE, Calls.TYPE); + sCallsProjectionMap.put(Calls.FEATURES, Calls.FEATURES); sCallsProjectionMap.put(Calls.PHONE_ACCOUNT_COMPONENT_NAME, Calls.PHONE_ACCOUNT_COMPONENT_NAME); sCallsProjectionMap.put(Calls.PHONE_ACCOUNT_ID, Calls.PHONE_ACCOUNT_ID); sCallsProjectionMap.put(Calls.NEW, Calls.NEW); diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index b7f16bb..956513c 100644 --- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java +++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java @@ -114,7 +114,7 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { * 900-999 L * </pre> */ - static final int DATABASE_VERSION = 903; + static final int DATABASE_VERSION = 904; public interface Tables { public static final String CONTACTS = "contacts"; @@ -1465,7 +1465,9 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { Calls.PRESENTATION_ALLOWED + "," + Calls.DATE + " INTEGER," + Calls.DURATION + " INTEGER," + + Calls.DATA_USAGE + " INTEGER," + Calls.TYPE + " INTEGER," + + Calls.FEATURES + " INTEGER NOT NULL DEFAULT 0," + Calls.PHONE_ACCOUNT_COMPONENT_NAME + " TEXT," + Calls.PHONE_ACCOUNT_ID + " TEXT," + Calls.NEW + " INTEGER," + @@ -2752,6 +2754,11 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { oldVersion = 903; } + if (oldVersion < 904) { + upgradeToVersion904(db); + oldVersion = 904; + } + if (upgradeViewsAndTriggers) { createContactsViews(db); createGroupsView(db); @@ -4057,8 +4064,8 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { private void upgradeToVersion902(SQLiteDatabase db) { // adding account identifier to call log table - db.execSQL("ALTER TABLE calls ADD "+ Calls.PHONE_ACCOUNT_COMPONENT_NAME + " TEXT;"); - db.execSQL("ALTER TABLE calls ADD "+ Calls.PHONE_ACCOUNT_ID + " TEXT;"); + db.execSQL("ALTER TABLE calls ADD subscription_component_name TEXT;"); + db.execSQL("ALTER TABLE calls ADD subscription_id TEXT;"); } /** @@ -4114,6 +4121,15 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { } } + /** + * Updates the calls table in the database to include the call_duration and features columns. + * @param db The database to update. + */ + private void upgradeToVersion904(SQLiteDatabase db) { + db.execSQL("ALTER TABLE calls ADD features INTEGER NOT NULL DEFAULT 0;"); + db.execSQL("ALTER TABLE calls ADD data_usage INTEGER;"); + } + public String extractHandleFromEmailAddress(String email) { Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(email); if (tokens.length == 0) { |