Rename provider authority for AOSP Dialer
Authority name clash is preventing GoogleDialer from installing over
AOSP dialer
Authority for FileProvider is put in donottranslate_config.xml because
it need to be shared with ContactsCommon
Bug:27685485
Change-Id: I45a51639a85a00f58385e08221cb100ac66c2069
diff --git a/res/values/donottranslate_config.xml b/res/values/donottranslate_config.xml
index 468e415..4ed41d0 100644
--- a/res/values/donottranslate_config.xml
+++ b/res/values/donottranslate_config.xml
@@ -34,4 +34,6 @@
Ignored if empty. -->
<string name="config_prohibited_phone_number_regexp"></string>
+ <!-- File Authority for AOSP Dialer files -->
+ <string name="contacts_file_provider_authority">com.android.dialer.files</string>
</resources>
diff --git a/src/com/android/dialer/database/VoicemailArchiveContract.java b/src/com/android/dialer/database/VoicemailArchiveContract.java
index 92d9c17..f332932 100644
--- a/src/com/android/dialer/database/VoicemailArchiveContract.java
+++ b/src/com/android/dialer/database/VoicemailArchiveContract.java
@@ -21,6 +21,8 @@
import android.provider.CallLog;
import android.provider.OpenableColumns;
+import com.android.dialerbind.ObjectFactory;
+
/**
* Contains definitions for the supported URIs and columns for the voicemail archive table.
* All the fields excluding MIME_TYPE, _DATA, ARCHIVED, SERVER_ID, mirror the fields in the
@@ -29,7 +31,7 @@
public final class VoicemailArchiveContract {
/** The authority used by the voicemail archive provider. */
- public static final String AUTHORITY = "com.android.dialer.database.voicemailarchiveprovider";
+ public static final String AUTHORITY = ObjectFactory.getVoicemailArchiveProviderAuthority();
/** A content:// style uri for the voicemail archive provider */
public static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY);
diff --git a/src/com/android/dialerbind/ObjectFactory.java b/src/com/android/dialerbind/ObjectFactory.java
index d059d94..303610f 100644
--- a/src/com/android/dialerbind/ObjectFactory.java
+++ b/src/com/android/dialerbind/ObjectFactory.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.support.annotation.Nullable;
-import android.view.ViewStub;
import com.android.dialer.calllog.CallLogAdapter;
import com.android.dialer.calllog.ContactInfoHelper;
@@ -44,6 +43,10 @@
return "com.android.dialer.database.filterednumberprovider";
}
+ public static String getVoicemailArchiveProviderAuthority() {
+ return "com.android.dialer.database.voicemailarchiveprovider";
+ }
+
public static boolean isVoicemailArchiveEnabled(Context context) {
return false;
}