Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f804a918 authored by Ta-wei Yen's avatar Ta-wei Yen Committed by Android (Google) Code Review
Browse files

Merge "Rename provider authority for AOSP Dialer" into nyc-dev

parents 5da20d4e bab130fb

res/values/donottranslate_config.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

src/com/android/dialer/database/VoicemailArchiveContract.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/dialerbind/ObjectFactory.java

+4 −1
Original line number Diff line number Diff line
@@ -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;

    }