aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-01-10 23:00:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-01-10 23:00:51 +0000
commita46b29830088c91a21ce390cd5981740ac3bc08b (patch)
tree9979a32af228beb6c8f641f53bfbad760cef129b
parentd84406fb39c1fcff03b181e68a3a74ec29d93f88 (diff)
parent0cd861f7a1a3c853152e92dc79282ac748712602 (diff)
downloadContactsProvider-a46b29830088c91a21ce390cd5981740ac3bc08b.tar.gz
Merge "Allow Voicemails to be inserted as not new."
-rw-r--r--src/com/android/providers/contacts/VoicemailContentTable.java2
-rw-r--r--tests/src/com/android/providers/contacts/VoicemailProviderTest.java9
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/providers/contacts/VoicemailContentTable.java b/src/com/android/providers/contacts/VoicemailContentTable.java
index 7025bda5..67dda926 100644
--- a/src/com/android/providers/contacts/VoicemailContentTable.java
+++ b/src/com/android/providers/contacts/VoicemailContentTable.java
@@ -63,6 +63,7 @@ public class VoicemailContentTable implements VoicemailTable.Delegate {
.add(Voicemails.NUMBER)
.add(Voicemails.DATE)
.add(Voicemails.DURATION)
+ .add(Voicemails.NEW)
.add(Voicemails.IS_READ)
.add(Voicemails.TRANSCRIPTION)
.add(Voicemails.TRANSCRIPTION_STATE)
@@ -104,6 +105,7 @@ public class VoicemailContentTable implements VoicemailTable.Delegate {
.add(Voicemails.NUMBER)
.add(Voicemails.DATE)
.add(Voicemails.DURATION)
+ .add(Voicemails.NEW)
.add(Voicemails.IS_READ)
.add(Voicemails.TRANSCRIPTION)
.add(Voicemails.TRANSCRIPTION_STATE)
diff --git a/tests/src/com/android/providers/contacts/VoicemailProviderTest.java b/tests/src/com/android/providers/contacts/VoicemailProviderTest.java
index 973d0490..d2bfa875 100644
--- a/tests/src/com/android/providers/contacts/VoicemailProviderTest.java
+++ b/tests/src/com/android/providers/contacts/VoicemailProviderTest.java
@@ -71,7 +71,7 @@ public class VoicemailProviderTest extends BaseVoicemailProviderTest {
/**
* Total number of columns exposed by voicemail provider.
*/
- private static final int NUM_VOICEMAIL_FIELDS = 24;
+ private static final int NUM_VOICEMAIL_FIELDS = 25;
@Override
protected void setUp() throws Exception {
@@ -119,14 +119,16 @@ public class VoicemailProviderTest extends BaseVoicemailProviderTest {
public void testInsertReadMessageIsNotNew() throws Exception {
ContentValues values = getTestReadVoicemailValues();
+ values.remove(Voicemails.NEW);
Uri uri = mResolver.insert(voicemailUri(), values);
String[] projection = {Voicemails.NUMBER, Voicemails.DATE, Voicemails.DURATION,
- Voicemails.TRANSCRIPTION, Voicemails.IS_READ, Voicemails.HAS_CONTENT,
+ Voicemails.TRANSCRIPTION, Voicemails.NEW, Voicemails.IS_READ,
+ Voicemails.HAS_CONTENT,
Voicemails.SOURCE_DATA, Voicemails.STATE,
Voicemails.BACKED_UP, Voicemails.RESTORED, Voicemails.ARCHIVED,
Voicemails.IS_OMTP_VOICEMAIL
};
- Cursor c = mResolver.query(uri, projection, Calls.NEW + "=0", null,
+ Cursor c = mResolver.query(uri, projection, Voicemails.NEW + "=0", null,
null);
try {
assertEquals("Record count", 1, c.getCount());
@@ -868,6 +870,7 @@ public class VoicemailProviderTest extends BaseVoicemailProviderTest {
values.put(Voicemails.NUMBER, "1-800-4664-411");
values.put(Voicemails.DATE, 1000);
values.put(Voicemails.DURATION, 30);
+ values.put(Voicemails.NEW, 0);
values.put(Voicemails.TRANSCRIPTION, "Testing 123");
values.put(Voicemails.IS_READ, 0);
values.put(Voicemails.HAS_CONTENT, 0);