aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormike dooley <mdooley@google.com>2017-05-02 22:08:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-02 22:08:45 +0000
commitfb3a649a4b680a4ac60abe6c61f89a23781b089e (patch)
tree64027ea0831029bca840594d515b790b76c45368
parentf19efe9fd55f2e6cfc9be0a7c9ae5cbcac5590a7 (diff)
parentbcec6b7482ad50f2ca9025b3b20624dd89b7c000 (diff)
downloadContactsProvider-fb3a649a4b680a4ac60abe6c61f89a23781b089e.tar.gz
Adding voicemail transcription state to voicemail database
am: bcec6b7482 Change-Id: I40a105de834241b33e6d1bf3ef505b9c0ccd6b32
-rw-r--r--src/com/android/providers/contacts/CallLogDatabaseHelper.java14
-rw-r--r--src/com/android/providers/contacts/CallLogProvider.java1
-rw-r--r--src/com/android/providers/contacts/VoicemailContentTable.java2
3 files changed, 16 insertions, 1 deletions
diff --git a/src/com/android/providers/contacts/CallLogDatabaseHelper.java b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
index be3e90e2..d4ed9304 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 = 4;
+ private static final int DATABASE_VERSION = 5;
private static final boolean DEBUG = false; // DON'T SUBMIT WITH TRUE
@@ -151,6 +151,7 @@ public class CallLogDatabaseHelper {
Voicemails.SOURCE_DATA + " TEXT," +
Voicemails.SOURCE_PACKAGE + " TEXT," +
Voicemails.TRANSCRIPTION + " TEXT," +
+ Voicemails.TRANSCRIPTION_STATE + " INTEGER NOT NULL DEFAULT 0," +
Voicemails.STATE + " INTEGER," +
Voicemails.DIRTY + " INTEGER NOT NULL DEFAULT 0," +
Voicemails.DELETED + " INTEGER NOT NULL DEFAULT 0," +
@@ -195,6 +196,10 @@ public class CallLogDatabaseHelper {
if (oldVersion < 4) {
upgradeToVersion4(db);
}
+
+ if (oldVersion < 5) {
+ upgradeToVersion5(db);
+ }
}
}
@@ -264,6 +269,13 @@ public class CallLogDatabaseHelper {
}
/**
+ * Add {@link Voicemails.TRANSCRIPTION_STATE} column to the CallLog database.
+ */
+ private void upgradeToVersion5(SQLiteDatabase db) {
+ db.execSQL("ALTER TABLE calls ADD transcription_state INTEGER NOT NULL DEFAULT 0");
+ }
+
+ /**
* 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 9d2111ff..9b53c0ef 100644
--- a/src/com/android/providers/contacts/CallLogProvider.java
+++ b/src/com/android/providers/contacts/CallLogProvider.java
@@ -135,6 +135,7 @@ public class CallLogProvider extends ContentProvider {
sCallsProjectionMap.put(Calls.NEW, Calls.NEW);
sCallsProjectionMap.put(Calls.VOICEMAIL_URI, Calls.VOICEMAIL_URI);
sCallsProjectionMap.put(Calls.TRANSCRIPTION, Calls.TRANSCRIPTION);
+ sCallsProjectionMap.put(Calls.TRANSCRIPTION_STATE, Calls.TRANSCRIPTION_STATE);
sCallsProjectionMap.put(Calls.IS_READ, Calls.IS_READ);
sCallsProjectionMap.put(Calls.CACHED_NAME, Calls.CACHED_NAME);
sCallsProjectionMap.put(Calls.CACHED_NUMBER_TYPE, Calls.CACHED_NUMBER_TYPE);
diff --git a/src/com/android/providers/contacts/VoicemailContentTable.java b/src/com/android/providers/contacts/VoicemailContentTable.java
index 9e36c520..09a8c1f0 100644
--- a/src/com/android/providers/contacts/VoicemailContentTable.java
+++ b/src/com/android/providers/contacts/VoicemailContentTable.java
@@ -64,6 +64,7 @@ public class VoicemailContentTable implements VoicemailTable.Delegate {
.add(Voicemails.DURATION)
.add(Voicemails.IS_READ)
.add(Voicemails.TRANSCRIPTION)
+ .add(Voicemails.TRANSCRIPTION_STATE)
.add(Voicemails.STATE)
.add(Voicemails.SOURCE_DATA)
.add(Voicemails.SOURCE_PACKAGE)
@@ -102,6 +103,7 @@ public class VoicemailContentTable implements VoicemailTable.Delegate {
.add(Voicemails.DURATION)
.add(Voicemails.IS_READ)
.add(Voicemails.TRANSCRIPTION)
+ .add(Voicemails.TRANSCRIPTION_STATE)
.add(Voicemails.STATE)
.add(Voicemails.SOURCE_DATA)
.add(Voicemails.SOURCE_PACKAGE)