Update dialer sources.

Test: Built package and system image.

This change clobbers the old source, and is an export
from an internal Google repository.

The internal repository was forked form Android in March,
and this change includes modifications since then, to
near the v8 release.

Since the fork, we've moved code from monolithic to independent modules. In addition,
we've switched to Blaze/Bazel as the build sysetm. This export, however, still uses make.

New dependencies have been added:
- Dagger
- Auto-Value
- Glide
- Libshortcutbadger

Going forward, development will still be in Google3, and the Gerrit release
will become an automated export, with the next drop happening in ~ two weeks.

Android.mk includes local modifications from ToT.

Abridged changelog:

Bug fixes
● Not able to mute, add a call when using Phone app in multiwindow mode
● Double tap on keypad triggering multiple key and tones
● Reported spam numbers not showing as spam in the call log
● Crash when user tries to block number while Phone app is not set as default
● Crash when user picks a number from search auto-complete list

Visual Voicemail (VVM) improvements
● Share Voicemail audio via standard exporting mechanisms that support file attachment
(email, MMS, etc.)
● Make phone number, email and web sites in VVM transcript clickable
● Set PIN before declining VVM Terms of Service {Carrier}
● Set client type for outbound visual voicemail SMS {Carrier}

New incoming call and incall UI on older devices
(Android M)
● Updated Phone app icon
● New incall UI (large buttons, button labels)
● New and animated Answer/Reject gestures

Accessibility
● Add custom answer/decline call buttons on answer screen for touch exploration
accessibility services
● Increase size of touch target
● Add verbal feedback when a Voicemail fails to load
● Fix pressing of Phone buttons while in a phone call using Switch Access
● Fix selecting and opening contacts in talkback mode
● Split focus for ‘Learn More’ link in caller id & spam to help distinguish similar text

Other
● Backup & Restore for App Preferences
● Prompt user to enable Wi-Fi calling if the call ends due to out of service and Wi-Fi is
connected
● Rename “Dialpad” to “Keypad”
● Show "Private number" for restricted calls
● Delete unused items (vcard, add contact, call history) from Phone menu

Change-Id: I2a7e53532a24c21bf308bf0a6d178d7ddbca4958

6 files changed, 0 insertions, 1754 deletions

