Fix broken CP2 unit tests and voicemail cleanup

* Delete voicemails when VoicemailCleanupService runs by
checking whether delete is called internally.
* Delete unnecessary MockPackageManager class, and consolidate
all logic into ContactsMockPackageManager
* Separate permissions tests and delete logic tests in
VoicemailProviderTest
* Correct the number of exposed Call columns in CallLogProviderTest

Bug: 20669398
Change-Id: I695b82b639b93f3ce85bf6e20000279f19e4a14a

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/src/com/android/providers/contacts/CallLogProviderTest.java b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
index ea436d8..32e0988 100644
--- a/tests/src/com/android/providers/contacts/CallLogProviderTest.java
+++ b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
@@ -64,7 +64,7 @@ public class CallLogProviderTest extends BaseContactsProvider2Test {
             Voicemails.DIRTY,
             Voicemails.DELETED};
     /** Total number of columns exposed by call_log provider. */
-    private static final int NUM_CALLLOG_FIELDS = 25;
+    private static final int NUM_CALLLOG_FIELDS = 26;
 
     private CallLogProvider mCallLogProvider;
 
@@ -481,7 +481,7 @@ public class CallLogProviderTest extends BaseContactsProvider2Test {
             return new ContextWrapper(super.context()) {
                 @Override
                 public PackageManager getPackageManager() {
-                    return new MockPackageManager("com.test.package1", "com.test.package2");
+                    return super.getPackageManager();
                 }
 
                 @Override