diff options
author | Ta-wei Yen <twyen@google.com> | 2016-03-18 21:13:24 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-03-18 21:13:24 +0000 |
commit | c0b805e68c960ff7af4a25dff8b95eb2c620f22f (patch) | |
tree | 6621eb8ec3060eb30540bc8bc15c6dd1b8b0f99f /src/com | |
parent | 74a4339953bf2a41a4cd1e73a88b0edfafa50585 (diff) | |
parent | f804a91865c7916369e1ab119dfb13d35ca5f033 (diff) |
Merge "Rename provider authority for AOSP Dialer" into nyc-dev
am: f804a91
* commit 'f804a91865c7916369e1ab119dfb13d35ca5f033':
Rename provider authority for AOSP Dialer
Diffstat (limited to 'src/com')
-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; } |