diff --git a/tests/src/com/android/dialer/database/DatabaseTestUtils.java b/tests/src/com/android/dialer/database/DatabaseTestUtils.java
deleted file mode 100644
index 19fff7f89..000000000
--- a/tests/src/com/android/dialer/database/DatabaseTestUtils.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.database;
-
-import android.database.MatrixCursor;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.text.TextUtils;
-
-import com.android.dialer.database.DialerDatabaseHelper.ContactNumber;
-
-public class DatabaseTestUtils {
-    public static MatrixCursor constructNewNameCursor() {
-        final MatrixCursor cursor = new MatrixCursor(new String[]{
-                DialerDatabaseHelper.SmartDialDbColumns.DISPLAY_NAME_PRIMARY,
-                DialerDatabaseHelper.SmartDialDbColumns.CONTACT_ID});
-        return cursor;
-    }
-
-    public static MatrixCursor constructNewContactCursor() {
-        final MatrixCursor cursor = new MatrixCursor(new String[]{
-                    Phone._ID,                          // 0
-                    Phone.TYPE,                         // 1
-                    Phone.LABEL,                        // 2
-                    Phone.NUMBER,                       // 3
-                    Phone.CONTACT_ID,                   // 4
-                    Phone.LOOKUP_KEY,                   // 5
-                    Phone.DISPLAY_NAME_PRIMARY,         // 6
-                    Phone.PHOTO_ID,                     // 7
-                    Data.LAST_TIME_USED,                // 8
-                    Data.TIMES_USED,                    // 9
-                    Contacts.STARRED,                   // 10
-                    Data.IS_SUPER_PRIMARY,              // 11
-                    Contacts.IN_VISIBLE_GROUP,          // 12
-                    Data.IS_PRIMARY,                    // 13
-                    Data.CARRIER_PRESENCE});            // 14
-        return cursor;
-    }
-
-    public static ContactNumber constructNewContactWithDummyIds(MatrixCursor contactCursor,
-            MatrixCursor nameCursor, String number, int id, String displayName) {
-        return constructNewContact(contactCursor, nameCursor, id, number, id, String.valueOf(id),
-                displayName, 0, 0, 0, 0, 0, 0, 0, 0);
-    }
-
-    public static ContactNumber constructNewContact(MatrixCursor contactCursor,
-            MatrixCursor nameCursor, int id, String number, int contactId, String lookupKey,
-            String displayName, int photoId, int lastTimeUsed, int timesUsed, int starred,
-            int isSuperPrimary, int inVisibleGroup, int isPrimary, int carrierPresence) {
-        if (contactCursor == null || nameCursor == null) {
-            throw new IllegalArgumentException("Provided MatrixCursors cannot be null");
-        }
-
-        if (TextUtils.isEmpty(number)) {
-            // Add a dummy number, otherwise DialerDatabaseHelper simply ignores the entire
-            // row if the number is empty
-            number = "0";
-        }
-
-        contactCursor.addRow(new Object[]{id, "", "", number, contactId, lookupKey, displayName,
-                photoId, lastTimeUsed, timesUsed, starred, isSuperPrimary, inVisibleGroup,
-                isPrimary, carrierPresence});
-        nameCursor.addRow(new Object[]{displayName, contactId});
-
-        return new ContactNumber(contactId, id, displayName, number, lookupKey, 0, 0);
-    }
-}
diff --git a/tests/src/com/android/dialer/database/DialerDatabaseHelperTest.java b/tests/src/com/android/dialer/database/DialerDatabaseHelperTest.java
deleted file mode 100644
index a95a79e08..000000000
--- a/tests/src/com/android/dialer/database/DialerDatabaseHelperTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.database;
-
-import static com.android.dialer.database.DatabaseTestUtils.*;
-
-import android.database.MatrixCursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.Suppress;
-import android.test.AndroidTestCase;
-
-import com.android.dialer.database.DialerDatabaseHelper;
-import com.android.dialer.database.DialerDatabaseHelper.ContactNumber;
-import com.android.dialer.dialpad.SmartDialNameMatcher;
-import com.android.dialer.dialpad.SmartDialPrefix;
-
-import java.lang.Exception;
-import java.lang.Override;
-import java.util.ArrayList;
-
-/**
- * Validates the behavior of the smart dial database helper with regards to contact updates and
- * deletes.
- * To run this test, use the command:
- * adb shell am instrument -w -e class com.android.dialer.database.DialerDatabaseHelperTest /
- * com.android.dialer.tests/android.test.InstrumentationTestRunner
- */
-@SmallTest
-public class DialerDatabaseHelperTest extends AndroidTestCase {
-
-    private DialerDatabaseHelper mTestHelper;
-    private SQLiteDatabase mDb;
-
-    @Override
-    protected void setUp() {
-        mTestHelper = DialerDatabaseHelper.getNewInstanceForTest(getContext());
-        mDb = mTestHelper.getWritableDatabase();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-        mTestHelper.removeAllContacts(db);
-        super.tearDown();
-    }
-
-    /**
-     * Verifies that a new contact added into the database is a match after the update.
-     */
-    public void testForNewContacts() {
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(mDb, contactCursor, 0L);
-        mTestHelper.insertNamePrefixes(mDb, nameCursor);
-        assertEquals(0, getMatchesFromDb("5105272357").size());
-
-        // Insert new contact
-        constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "510-527-2357", 0,  "James");
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(mDb, contactCursor, 1L);
-        mTestHelper.insertNamePrefixes(mDb, nameCursor);
-        assertEquals(1, getMatchesFromDb("5105272357").size());
-    }
-
-    /**
-     * Verifies that a contact that has its phone number changed is a match after the update.
-     */
-    public void testForUpdatedContacts() {
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "510-527-2357", 0,  "James");
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(mDb, contactCursor, 0L);
-        mTestHelper.insertNamePrefixes(mDb, nameCursor);
-        assertEquals(1, getMatchesFromDb("5105272357").size());
-        assertEquals(0, getMatchesFromDb("6501234567").size());
-
-        // Update the database with the new contact information
-        final MatrixCursor nameCursor2 =  constructNewNameCursor();
-        final MatrixCursor contactCursor2 = constructNewContactCursor();
-        constructNewContactWithDummyIds(contactCursor2, nameCursor2,
-                "650-123-4567", 0,  "James");
-        mTestHelper.removeUpdatedContacts(mDb, contactCursor2);
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(mDb, contactCursor2, 1L);
-        mTestHelper.insertNamePrefixes(mDb, nameCursor2);
-
-        // Now verify the matches are correct based on the new information
-        assertEquals(0, getMatchesFromDb("5105272357").size());
-        assertEquals(1, getMatchesFromDb("6501234567").size());
-    }
-
-    /**
-     * Verifies that a contact that is deleted from CP2 is similarly deleted from the database
-     */
-    public void testForDeletedContacts() {
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "510-527-2357", 0,  "James");
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(mDb, contactCursor, 0L);
-        mTestHelper.insertNamePrefixes(mDb, nameCursor);
-        assertEquals(1, getMatchesFromDb("5105272357").size());
-
-        // Delete the contact and update its projection.
-        final MatrixCursor deletedCursor =
-                new MatrixCursor(DialerDatabaseHelper.DeleteContactQuery.PROJECTION);
-        deletedCursor.addRow(new Object[] {0, 1L});
-        mTestHelper.removeDeletedContacts(mDb, deletedCursor);
-        assertEquals(0, getMatchesFromDb("5105272357").size());
-    }
-
-    /**
-     * Verifies that when a contact's number is deleted (but not the entire contact), the
-     * number is correctly deleted from the database.
-     */
-    public void testForDeletedNumber() {
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "510-527-2357", 0,  "James");
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(mDb, contactCursor, 0L);
-        mTestHelper.insertNamePrefixes(mDb, nameCursor);
-        assertEquals(1, getMatchesFromDb("5105272357").size());
-
-        // Match no longer exists after number was deleted from contact
-        final MatrixCursor updatedContactCursor =
-                new MatrixCursor(DialerDatabaseHelper.UpdatedContactQuery.PROJECTION);
-        updatedContactCursor.addRow(new Object[] {0});
-        mTestHelper.removeUpdatedContacts(mDb, updatedContactCursor);
-        assertEquals(0, getMatchesFromDb("5105272357").size());
-    }
-
-    private ArrayList<ContactNumber> getMatchesFromDb(String query) {
-        final SmartDialNameMatcher nameMatcher = new SmartDialNameMatcher(query,
-                SmartDialPrefix.getMap());
-        return mTestHelper.getLooseMatches(query, nameMatcher);
-    }
-}
diff --git a/tests/src/com/android/dialer/database/FilteredNumberAsyncQueryHandlerTest.java b/tests/src/com/android/dialer/database/FilteredNumberAsyncQueryHandlerTest.java
deleted file mode 100644
index 625f3fdb5..000000000
--- a/tests/src/com/android/dialer/database/FilteredNumberAsyncQueryHandlerTest.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.database;
-
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.net.Uri;
-import android.provider.BlockedNumberContract;
-import android.provider.BlockedNumberContract.BlockedNumbers;
-import android.test.InstrumentationTestCase;
-import android.test.mock.MockContentResolver;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.test.mocks.MockContentProvider;
-import com.android.contacts.common.test.mocks.MockContentProvider.Query;
-import com.android.dialer.compat.FilteredNumberCompat;
-import com.android.dialer.database.FilteredNumberAsyncQueryHandler.OnBlockNumberListener;
-import com.android.dialer.database.FilteredNumberAsyncQueryHandler.OnCheckBlockedListener;
-import com.android.dialer.database.FilteredNumberAsyncQueryHandler.OnHasBlockedNumbersListener;
-import com.android.dialer.database.FilteredNumberAsyncQueryHandler.OnUnblockNumberListener;
-import com.android.dialer.database.FilteredNumberContract.FilteredNumberColumns;
-import com.android.dialer.database.FilteredNumberContract.FilteredNumberSources;
-import com.android.dialer.database.FilteredNumberContract.FilteredNumberTypes;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-@SmallTest
-public class FilteredNumberAsyncQueryHandlerTest extends InstrumentationTestCase {
-
-    private static final String E164_NUMBER = "+16502530000";
-    private static final String NUMBER = "6502530000";
-    private static final String COUNTRY_ISO = "US";
-    private static final Integer ID = 1;
-    private static final Integer ID2 = 2;
-    private static final Uri BLOCKED_NUMBER_URI_N = CompatUtils.isNCompatible() ?
-            Uri.withAppendedPath(BlockedNumberContract.AUTHORITY_URI, "blocked") : null;
-    private static final Uri BLOCKED_NUMBER_URI_M =
-            Uri.withAppendedPath(FilteredNumberContract.AUTHORITY_URI, "filtered_numbers_table");
-    private static final Uri BLOCKED_NUMBER_URI = CompatUtils.isNCompatible() ? BLOCKED_NUMBER_URI_N
-            : BLOCKED_NUMBER_URI_M;
-    private static final Uri BLOCKED_NUMBER_URI_WITH_ID =
-            ContentUris.withAppendedId(BLOCKED_NUMBER_URI, ID);
-    private static final Uri EXPECTED_URI = Uri.fromParts("android", "google", "dialer");
-
-    private final MockContentResolver mContentResolver = new MockContentResolver();
-    private final MockContentProvider mContentProvider = new MockContentProvider();
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        FilteredNumberCompat.setIsEnabledForTest(true);
-        if (CompatUtils.isNCompatible()) {
-            mContentResolver.addProvider(BlockedNumberContract.AUTHORITY, mContentProvider);
-        } else {
-            mContentResolver.addProvider(FilteredNumberContract.AUTHORITY, mContentProvider);
-        }
-    }
-
-    public void testHasBlockedNumbers_Disabled() throws Throwable {
-        if (!CompatUtils.isNCompatible()) {
-            return;
-        }
-        FilteredNumberCompat.setIsEnabledForTest(false);
-        final MockContentResolver resolver = new MockContentResolver();
-        MockContentProvider disabledProvider = new MockContentProvider();
-        resolver.addProvider(FilteredNumberContract.AUTHORITY, disabledProvider);
-
-        disabledProvider.expectQuery(BLOCKED_NUMBER_URI_M).withProjection(FilteredNumberColumns._ID)
-                .withSelection(FilteredNumberColumns.TYPE + "="
-                        + FilteredNumberTypes.BLOCKED_NUMBER, null).returnRow(ID);
-        final HasBlockedNumbersListener listener = new HasBlockedNumbersListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new FilteredNumberAsyncQueryHandler(resolver).hasBlockedNumbers(listener);
-            }
-        });
-        assertTrue(listener.waitForCallback());
-        disabledProvider.verify();
-    }
-
-    public void testHasBlockedNumbers_NoResults() throws Throwable {
-        newHasBlockedNumbersExpectedQuery().returnEmptyCursor();
-        final HasBlockedNumbersListener listener = new HasBlockedNumbersListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new FilteredNumberAsyncQueryHandler(mContentResolver).hasBlockedNumbers(listener);
-            }
-        });
-        assertFalse(listener.waitForCallback());
-        mContentProvider.verify();
-    }
-
-    public void testHasBlockedNumbers() throws Throwable {
-        newHasBlockedNumbersExpectedQuery().returnRow(ID);
-        final HasBlockedNumbersListener listener = new HasBlockedNumbersListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new FilteredNumberAsyncQueryHandler(mContentResolver).hasBlockedNumbers(listener);
-            }
-        });
-        assertTrue(listener.waitForCallback());
-        mContentProvider.verify();
-    }
-
-    public void testIsBlockedNumber_Disabled() throws Throwable {
-        if (!CompatUtils.isNCompatible()) {
-            return;
-        }
-        FilteredNumberCompat.setIsEnabledForTest(false);
-        final MockContentResolver resolver = new MockContentResolver();
-        MockContentProvider disabledProvider = new MockContentProvider();
-        resolver.addProvider(FilteredNumberContract.AUTHORITY, disabledProvider);
-        disabledProvider.expectQuery(BLOCKED_NUMBER_URI_M)
-                .withProjection(FilteredNumberColumns._ID, FilteredNumberColumns.TYPE)
-                .withSelection(FilteredNumberColumns.NORMALIZED_NUMBER + " = ?", E164_NUMBER)
-                .returnRow(ID, FilteredNumberTypes.BLOCKED_NUMBER);
-        final CheckBlockedListener listener = new CheckBlockedListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new FilteredNumberAsyncQueryHandler(resolver)
-                        .isBlockedNumber(listener, NUMBER, COUNTRY_ISO);
-            }
-        });
-        assertEquals(ID, listener.waitForCallback());
-        mContentProvider.verify();
-    }
-
-    public void testIsBlockedNumber_NoResults() throws Throwable {
-        newIsBlockedNumberExpectedQuery().returnEmptyCursor();
-        final CheckBlockedListener listener = new CheckBlockedListener();
-
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new FilteredNumberAsyncQueryHandler(mContentResolver)
-                        .isBlockedNumber(listener, NUMBER, COUNTRY_ISO);
-            }
-        });
-        assertNull(listener.waitForCallback());
-        mContentProvider.verify();
-    }
-
-    public void testIsBlockedNumber() throws Throwable {
-        if (CompatUtils.isNCompatible()) {
-            newIsBlockedNumberExpectedQuery().returnRow(ID);
-        } else {
-            newIsBlockedNumberExpectedQuery().returnRow(ID, FilteredNumberTypes.BLOCKED_NUMBER);
-        }
-        final CheckBlockedListener listener = new CheckBlockedListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new FilteredNumberAsyncQueryHandler(mContentResolver)
-                        .isBlockedNumber(listener, NUMBER, COUNTRY_ISO);
-           }
-        });
-        assertEquals(ID, listener.waitForCallback());
-        mContentProvider.verify();
-    }
-
-    public void testIsBlockedNumber_MultipleResults() throws Throwable {
-        if (CompatUtils.isNCompatible()) {
-            newIsBlockedNumberExpectedQuery().returnRow(ID).returnRow(ID2);
-        } else {
-            newIsBlockedNumberExpectedQuery().returnRow(ID, FilteredNumberTypes.BLOCKED_NUMBER)
-                    .returnRow(ID2, FilteredNumberTypes.BLOCKED_NUMBER);
-        }
-        final CheckBlockedListener listener = new CheckBlockedListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new FilteredNumberAsyncQueryHandler(mContentResolver)
-                        .isBlockedNumber(listener, NUMBER, COUNTRY_ISO);
-            }
-        });
-        // When there are multiple matches, the first is returned
-        assertEquals(ID, listener.waitForCallback());
-        mContentProvider.verify();
-    }
-
-    public void testBlockNumber_Disabled() throws Throwable {
-        if (!CompatUtils.isNCompatible()) {
-            return;
-        }
-        FilteredNumberCompat.setIsEnabledForTest(false);
-        final MockContentResolver resolver = new MockContentResolver();
-        MockContentProvider disabledProvider = new MockContentProvider();
-        resolver.addProvider(FilteredNumberContract.AUTHORITY, disabledProvider);
-
-        disabledProvider.expectInsert(BLOCKED_NUMBER_URI_M, newBlockNumberContentValuesM(),
-                EXPECTED_URI);
-        final BlockNumberListener listener = new BlockNumberListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new FilteredNumberAsyncQueryHandler(resolver).blockNumber(listener, E164_NUMBER,
-                        NUMBER, COUNTRY_ISO);
-            }
-        });
-        assertSame(EXPECTED_URI, listener.waitForCallback());
-        disabledProvider.verify();
-    }
-
-    public void testBlockNumber() throws Throwable {
-        mContentProvider.expectInsert(BLOCKED_NUMBER_URI, newBlockNumberContentValues(),
-                EXPECTED_URI);
-        final BlockNumberListener listener = new BlockNumberListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new FilteredNumberAsyncQueryHandler(mContentResolver).blockNumber(listener,
-                        E164_NUMBER, NUMBER, COUNTRY_ISO);
-            }
-        });
-        assertSame(EXPECTED_URI, listener.waitForCallback());
-        mContentProvider.verify();
-    }
-
-    public void testBlockNumber_NullNormalizedNumber() throws Throwable {
-        mContentProvider.expectInsert(BLOCKED_NUMBER_URI, newBlockNumberContentValues(),
-                EXPECTED_URI);
-        final BlockNumberListener listener = new BlockNumberListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new FilteredNumberAsyncQueryHandler(mContentResolver).blockNumber(listener,
-                        NUMBER, COUNTRY_ISO);
-            }
-        });
-        assertSame(EXPECTED_URI, listener.waitForCallback());
-        mContentProvider.verify();
-    }
-
-    public void testUnblockNumber_Disabled() throws Throwable {
-        if (!CompatUtils.isNCompatible()) {
-            return;
-        }
-        FilteredNumberCompat.setIsEnabledForTest(false);
-        final MockContentResolver resolver = new MockContentResolver();
-        MockContentProvider disabledProvider = new MockContentProvider();
-        resolver.addProvider(FilteredNumberContract.AUTHORITY, disabledProvider);
-
-        Uri uriWithId = ContentUris.withAppendedId(BLOCKED_NUMBER_URI_M, ID);
-        disabledProvider.expectQuery(uriWithId)
-                .withProjection(null)
-                .withDefaultProjection(FilteredNumberCompat.getIdColumnName())
-                .withSelection(null, null)
-                .withSortOrder(null)
-                .returnRow(ID);
-        disabledProvider.expectDelete(uriWithId).returnRowsAffected(1);
-        final UnblockNumberListener listener = new UnblockNumberListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new FilteredNumberAsyncQueryHandler(resolver).unblock(listener, ID);
-            }
-        });
-        assertNotNull(listener.waitForCallback());
-        disabledProvider.verify();
-    }
-
-    public void testUnblockNumber_NullId() {
-        try {
-            new FilteredNumberAsyncQueryHandler(mContentResolver).unblock(null, (Integer) null);
-            fail();
-        } catch (IllegalArgumentException e) {}
-    }
-
-    public void testUnblockNumber() throws Throwable {
-        mContentProvider.expectQuery(BLOCKED_NUMBER_URI_WITH_ID)
-                .withProjection(null)
-                .withDefaultProjection(FilteredNumberCompat.getIdColumnName())
-                .withSelection(null, null)
-                .withSortOrder(null)
-                .returnRow(ID);
-        mContentProvider.expectDelete(BLOCKED_NUMBER_URI_WITH_ID).returnRowsAffected(1);
-        final UnblockNumberListener listener = new UnblockNumberListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new FilteredNumberAsyncQueryHandler(mContentResolver).unblock(listener, ID);
-            }
-        });
-        assertNotNull(listener.waitForCallback());
-        mContentProvider.verify();
-    }
-
-    private Query newIsBlockedNumberExpectedQuery() {
-        if (CompatUtils.isNCompatible()) {
-            return newIsBlockedNumberExpectedQueryN();
-        }
-        return newIsBlockedNumberExpectedQueryM();
-    }
-
-    private Query newIsBlockedNumberExpectedQueryN() {
-        return mContentProvider.expectQuery(BLOCKED_NUMBER_URI)
-                .withProjection(BlockedNumbers.COLUMN_ID)
-                .withSelection(BlockedNumbers.COLUMN_E164_NUMBER + " = ?", E164_NUMBER);
-    }
-
-    private Query newIsBlockedNumberExpectedQueryM() {
-        return mContentProvider.expectQuery(BLOCKED_NUMBER_URI)
-                .withProjection(FilteredNumberColumns._ID, FilteredNumberColumns.TYPE)
-                .withSelection(FilteredNumberColumns.NORMALIZED_NUMBER + " = ?", E164_NUMBER);
-    }
-
-    private Query newHasBlockedNumbersExpectedQuery() {
-        if (CompatUtils.isNCompatible()) {
-            return newHasBlockedNumbersExpectedQueryN();
-        }
-        return newHasBlockedNumbersExpectedQueryM();
-    }
-
-    private Query newHasBlockedNumbersExpectedQueryN() {
-        return mContentProvider.expectQuery(BLOCKED_NUMBER_URI)
-                .withProjection(BlockedNumbers.COLUMN_ID)
-                .withSelection(null, null);
-    }
-
-    private Query newHasBlockedNumbersExpectedQueryM() {
-        return mContentProvider.expectQuery(BLOCKED_NUMBER_URI).withProjection(
-                FilteredNumberColumns._ID)
-                .withSelection(FilteredNumberColumns.TYPE + "="
-                        + FilteredNumberTypes.BLOCKED_NUMBER, null);
-    }
-
-    private ContentValues newBlockNumberContentValues() {
-        if (CompatUtils.isNCompatible()) {
-            return newBlockNumberContentValuesN();
-        }
-        return newBlockNumberContentValuesM();
-    }
-
-    private ContentValues newBlockNumberContentValuesN() {
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, NUMBER);
-        return contentValues;
-    }
-
-    private ContentValues newBlockNumberContentValuesM() {
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(FilteredNumberColumns.NORMALIZED_NUMBER, E164_NUMBER);
-        contentValues.put(FilteredNumberColumns.NUMBER, NUMBER);
-        contentValues.put(FilteredNumberColumns.COUNTRY_ISO, COUNTRY_ISO);
-        contentValues.put(FilteredNumberColumns.TYPE, FilteredNumberTypes.BLOCKED_NUMBER);
-        contentValues.put(FilteredNumberColumns.SOURCE, FilteredNumberSources.USER);
-        return contentValues;
-    }
-
-    private class CheckBlockedListener implements OnCheckBlockedListener {
-        public final CountDownLatch onCheckCompleteCalled;
-        public Integer id;
-
-        public CheckBlockedListener() {
-            onCheckCompleteCalled = new CountDownLatch(1);
-        }
-
-        @Override
-        public void onCheckComplete(Integer id) {
-            this.id = id;
-            onCheckCompleteCalled.countDown();
-        }
-
-        public Integer waitForCallback() throws InterruptedException {
-            if (!onCheckCompleteCalled.await(5000, TimeUnit.MILLISECONDS)) {
-                throw new IllegalStateException("Waiting on callback timed out.");
-            }
-            return id;
-        }
-    }
-
-    private class HasBlockedNumbersListener implements OnHasBlockedNumbersListener {
-        public final CountDownLatch onHasBlockedNumbersCalled;
-        public boolean hasBlockedNumbers;
-
-        public HasBlockedNumbersListener() {
-            onHasBlockedNumbersCalled = new CountDownLatch(1);
-        }
-
-        @Override
-        public void onHasBlockedNumbers(boolean hasBlockedNumbers) {
-            this.hasBlockedNumbers = hasBlockedNumbers;
-            onHasBlockedNumbersCalled.countDown();
-        }
-
-        public boolean waitForCallback() throws InterruptedException {
-            if (!onHasBlockedNumbersCalled.await(5000, TimeUnit.MILLISECONDS)) {
-                throw new IllegalStateException("Waiting on callback timed out.");
-            }
-            return hasBlockedNumbers;
-        }
-    }
-
-    private class BlockNumberListener implements OnBlockNumberListener {
-        public final CountDownLatch onBlockCompleteCalled;
-        public Uri uri;
-
-        public BlockNumberListener() {
-            onBlockCompleteCalled = new CountDownLatch(1);
-        }
-
-        @Override
-        public void onBlockComplete(Uri uri) {
-            this.uri = uri;
-            onBlockCompleteCalled.countDown();
-        }
-
-        public Uri waitForCallback() throws InterruptedException {
-            if (!onBlockCompleteCalled.await(5000, TimeUnit.MILLISECONDS)) {
-                throw new IllegalStateException("Waiting on callback timed out.");
-            }
-            return uri;
-        }
-    }
-
-    private class UnblockNumberListener implements OnUnblockNumberListener {
-        public final CountDownLatch onUnblockCompleteCalled;
-        public Integer result;
-
-        public UnblockNumberListener() {
-            onUnblockCompleteCalled = new CountDownLatch(1);
-        }
-
-        @Override
-        public void onUnblockComplete(int rows, ContentValues values) {
-            result = rows;
-            onUnblockCompleteCalled.countDown();
-        }
-
-        public Integer waitForCallback() throws InterruptedException {
-            if (!onUnblockCompleteCalled.await(5000, TimeUnit.MILLISECONDS)) {
-                throw new IllegalStateException("Waiting on callback timed out.");
-            }
-            return result;
-        }
-    }
-}
diff --git a/tests/src/com/android/dialer/database/FilteredNumberProviderTest.java b/tests/src/com/android/dialer/database/FilteredNumberProviderTest.java
deleted file mode 100644
index 1191560f5..000000000
--- a/tests/src/com/android/dialer/database/FilteredNumberProviderTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.database;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.net.Uri;
-import android.test.ProviderTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-
-@MediumTest
-public class FilteredNumberProviderTest extends
-        ProviderTestCase2<FilteredNumberProviderTest.TestFilteredNumberProvider> {
-    private ContentResolver mResolver;
-
-    private static final String TIME_ZONE_AMERICA_LOS_ANGELES = "America/Los_Angeles";
-    private static final String DEFAULT_TIMEZONE = TIME_ZONE_AMERICA_LOS_ANGELES;
-    private static final String DEFAULT_COUNTRY_ISO = "US";
-    private static final String TEST_NUMBER = "234567890";
-    private static final String TEST_NORMALIZED_NUMBER = "+1234567890";
-    private static final long TEST_TIME = 1439936706;
-
-    public FilteredNumberProviderTest () {
-        super(TestFilteredNumberProvider.class, FilteredNumberContract.AUTHORITY);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getMockContentResolver();
-    }
-
-    public void testInsert() {
-        // Insert row
-        Uri uri = mResolver.insert(
-                FilteredNumberContract.FilteredNumber.CONTENT_URI,
-                getTestValues(null));
-        assertNotNull(uri);
-        long id = ContentUris.parseId(uri);
-        assertTrue(id > 0);
-    }
-
-    public void testQuery() {
-        Cursor cursor = mResolver.query(
-                FilteredNumberContract.FilteredNumber.CONTENT_URI, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(cursor.getCount(), 0);
-        cursor.close();
-    }
-
-    public void testInsertAndQuery() {
-        // Insert row
-        ContentValues testValues = getTestValues(null);
-        Uri uri = mResolver.insert(FilteredNumberContract.FilteredNumber.CONTENT_URI, testValues);
-
-        // Query
-        Cursor cursor = mResolver.query(uri, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(cursor.getCount(), 1);
-
-        cursor.moveToFirst();
-        assertCursorValues(cursor, testValues);
-        cursor.close();
-    }
-
-    public void testIllegalUri() {
-        try {
-            mResolver.query(
-                    Uri.withAppendedPath(
-                            FilteredNumberContract.FilteredNumber.CONTENT_URI,
-                            "ILLEGAL"), null, null, null, null);
-            fail("Expecting exception but none was thrown.");
-        } catch (IllegalArgumentException e) {
-        }
-    }
-
-    public void testQueryWithId() {
-        // Insert row
-        ContentValues testValues = getTestValues(null);
-        Uri uri = mResolver.insert(FilteredNumberContract.FilteredNumber.CONTENT_URI, testValues);
-        long id = ContentUris.parseId(uri);
-
-        // Query
-        Cursor cursor = mResolver.query(
-                ContentUris.withAppendedId(
-                        FilteredNumberContract.FilteredNumber.CONTENT_URI,
-                        id), null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(cursor.getCount(), 1);
-
-        cursor.moveToFirst();
-        assertCursorValues(cursor, testValues);
-        cursor.close();
-    }
-
-    public void testDelete() {
-        // Insert row
-        Uri uri = mResolver.insert(
-                FilteredNumberContract.FilteredNumber.CONTENT_URI,
-                getTestValues(null));
-        long id = ContentUris.parseId(uri);
-
-        // Delete row
-        int rows = mResolver.delete(
-                FilteredNumberContract.FilteredNumber.CONTENT_URI,
-                FilteredNumberContract.FilteredNumberColumns._ID + " = ?",
-                new String[]{Long.toString(id)});
-        assertEquals(rows, 1);
-
-        // Query
-        Cursor cursor =  mResolver.query(uri, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(cursor.getCount(), 0);
-        cursor.close();
-    }
-
-    public void testUpdate() {
-        // Insert row
-        Uri uri = mResolver.insert(
-                FilteredNumberContract.FilteredNumber.CONTENT_URI,
-                getTestValues(null));
-
-        // Update row
-        ContentValues v = new ContentValues();
-        v.put(FilteredNumberContract.FilteredNumberColumns.TIMES_FILTERED, 3);
-        v.put(FilteredNumberContract.FilteredNumberColumns.LAST_TIME_FILTERED, TEST_TIME);
-        int rows = mResolver.update(FilteredNumberContract.FilteredNumber.CONTENT_URI, v,
-                FilteredNumberContract.FilteredNumberColumns.NORMALIZED_NUMBER + " = ?",
-                new String[]{TEST_NORMALIZED_NUMBER});
-        assertEquals(rows, 1);
-
-        ContentValues expected = getTestValues(TEST_TIME);
-        expected.put(FilteredNumberContract.FilteredNumberColumns.TIMES_FILTERED, 3);
-        expected.put(FilteredNumberContract.FilteredNumberColumns.LAST_TIME_FILTERED, TEST_TIME);
-
-        // Re-query
-        Cursor cursor =  mResolver.query(uri, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(cursor.getCount(), 1);
-        cursor.moveToFirst();
-        assertCursorValues(cursor, expected);
-        cursor.close();
-    }
-
-    public void testInsertDefaultValues() {
-        // Insert row
-        ContentValues v = getTestValues(null);
-        Uri uri = mResolver.insert(FilteredNumberContract.FilteredNumber.CONTENT_URI, v);
-        assertNotNull(uri);
-        long id = ContentUris.parseId(uri);
-        assertTrue(id > 0);
-
-        // Query
-        Cursor cursor =  mResolver.query(uri, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(cursor.getCount(), 1);
-
-        int creationTimeIndex =
-                cursor.getColumnIndex(FilteredNumberContract.FilteredNumberColumns.CREATION_TIME);
-        cursor.moveToFirst();
-        assertEquals(cursor.getLong(creationTimeIndex), TEST_TIME);
-        cursor.close();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        getProvider().closeDb();
-        super.tearDown();
-    }
-
-    private ContentValues getTestValues(Long timeNow) {
-        ContentValues v = new ContentValues();
-        v.putNull(FilteredNumberContract.FilteredNumberColumns._ID);
-        v.put(FilteredNumberContract.FilteredNumberColumns.NORMALIZED_NUMBER,
-                TEST_NORMALIZED_NUMBER);
-        v.put(FilteredNumberContract.FilteredNumberColumns.NUMBER, TEST_NUMBER);
-        v.put(FilteredNumberContract.FilteredNumberColumns.COUNTRY_ISO, DEFAULT_COUNTRY_ISO);
-        v.put(FilteredNumberContract.FilteredNumberColumns.TIMES_FILTERED, 0);
-        v.putNull(FilteredNumberContract.FilteredNumberColumns.LAST_TIME_FILTERED);
-        v.put(FilteredNumberContract.FilteredNumberColumns.CREATION_TIME, timeNow);
-        v.put(FilteredNumberContract.FilteredNumberColumns.SOURCE, 1);
-        v.put(FilteredNumberContract.FilteredNumberColumns.TYPE, 1);
-        return v;
-    }
-
-    private void assertCursorValues(Cursor cursor, ContentValues expectedValues) {
-        ContentValues v = new ContentValues();
-        DatabaseUtils.cursorRowToContentValues(cursor, v);
-        v.remove(FilteredNumberContract.FilteredNumberColumns._ID);
-        expectedValues.remove(FilteredNumberContract.FilteredNumberColumns._ID);
-        assertEquals(v.toString(), expectedValues.toString());
-    }
-
-    public static class TestFilteredNumberProvider extends FilteredNumberProvider {
-        private DialerDatabaseHelper mDialerDatabaseHelper;
-
-        @Override
-        protected DialerDatabaseHelper getDatabaseHelper(Context context) {
-            if (mDialerDatabaseHelper == null) {
-                mDialerDatabaseHelper = DialerDatabaseHelper.getNewInstanceForTest(context);
-            }
-            return mDialerDatabaseHelper;
-        }
-
-        protected void closeDb() {
-            mDialerDatabaseHelper.close();
-        }
-
-        @Override
-        protected long getCurrentTimeMs() {
-            return TEST_TIME;
-        }
-    }
-}
diff --git a/tests/src/com/android/dialer/database/SmartDialPrefixTest.java b/tests/src/com/android/dialer/database/SmartDialPrefixTest.java
deleted file mode 100644
index 78962e3f4..000000000
--- a/tests/src/com/android/dialer/database/SmartDialPrefixTest.java
+++ /dev/null
@@ -1,523 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.database;
-
-import static com.android.dialer.database.DatabaseTestUtils.*;
-
-import android.database.MatrixCursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.AndroidTestCase;
-
-import com.android.dialer.database.DialerDatabaseHelper;
-import com.android.dialer.database.DialerDatabaseHelper.ContactNumber;
-import com.android.dialer.dialpad.SmartDialNameMatcher;
-import com.android.dialer.dialpad.SmartDialPrefix;
-
-import java.lang.Exception;
-import java.lang.Override;
-import java.lang.String;
-import java.util.ArrayList;
-
-/**
- * To run this test, use the command:
- * adb shell am instrument -w -e class com.android.dialer.database.SmartDialPrefixTest /
- * com.android.dialer.tests/android.test.InstrumentationTestRunner
- */
-@SmallTest
-public class SmartDialPrefixTest extends AndroidTestCase {
-
-    private DialerDatabaseHelper mTestHelper;
-
-    public void testIsCountryNanp_CaseInsensitive() {
-        assertFalse(SmartDialPrefix.isCountryNanp(null));
-        assertFalse(SmartDialPrefix.isCountryNanp("CN"));
-        assertFalse(SmartDialPrefix.isCountryNanp("HK"));
-        assertFalse(SmartDialPrefix.isCountryNanp("uk"));
-        assertFalse(SmartDialPrefix.isCountryNanp("sg"));
-        assertTrue(SmartDialPrefix.isCountryNanp("US"));
-        assertTrue(SmartDialPrefix.isCountryNanp("CA"));
-        assertTrue(SmartDialPrefix.isCountryNanp("AS"));
-        assertTrue(SmartDialPrefix.isCountryNanp("AI"));
-        assertTrue(SmartDialPrefix.isCountryNanp("AG"));
-        assertTrue(SmartDialPrefix.isCountryNanp("BS"));
-        assertTrue(SmartDialPrefix.isCountryNanp("BB"));
-        assertTrue(SmartDialPrefix.isCountryNanp("bm"));
-        assertTrue(SmartDialPrefix.isCountryNanp("vg"));
-        assertTrue(SmartDialPrefix.isCountryNanp("ky"));
-        assertTrue(SmartDialPrefix.isCountryNanp("dm"));
-        assertTrue(SmartDialPrefix.isCountryNanp("do"));
-        assertTrue(SmartDialPrefix.isCountryNanp("gd"));
-        assertTrue(SmartDialPrefix.isCountryNanp("gu"));
-        assertTrue(SmartDialPrefix.isCountryNanp("jm"));
-        assertTrue(SmartDialPrefix.isCountryNanp("pr"));
-        assertTrue(SmartDialPrefix.isCountryNanp("ms"));
-        assertTrue(SmartDialPrefix.isCountryNanp("mp"));
-        assertTrue(SmartDialPrefix.isCountryNanp("kn"));
-        assertTrue(SmartDialPrefix.isCountryNanp("lc"));
-        assertTrue(SmartDialPrefix.isCountryNanp("vc"));
-        assertTrue(SmartDialPrefix.isCountryNanp("tt"));
-        assertTrue(SmartDialPrefix.isCountryNanp("tc"));
-        assertTrue(SmartDialPrefix.isCountryNanp("vi"));
-    }
-
-    @Override
-    protected void setUp() {
-        mTestHelper = DialerDatabaseHelper.getNewInstanceForTest(getContext());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-        mTestHelper.removeAllContacts(db);
-        super.tearDown();
-    }
-
-    private ArrayList<ContactNumber> getLooseMatchesFromDb(String query) {
-        final SmartDialNameMatcher nameMatcher = new SmartDialNameMatcher(query,
-                SmartDialPrefix.getMap());
-        return mTestHelper.getLooseMatches(query, nameMatcher);
-    }
-
-    public void testPutForFullName() {
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        final ContactNumber jasonsmith = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "", 0, "Jason Smith");
-        final ContactNumber jasonsmitt = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "", 1, "Jason Smitt");
-        final ContactNumber alphabet = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "12345678", 2, "abc def ghi jkl mno pqrs tuv wxyz");
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(db, contactCursor, Long.valueOf(0));
-        mTestHelper.insertNamePrefixes(db, nameCursor);
-
-        nameCursor.close();
-        contactCursor.close();
-
-        final ArrayList<ContactNumber> result1 = getLooseMatchesFromDb("5276676484");
-        assertFalse(result1.contains(jasonsmitt));
-
-        final ArrayList<ContactNumber> result2 = getLooseMatchesFromDb("5276676488");
-        assertFalse(result2.contains(jasonsmith));
-        assertTrue(result2.contains(jasonsmitt));
-
-        assertTrue(getLooseMatchesFromDb("22233344455566677778889999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("33344455566677778889999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("44455566677778889999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("55566677778889999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("66677778889999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("77778889999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("8889999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("9999").contains(alphabet));
-
-        // Makes sure the phone number is correctly added.
-        assertTrue(getLooseMatchesFromDb("12345678").contains(alphabet));
-    }
-
-    public void testPutForPartialName() {
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        final ContactNumber maryjane = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "", 0, "Mary Jane");
-        final ContactNumber sarahsmith = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "", 1, "Sarah Smith");
-        final ContactNumber jasonsmitt = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "", 2, "Jason Smitt");
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(db, contactCursor, Long.valueOf(0));
-        mTestHelper.insertNamePrefixes(db, nameCursor);
-
-        nameCursor.close();
-        contactCursor.close();
-
-        final ArrayList<ContactNumber> result1 = getLooseMatchesFromDb("6279");
-        assertTrue(result1.contains(maryjane));
-        assertFalse(result1.contains(jasonsmitt));
-
-        // 72 corresponds to sa = "Sarah Smith" but not "Jason Smitt" or "Mary Jane"
-        final ArrayList<ContactNumber> result2 = getLooseMatchesFromDb("72");
-        assertFalse(result2.contains(maryjane));
-        assertTrue(result2.contains(sarahsmith));
-        assertFalse(result2.contains(jasonsmitt));
-
-        // 76 corresponds to sm = "Sarah Smith" and "Jason Smitt" but not "Mary Jane"
-        final ArrayList<ContactNumber> result3 = getLooseMatchesFromDb("76");
-        assertFalse(result3.contains(maryjane));
-        assertTrue(result3.contains(sarahsmith));
-        assertTrue(result3.contains(jasonsmitt));
-    }
-
-    public void testPutForNameTokens() {
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        final ContactNumber jasonfwilliams = constructNewContactWithDummyIds(contactCursor,
-                nameCursor, "", 0, "Jason F. Williams");
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(db, contactCursor, Long.valueOf(0));
-        mTestHelper.insertNamePrefixes(db, nameCursor);
-
-        nameCursor.close();
-        contactCursor.close();
-
-        assertTrue(getLooseMatchesFromDb("527").contains(jasonfwilliams));
-        // 72 corresponds to sa = "Sarah Smith" but not "Jason Smitt" or "Mary Jane"
-        assertTrue(getLooseMatchesFromDb("945").contains(jasonfwilliams));
-        // 76 corresponds to sm = "Sarah Smith" and "Jason Smitt" but not "Mary Jane"
-        assertFalse(getLooseMatchesFromDb("66").contains(jasonfwilliams));
-    }
-
-    public void testPutForInitialMatches() {
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        final ContactNumber martinjuniorharry = constructNewContactWithDummyIds(contactCursor,
-                nameCursor, "", 0, "Martin Jr Harry");
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(db, contactCursor, Long.valueOf(0));
-        mTestHelper.insertNamePrefixes(db, nameCursor);
-
-        nameCursor.close();
-        contactCursor.close();
-
-        // 654 corresponds to mjh = "(M)artin (J)r (H)arry"
-        assertTrue(getLooseMatchesFromDb("654").contains(martinjuniorharry));
-        // The reverse (456) does not match (for now)
-        assertFalse(getLooseMatchesFromDb("456").contains(martinjuniorharry));
-        // 6542 corresponds to mjha = "(M)artin (J)r (Ha)rry"
-        assertTrue(getLooseMatchesFromDb("6542").contains(martinjuniorharry));
-        // 542 corresponds to jha = "Martin (J)r (Ha)rry"
-        assertTrue(getLooseMatchesFromDb("542").contains(martinjuniorharry));
-        // 642 corresponds to mha = "(M)artin Jr (Ha)rry"
-        assertTrue(getLooseMatchesFromDb("642").contains(martinjuniorharry));
-        // 6542779 (M)artin (J)r (Harry)
-        assertTrue(getLooseMatchesFromDb("6542779").contains(martinjuniorharry));
-        // 65742779 (M)artin (Jr) (Harry)
-        assertTrue(getLooseMatchesFromDb("65742779").contains(martinjuniorharry));
-        // 542779 Martin (J)r (Harry)
-        assertTrue(getLooseMatchesFromDb("542779").contains(martinjuniorharry));
-        // 547 doesn't match
-        assertFalse(getLooseMatchesFromDb("547").contains(martinjuniorharry));
-        // 655 doesn't match
-        assertFalse(getLooseMatchesFromDb("655").contains(martinjuniorharry));
-        // 653 doesn't match
-        assertFalse(getLooseMatchesFromDb("653").contains(martinjuniorharry));
-        // 6543 doesn't match
-        assertFalse(getLooseMatchesFromDb("6543").contains(martinjuniorharry));
-
-        // 7 actual rows, + 1 for the dummy number we added
-        assertEquals(8, mTestHelper.countPrefixTableRows(db));
-    }
-
-    public void testPutForInitialMatchesForLongTokenNames() {
-
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        final ContactNumber alphabet = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "12345678", 0, "abc def ghi jkl mno pqrs tuv wxyz");
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(db, contactCursor, Long.valueOf(0));
-        mTestHelper.insertNamePrefixes(db, nameCursor);
-
-        nameCursor.close();
-        contactCursor.close();
-
-        // Makes sure only only the first two and last two token are considered for initials.
-        // The cut-off constant can be set in SmartDialPrefix.java
-        assertTrue(getLooseMatchesFromDb("2389999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("239999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("23888").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("2333").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("289999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("2888").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("29999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("3888").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("39999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("389999").contains(alphabet));
-        assertTrue(getLooseMatchesFromDb("89999").contains(alphabet));
-    }
-
-    public void testCheckLongToken() {
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        final ContactNumber alphabet = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "1", 0,  " aaaa bbbb cccc dddd eeee ffff gggg hhhh iiii jjjj kkkk llll mmmm nnnn" +
-                " oooo pppp qqqq rrrr ssss tttt uuuu vvvv wwww xxxx yyyy zzzz");
-
-        final ContactNumber alphabet2 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "1", 1, "aaaabbbbccccddddeeeeffffgggghhhhiiiijjjjkkkkllllmmmmnnnnooooppppqqqqrrrr" +
-                "ssssttttuuuuvvvvwwwwxxxxyyyyzzzz");
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(db, contactCursor, Long.valueOf(0));
-        mTestHelper.insertNamePrefixes(db, nameCursor);
-
-        nameCursor.close();
-        contactCursor.close();
-
-        assertTrue(getLooseMatchesFromDb("2222").contains(alphabet));
-        assertEquals(40, mTestHelper.countPrefixTableRows(db));
-    }
-
-    public void testAccentedCharacters() {
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        final ContactNumber reene = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "0", 0, "Reenée");
-        final ContactNumber bronte = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "0", 1, "Brontë");
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(db, contactCursor, Long.valueOf(0));
-        mTestHelper.insertNamePrefixes(db, nameCursor);
-
-        nameCursor.close();
-        contactCursor.close();
-
-        assertTrue(getLooseMatchesFromDb("733633").contains(reene));
-        assertTrue(getLooseMatchesFromDb("276683").contains(bronte));
-    }
-
-    public void testNumbersInName() {
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        final ContactNumber contact = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "0", 0, "12345678");
-        final ContactNumber teacher = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "0", 1, "1st Grade Teacher");
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(db, contactCursor, Long.valueOf(0));
-        mTestHelper.insertNamePrefixes(db, nameCursor);
-
-        nameCursor.close();
-        contactCursor.close();
-
-        assertTrue(getLooseMatchesFromDb("12345678").contains(contact));
-        assertTrue(getLooseMatchesFromDb("17847233").contains(teacher));
-        assertTrue(getLooseMatchesFromDb("14832").contains(teacher));
-    }
-
-    public void testPutForNumbers() {
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        final ContactNumber contactno1 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "510-527-2357", 0,  "James");
-        final ContactNumber contactno2 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "77212862357", 1, "James");
-        final ContactNumber contactno3 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "+13684976334", 2, "James");
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(db, contactCursor, Long.valueOf(0));
-        mTestHelper.insertNamePrefixes(db, nameCursor);
-
-        nameCursor.close();
-        contactCursor.close();
-
-        assertTrue(getLooseMatchesFromDb("510").contains(contactno1));
-        assertFalse(getLooseMatchesFromDb("511").contains(contactno1));
-        assertTrue(getLooseMatchesFromDb("77212862357").contains(contactno2));
-        assertFalse(getLooseMatchesFromDb("77212862356").contains(contactno2));
-        assertTrue(getLooseMatchesFromDb("1368").contains(contactno3));
-        assertFalse(getLooseMatchesFromDb("1367").contains(contactno3));
-    }
-
-    public void testPutNumbersCountryCode() {
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        final ContactNumber contactno1 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "+13684976334", 0, "James");
-        final ContactNumber contactno2 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "+65 9177-6930", 1, "Jason");
-        final ContactNumber contactno3 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "+85212345678", 2, "Mike");
-        final ContactNumber contactno4 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "+85112345678", 3, "Invalid");
-        final ContactNumber contactno5 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "+852", 4, "Invalid");
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(db, contactCursor, Long.valueOf(0));
-        mTestHelper.insertNamePrefixes(db, nameCursor);
-
-        nameCursor.close();
-        contactCursor.close();
-
-        assertTrue(getLooseMatchesFromDb("1368").contains(contactno1));
-        assertTrue(getLooseMatchesFromDb("368497").contains(contactno1));
-        assertFalse(getLooseMatchesFromDb("2368497").contains(contactno1));
-
-        assertTrue(getLooseMatchesFromDb("6591776930").contains(contactno2));
-        assertTrue(getLooseMatchesFromDb("91776930").contains(contactno2));
-        assertFalse(getLooseMatchesFromDb("591776930").contains(contactno2));
-
-        assertTrue(getLooseMatchesFromDb("85212345678").contains(contactno3));
-        assertTrue(getLooseMatchesFromDb("12345678").contains(contactno3));
-        assertFalse(getLooseMatchesFromDb("5212345678").contains(contactno3));
-
-        assertTrue(getLooseMatchesFromDb("85112345678").contains(contactno4));
-        assertFalse(getLooseMatchesFromDb("12345678").contains(contactno4));
-    }
-
-    // Tests special case handling for NANP numbers
-    public void testPutNumbersNANP() {
-        SmartDialPrefix.setUserInNanpRegion(true);
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-        final ContactNumber contactno1 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "16503337596", 0, "James");
-        final ContactNumber contactno2 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "5109921234", 1, "Michael");
-        final ContactNumber contactno3 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "(415)-123-4567", 2, "Jason");
-        final ContactNumber contactno4 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "1 510-284-9170", 3, "Mike");
-        final ContactNumber contactno5 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "1-415-123-123", 4, "Invalid");
-        final ContactNumber contactno6 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "415-123-123", 5, "Invalid2");
-        final ContactNumber contactno7 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "+1-510-284-9170", 6, "Mike");
-        final ContactNumber contactno8 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "+1-510-284-917", 7, "Invalid");
-        final ContactNumber contactno9 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "+857-510-284-9170", 8, "Inv");
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(db, contactCursor, Long.valueOf(0));
-        mTestHelper.insertNamePrefixes(db, nameCursor);
-
-        nameCursor.close();
-        contactCursor.close();
-
-        assertTrue(getLooseMatchesFromDb("16503337596").contains(contactno1));
-        assertTrue(getLooseMatchesFromDb("6503337596").contains(contactno1));
-        assertTrue(getLooseMatchesFromDb("3337596").contains(contactno1));
-
-        assertTrue(getLooseMatchesFromDb("5109921234").contains(contactno2));
-        assertTrue(getLooseMatchesFromDb("9921234").contains(contactno2));
-
-        assertTrue(getLooseMatchesFromDb("4151234567").contains(contactno3));
-        assertTrue(getLooseMatchesFromDb("1234567").contains(contactno3));
-
-        assertTrue(getLooseMatchesFromDb("15102849170").contains(contactno4));
-        assertTrue(getLooseMatchesFromDb("5102849170").contains(contactno4));
-        assertTrue(getLooseMatchesFromDb("2849170").contains(contactno4));
-
-        assertTrue(getLooseMatchesFromDb("1415123123").contains(contactno5));
-        assertFalse(getLooseMatchesFromDb("415123123").contains(contactno5));
-        assertFalse(getLooseMatchesFromDb("123123").contains(contactno5));
-
-        assertTrue(getLooseMatchesFromDb("415123123").contains(contactno6));
-        assertFalse(getLooseMatchesFromDb("123123").contains(contactno6));
-
-        assertTrue(getLooseMatchesFromDb("15102849170").contains(contactno7));
-        assertTrue(getLooseMatchesFromDb("5102849170").contains(contactno7));
-        assertTrue(getLooseMatchesFromDb("2849170").contains(contactno7));
-        assertFalse(getLooseMatchesFromDb("849170").contains(contactno7));
-        assertFalse(getLooseMatchesFromDb("10849170").contains(contactno7));
-
-        assertTrue(getLooseMatchesFromDb("1510284917").contains(contactno8));
-        assertTrue(getLooseMatchesFromDb("510284917").contains(contactno8));
-        assertFalse(getLooseMatchesFromDb("2849170").contains(contactno8));
-
-        assertTrue(getLooseMatchesFromDb("8575102849170").contains(contactno9));
-        assertFalse(getLooseMatchesFromDb("5102849170").contains(contactno9));
-        assertFalse(getLooseMatchesFromDb("2849170").contains(contactno9));
-
-        // TODO(klp) Adds test for non-NANP region number matchings.
-    }
-
-    // Tests special case handling for non-NANP numbers
-    public void testPutNumbersNonNANP() {
-        SmartDialPrefix.setUserInNanpRegion(false);
-        final SQLiteDatabase db = mTestHelper.getWritableDatabase();
-
-        final MatrixCursor nameCursor =  constructNewNameCursor();
-        final MatrixCursor contactCursor = constructNewContactCursor();
-
-        final ContactNumber contactno0 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "(415)-123-4567", 0, "Jason");
-        final ContactNumber contactno1 = constructNewContactWithDummyIds(contactCursor, nameCursor,
-                "1 510-284-9170", 1, "Mike");
-
-
-        mTestHelper.insertUpdatedContactsAndNumberPrefix(db, contactCursor, Long.valueOf(0));
-        mTestHelper.insertNamePrefixes(db, nameCursor);
-
-        nameCursor.close();
-        contactCursor.close();
-
-        assertTrue(getLooseMatchesFromDb("4151234567").contains(contactno0));
-        assertFalse(getLooseMatchesFromDb("1234567").contains(contactno0));
-
-        assertTrue(getLooseMatchesFromDb("15102849170").contains(contactno1));
-        assertFalse(getLooseMatchesFromDb("5102849170").contains(contactno1));
-        assertFalse(getLooseMatchesFromDb("2849170").contains(contactno1));
-    }
-
-    public void testParseInfo() {
-        final String name = "Mcdonald Jamie-Cullum";
-        final ArrayList<String> info = SmartDialPrefix.parseToIndexTokens(name);
-        assertEquals(3, info.size());
-        assertEquals(8, info.get(0).length());
-        assertEquals(5, info.get(1).length());
-        assertEquals(6, info.get(2).length());
-
-        final String name2 = "aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk";
-        final ArrayList<String> info2 = SmartDialPrefix.parseToIndexTokens(name2);
-        assertEquals(11, info2.size());
-        assertEquals(3, info2.get(0).length());
-        assertEquals(3, info2.get(10).length());
-
-        final String name3 = "this  is- a,test    name";
-        final ArrayList<String> info3 = SmartDialPrefix.parseToIndexTokens(name3);
-        assertEquals(5, info3.size());
-        assertEquals(2, info3.get(1).length());
-        assertEquals(1, info3.get(2).length());
-        assertEquals(4, info3.get(3).length());
-        assertEquals(4, info3.get(4).length());
-
-        final String name4 = "M c-Donald James";
-        final ArrayList<String> info4 = SmartDialPrefix.parseToIndexTokens(name4);
-        assertEquals(4, info4.size());
-        assertEquals(1, info4.get(1).length());
-        assertEquals(6, info4.get(2).length());
-
-        final String name5 = "   Aa'Bb    c    dddd  e'e";
-        final ArrayList<String> info5 = SmartDialPrefix.parseToIndexTokens(name5);
-        assertEquals(6, info5.size());
-        assertEquals(2, info5.get(0).length());
-        assertEquals(1, info5.get(5).length());
-    }
-}
diff --git a/tests/src/com/android/dialer/database/VoicemailArchiveProviderTest.java b/tests/src/com/android/dialer/database/VoicemailArchiveProviderTest.java
deleted file mode 100644
index abc2dc5b0..000000000
--- a/tests/src/com/android/dialer/database/VoicemailArchiveProviderTest.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.database;
-
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.test.ProviderTestCase2;
-import android.test.mock.MockContentResolver;
-import com.android.dialer.database.VoicemailArchiveContract.VoicemailArchive;
-
-import java.io.File;
-import java.io.OutputStream;
-
-/**
- * Tests for {@link VoicemailArchiveProvider}.
- */
-public class VoicemailArchiveProviderTest extends
-        ProviderTestCase2<VoicemailArchiveProviderTest.TestVoicemailArchiveProvider> {
-    private static final String TEST_MIME_TYPE = "audio/mp3";
-    private static final String TEST_NUMBER = "+1412555555";
-    private static final int TEST_ARCHIVED = 1;
-    private static final String TEST_STRING = "TEST";
-
-    private MockContentResolver mResolver;
-    private Cursor mCursor;
-    private Uri mVoicemailUri;
-
-    public VoicemailArchiveProviderTest() {
-        super(TestVoicemailArchiveProvider.class, VoicemailArchiveContract.AUTHORITY);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getMockContentResolver();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (mCursor != null) {
-            mCursor.close();
-        }
-        // Need to delete test.cache folder created by {@link android.test.ProviderTestCase2}
-        deleteRecursive(getContext().getCacheDir());
-        getProvider().closeDb();
-        super.tearDown();
-    }
-
-    public void testInsert() {
-        insertVoicemail();
-        assertNotNull(mVoicemailUri);
-        assertTrue(doesRowExist());
-        long id = ContentUris.parseId(mVoicemailUri);
-        assertTrue(id > 0);
-    }
-
-    public void testQuery_createFile() throws Exception {
-        insertVoicemail();
-        assertTrue(doesRowExist());
-        assertFalse(doesFileExist());
-        createFile();
-        assertTrue(doesFileExist());
-    }
-
-    public void testQuery_createFileMimeTypeIsAMR() throws Exception {
-        insertVoicemailWithMimeType("audio/amr");
-        assertTrue(doesRowExist());
-        assertFalse(doesFileExist());
-        createFile();
-        assertTrue(doesFileExist());
-        assertEquals("amr", getFileExtension(getFilePath()));
-    }
-
-    public void testQuery_createFileMimeTypeIsMP3() throws Exception {
-        insertVoicemailWithMimeType("audio/mpeg");
-        assertTrue(doesRowExist());
-        assertFalse(doesFileExist());
-        createFile();
-        assertTrue(doesFileExist());
-        assertEquals("mp3", getFileExtension(getFilePath()));
-    }
-
-    public void testQuery_createFileMimeTypeNotExists() throws Exception {
-        insertVoicemailWithMimeType(TEST_STRING);
-        assertTrue(doesRowExist());
-        assertFalse(doesFileExist());
-        createFile();
-        assertTrue(doesFileExist());
-        assertEquals("", getFileExtension(getFilePath()));
-    }
-
-    public void testQuery() {
-        insertVoicemail();
-        updateCursor();
-        assertCursorCount(1);
-        assertContentValues();
-    }
-
-    public void testQuery_correctValuesSelection() {
-        insertVoicemail();
-        updateCursorWithIdQuery();
-        assertCursorCount(1);
-        assertContentValues();
-    }
-
-    public void testQuery_illegalUri() {
-        try {
-            mResolver.query(Uri.withAppendedPath(VoicemailArchive.CONTENT_URI, TEST_STRING),
-                    null, null, null, null);
-            fail("Expecting exception but none was thrown.");
-        } catch (IllegalArgumentException e) {}
-    }
-
-    public void testUpdate() throws Exception {
-        insertVoicemail();
-        assertTrue(doesRowExist());
-        ContentValues values = new ContentValues();
-        values.put(VoicemailArchive.MIME_TYPE, TEST_STRING);
-        values.put(VoicemailArchive.NUMBER, TEST_STRING);
-        values.put(VoicemailArchive.ARCHIVED, false);
-        mResolver.update(mVoicemailUri, values, null, null);
-        updateCursor();
-        assertEquals(TEST_STRING, mCursor.getString(mCursor.getColumnIndex(VoicemailArchive.MIME_TYPE)));
-        assertEquals(TEST_STRING, mCursor.getString(mCursor.getColumnIndex(VoicemailArchive.NUMBER)));
-        assertEquals(false, mCursor.getInt(
-                mCursor.getColumnIndex(VoicemailArchive.ARCHIVED)) == 1);
-    }
-
-    public void testUpdate_selection() throws Exception {
-        insertVoicemail();
-        assertTrue(doesRowExist());
-        ContentValues values = new ContentValues();
-        values.put(VoicemailArchive.MIME_TYPE, TEST_STRING);
-        values.put(VoicemailArchive.NUMBER, TEST_STRING);
-        values.put(VoicemailArchive.ARCHIVED, false);
-        mResolver.update(VoicemailArchive.CONTENT_URI, values, getIdQuery(), null);
-        updateCursor();
-        assertEquals(TEST_STRING, mCursor.getString(mCursor.getColumnIndex(VoicemailArchive.MIME_TYPE)));
-        assertEquals(TEST_STRING, mCursor.getString(mCursor.getColumnIndex(VoicemailArchive.NUMBER)));
-        assertEquals(false, mCursor.getInt(
-                mCursor.getColumnIndex(VoicemailArchive.ARCHIVED)) == 1);
-    }
-
-    public void testUpdate_illegalUri() {
-        try {
-            mResolver.update(Uri.withAppendedPath(VoicemailArchive.CONTENT_URI, TEST_STRING),
-                    null, null, null);
-            fail("Expecting exception but none was thrown.");
-        } catch (IllegalArgumentException e) {}
-    }
-
-    public void testDelete() throws Exception {
-        insertVoicemail();
-        createFile();
-        assertTrue(doesRowExist());
-        assertTrue(doesFileExist());
-        mResolver.delete(mVoicemailUri, null, null);
-        assertFalse(doesRowExist());
-        assertFalse(doesFileExist());
-    }
-
-    public void testDelete_selection() throws Exception{
-        insertVoicemail();
-        createFile();
-        assertTrue(doesRowExist());
-        assertTrue(doesFileExist());
-        mResolver.delete(VoicemailArchive.CONTENT_URI, getIdQuery(), null);
-        assertFalse(doesRowExist());
-        assertFalse(doesFileExist());
-    }
-
-    public void testDelete_illegalUri() {
-        try {
-            mResolver.delete(Uri.withAppendedPath(VoicemailArchive.CONTENT_URI, TEST_STRING),
-                    null, null);
-            fail("Expecting exception but none was thrown.");
-        } catch (IllegalArgumentException e) {}
-    }
-
-    private boolean doesRowExist() {
-        Cursor tempCursor = mResolver.query(mVoicemailUri, null, null, null, null);
-        boolean rowExists = tempCursor != null && tempCursor.getCount() > 0;
-        tempCursor.close();
-        return rowExists;
-    }
-
-    private boolean doesFileExist() {
-        File voicemailFile = new File(getFilePath());
-        return voicemailFile.exists();
-    }
-
-    private static String getFileExtension(String filePath) {
-        File file = new File(filePath);
-        String fileName = file.getName();
-        int index = fileName.lastIndexOf(".");
-        return index > 0 ? fileName.substring(index + 1) : "";
-    }
-
-    private void assertCursorCount(int count) {
-        assertEquals(count, mCursor.getCount());
-    }
-
-    private void assertContentValues() {
-        assertEquals(TEST_MIME_TYPE, mCursor
-                .getString(mCursor.getColumnIndex(VoicemailArchive.MIME_TYPE)));
-        assertEquals(TEST_NUMBER, mCursor
-                .getString(mCursor.getColumnIndex(VoicemailArchive.NUMBER)));
-        assertEquals(TEST_ARCHIVED, mCursor
-                .getInt(mCursor.getColumnIndex(VoicemailArchive.ARCHIVED)));
-    }
-
-    private void insertVoicemail() {
-        mVoicemailUri = mResolver.insert(VoicemailArchive.CONTENT_URI, getTestValues());
-    }
-
-    private void insertVoicemailWithMimeType(String mimeType) {
-        ContentValues values = getTestValues();
-        values.put(VoicemailArchive.MIME_TYPE, mimeType);
-        mVoicemailUri = mResolver.insert(VoicemailArchive.CONTENT_URI, values);
-    }
-
-    private void updateCursor() {
-        mCursor = mResolver.query(mVoicemailUri, null, null, null, null);
-        assertEquals(true, mCursor.getCount() > 0);
-        mCursor.moveToFirst();
-    }
-
-    private void updateCursorWithIdQuery() {
-        mCursor = mResolver.query(mVoicemailUri, null, getIdQuery(), null, null);
-        assertEquals(true, mCursor.getCount() > 0);
-        mCursor.moveToFirst();
-    }
-
-    private void createFile() throws Exception {
-        assertFalse(doesFileExist());
-        // Opening output stream and closing it should create the file
-        OutputStream outputStream = mResolver.openOutputStream(mVoicemailUri);
-        outputStream.close();
-    }
-
-    private String getIdQuery() {
-        return VoicemailArchive._ID + "=" + ContentUris.parseId(mVoicemailUri);
-    }
-
-    private String getFilePath() {
-        if (mCursor == null) {
-            updateCursor();
-        }
-        return mCursor.getString(mCursor.getColumnIndex(VoicemailArchive._DATA));
-    }
-
-    private static ContentValues getTestValues() {
-        ContentValues values = new ContentValues();
-        values.put(VoicemailArchive.NUMBER, TEST_NUMBER);
-        values.put(VoicemailArchive.MIME_TYPE, TEST_MIME_TYPE);
-        values.put(VoicemailArchive.ARCHIVED, TEST_ARCHIVED);
-        return values;
-    }
-
-    private void deleteRecursive(File fileOrDirectory) {
-        if (fileOrDirectory.isDirectory()) {
-            for (File child : fileOrDirectory.listFiles()) {
-                deleteRecursive(child);
-            }
-        }
-        fileOrDirectory.delete();
-    }
-
-    public static class TestVoicemailArchiveProvider extends VoicemailArchiveProvider {
-        private DialerDatabaseHelper mDialerDatabaseHelper;
-
-        @Override
-        protected File getFilesDir() {
-            return getContext().getCacheDir();
-        }
-
-        @Override
-        protected DialerDatabaseHelper getDatabaseHelper(Context context) {
-            if (mDialerDatabaseHelper == null) {
-                mDialerDatabaseHelper = DialerDatabaseHelper.getNewInstanceForTest(context);
-            }
-            return mDialerDatabaseHelper;
-        }
-
-        protected void closeDb() {
-            mDialerDatabaseHelper.close();
-        }
-    }
-}