diff options
author | Ta-wei Yen <twyen@google.com> | 2016-03-16 18:17:43 -0700 |
---|---|---|
committer | Ta-wei Yen <twyen@google.com> | 2016-03-16 18:17:43 -0700 |
commit | bab130fb27948719cf6600ff22a10b19f78001df (patch) | |
tree | fa679caaa8026fdf5ac79fc37a52367db7f32409 /src | |
parent | 77c6c5582a7387fbf326c0089bdd56bd8027eb50 (diff) |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/database/VoicemailArchiveContract.java | 4 | ||||
-rw-r--r-- | src/com/android/dialerbind/ObjectFactory.java | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/dialer/database/VoicemailArchiveContract.java b/src/com/android/dialer/database/VoicemailArchiveContract.java index 92d9c17ef..f332932c3 100644 --- a/src/com/android/dialer/database/VoicemailArchiveContract.java +++ b/src/com/android/dialer/database/VoicemailArchiveContract.java @@ -21,6 +21,8 @@ import android.provider.BaseColumns; 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 @@ import android.provider.OpenableColumns; 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 d059d94d5..303610f30 100644 --- a/src/com/android/dialerbind/ObjectFactory.java +++ b/src/com/android/dialerbind/ObjectFactory.java @@ -20,7 +20,6 @@ import static com.android.dialer.calllog.CallLogAdapter.CallFetcher; 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 @@ public class ObjectFactory { return "com.android.dialer.database.filterednumberprovider"; } + public static String getVoicemailArchiveProviderAuthority() { + return "com.android.dialer.database.voicemailarchiveprovider"; + } + public static boolean isVoicemailArchiveEnabled(Context context) { return false; } |