diff options
author | Nancy Chen <nancychen@google.com> | 2015-04-03 21:24:07 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-03 21:24:08 +0000 |
commit | 76f69956794e6ce36ffd2971455be5630becbd41 (patch) | |
tree | 154f403a202369586edb8d6f0ebf966ceb53145e /tests | |
parent | 6012b85f0eef8ebcfcb73b72216d17893804d4ea (diff) | |
parent | dca8f302db8e661f13f3585bc67c53a5adf36617 (diff) | |
download | packages_providers_ContactsProvider-76f69956794e6ce36ffd2971455be5630becbd41.zip packages_providers_ContactsProvider-76f69956794e6ce36ffd2971455be5630becbd41.tar.gz packages_providers_ContactsProvider-76f69956794e6ce36ffd2971455be5630becbd41.tar.bz2 |
Merge "Add phone_account_* fields to voicemail content table allowed columns."
Diffstat (limited to 'tests')
-rw-r--r-- | tests/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | tests/src/com/android/providers/contacts/VoicemailProviderTest.java | 4 |
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); |