Add phone_account_* fields to voicemail content table allowed columns.

This allows updating and querying of voicemail entires for their
respective phone account columns.

Update tests to reflect this change:
- Increase number of voicemail columns to 18
- Add phone_account_* fields to update test

Bug: 19236241
Change-Id: I16b3c9d2a74bc7e169de4dd108b39b94acc98c4f

2 files changed, 6 insertions, 2 deletions

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index d0e3810..91fceae 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -20,10 +20,12 @@
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
 
     <application>
         <uses-library android:name="android.test.runner" />
-        
+
         <!-- Mock contacts sync adapter -->
         <service android:name=".MockSyncAdapter" android:exported="true">
             <meta-data android:name="android.provider.CONTACTS_STRUCTURE"
diff --git a/tests/src/com/android/providers/contacts/VoicemailProviderTest.java b/tests/src/com/android/providers/contacts/VoicemailProviderTest.java
index 1d3ac8a..4f79837 100644
--- a/tests/src/com/android/providers/contacts/VoicemailProviderTest.java
+++ b/tests/src/com/android/providers/contacts/VoicemailProviderTest.java
@@ -58,7 +58,7 @@ public class VoicemailProviderTest extends BaseVoicemailProviderTest {
             Calls.COUNTRY_ISO
     };
     /** Total number of columns exposed by voicemail provider. */
-    private static final int NUM_VOICEMAIL_FIELDS = 16;
+    private static final int NUM_VOICEMAIL_FIELDS = 18;
 
     @Override
     protected void setUp() throws Exception {
@@ -115,6 +115,8 @@ public class VoicemailProviderTest extends BaseVoicemailProviderTest {
         values.put(Voicemails.STATE, 2);
         values.put(Voicemails.HAS_CONTENT, 1);
         values.put(Voicemails.SOURCE_DATA, "foo");
+        values.put(Voicemails.PHONE_ACCOUNT_COMPONENT_NAME, "dummy_name");
+        values.put(Voicemails.PHONE_ACCOUNT_ID, "dummy_account");
         int count = mResolver.update(uri, values, null, null);
         assertEquals(1, count);
         assertStoredValues(uri, values);