summaryrefslogtreecommitdiff
path: root/src/com
diff options
context:
space:
mode:
authorTa-wei Yen <twyen@google.com>2016-03-18 21:15:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-18 21:15:42 +0000
commitd4def2b9992552967fb8931923e127ce6eced0ea (patch)
tree9c464cf1f68c974485abf9a6b55ac0b7b3a08fe9 /src/com
parentec3703fed0e14c03b53ccee6b39c638c8b7d50b4 (diff)
parentc0b805e68c960ff7af4a25dff8b95eb2c620f22f (diff)
Merge "Rename provider authority for AOSP Dialer" into nyc-dev am: f804a91
am: c0b805e * commit 'c0b805e68c960ff7af4a25dff8b95eb2c620f22f': Rename provider authority for AOSP Dialer
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/dialer/database/VoicemailArchiveContract.java4
-rw-r--r--src/com/android/dialerbind/ObjectFactory.java5
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;
}