diff options
| author | Anil Kumar T.V <atumk@codeaurora.org> | 2013-07-19 16:35:54 +0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-02-17 15:35:49 -0800 |
| commit | 506fded15f14c566660818c8601de584ce0ae55d (patch) | |
| tree | 70ecc123c2338a7604aa6f65a94e6546aafb8597 | |
| parent | e108a2f468e255e8edd7e13ad3f561674540787d (diff) | |
| download | android_packages_providers_ContactsProvider-qcril.tar.gz android_packages_providers_ContactsProvider-qcril.tar.bz2 android_packages_providers_ContactsProvider-qcril.zip | |
Add one column for subscription in callLog database.qcril
Add one column for subscription in callLog database
to mark the call state.
Change-Id: Ibac1d8c0d3ab13663ee44ad5cf04c5bde21ac0f0
CRs-Fixed: 590662
| -rw-r--r-- | src/com/android/providers/contacts/CallLogProvider.java | 3 | ||||
| -rw-r--r-- | src/com/android/providers/contacts/ContactsDatabaseHelper.java | 19 |
2 files changed, 20 insertions, 2 deletions
diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java index cb661642..147045ff 100644 --- a/src/com/android/providers/contacts/CallLogProvider.java +++ b/src/com/android/providers/contacts/CallLogProvider.java @@ -88,6 +88,9 @@ public class CallLogProvider extends ContentProvider { sCallsProjectionMap.put(Calls.CACHED_NORMALIZED_NUMBER, Calls.CACHED_NORMALIZED_NUMBER); sCallsProjectionMap.put(Calls.CACHED_PHOTO_ID, Calls.CACHED_PHOTO_ID); sCallsProjectionMap.put(Calls.CACHED_FORMATTED_NUMBER, Calls.CACHED_FORMATTED_NUMBER); + + // To match the multisim, add the subscription for the call log to mark the call log state. + sCallsProjectionMap.put(Calls.SUBSCRIPTION, Calls.SUBSCRIPTION); } private ContactsDatabaseHelper mDbHelper; diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index 03ecef7d..78c9b8af 100644 --- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java +++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java @@ -115,7 +115,7 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { * 800-899 Kitkat * </pre> */ - static final int DATABASE_VERSION = 803; + static final int DATABASE_VERSION = 804; private static final String DATABASE_NAME = "contacts2.db"; private static final String DATABASE_PRESENCE = "presence_db"; @@ -1294,7 +1294,8 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { Voicemails.MIME_TYPE + " TEXT," + Voicemails.SOURCE_DATA + " TEXT," + Voicemails.SOURCE_PACKAGE + " TEXT," + - Voicemails.STATE + " INTEGER" + + Voicemails.STATE + " INTEGER," + + Calls.SUBSCRIPTION + " INTEGER NOT NULL DEFAULT 0" + ");"); // Voicemail source status table. @@ -2526,6 +2527,11 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { oldVersion = 803; } + if (oldVersion < 804) { + upgradeToVersion804(db); + oldVersion = 804; + } + if (upgradeViewsAndTriggers) { createContactsViews(db); createGroupsView(db); @@ -4027,6 +4033,15 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { ContactsContract.PinnedPositions.UNPINNED + ";"); } + private void upgradeToVersion804(SQLiteDatabase db) { + try { + db.execSQL("ALTER TABLE " + Tables.CALLS + + " ADD " + Calls.SUBSCRIPTION + " INTEGER NOT NULL DEFAULT 0;"); + } catch (SQLException e) { + Log.w(TAG, "Exception upgrading contacts2.db from 803 to 804 " + e); + } + } + public String extractHandleFromEmailAddress(String email) { Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(email); if (tokens.length == 0) { |