Some cleanup for CP2

- Get ContactDirectoryManager's debug flag from sys prop.
- Introduce a debug sys prop to all scan directories.
- Some clean up for voicemail provider too
ContentProvider.getCallingPackage() didn't used to exist, so it has
custom code for that.  Now we can just use getCallingPackage().

Test: adb shell am instrument -w com.android.providers.contacts.tests
Change-Id: Ic16d598251f4bc0bb84b0b71dac2366f195425fe

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/src/com/android/providers/contacts/BaseVoicemailProviderTest.java b/tests/src/com/android/providers/contacts/BaseVoicemailProviderTest.java
index e70492d3..f19f9bec 100644
--- a/tests/src/com/android/providers/contacts/BaseVoicemailProviderTest.java
+++ b/tests/src/com/android/providers/contacts/BaseVoicemailProviderTest.java
@@ -189,7 +189,7 @@ public abstract class BaseVoicemailProviderTest extends BaseContactsProvider2Tes
         }
 
         @Override
-        protected String getCallingPackage_() {
+        protected String getInjectedCallingPackage() {
             return getContext().getPackageName();
         }