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

Commit ac03b699 authored by Victor Chang's avatar Victor Chang
Browse files

Show Enterprise directory contacts name in IncallUI and notification 

known issue:b/25859809

BUG=25899500

Change-Id: Ia61250707981b49efebb6e2c2e4910f58a1233dd
parent fb73c999

src/com/android/dialer/calllog/ContactInfoHelper.java

+28 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.content.Context; 
import android.database.Cursor;

import android.database.sqlite.SQLiteFullException;

import android.net.Uri;

import android.os.Build;

import android.provider.CallLog.Calls;

import android.provider.ContactsContract;

import android.provider.ContactsContract.CommonDataKinds.Phone;
@@ -47,6 +48,11 @@ import org.json.JSONObject; 
public class ContactInfoHelper {

    private static final String TAG = ContactInfoHelper.class.getSimpleName();



    private static final boolean FLAG_PRE_N_FEATURE =

            true // Enforce Pre-N (M) behavior in release build

            || Build.VERSION.SDK_INT <= Build.VERSION_CODES.M

            || !Build.VERSION.CODENAME.startsWith("N");



    private final Context mContext;

    private final String mCurrentCountryIso;
@@ -379,13 +385,31 @@ public class ContactInfoHelper { 
    }



    public static Uri getContactInfoLookupUri(String number) {

        return getContactInfoLookupUri(number, -1);

    }



    public static Uri getContactInfoLookupUri(String number, long directoryId) {

        // Get URI for the number in the PhoneLookup table, with a parameter to indicate whether

        // the number is a SIP number.

        return PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()

                .appendPath(Uri.encode(number))

        Uri uri = PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI;

        if (FLAG_PRE_N_FEATURE) {

            if (directoryId != -1) {

                // ENTERPRISE_CONTENT_FILTER_URI in M doesn't support directory lookup

                uri = PhoneLookup.CONTENT_FILTER_URI;

            } else {

                // b/25900607 in M. PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI, encodes twice.

                number = Uri.encode(number);

            }

        }

        Uri.Builder builder = uri.buildUpon()

                .appendPath(number)

                .appendQueryParameter(PhoneLookup.QUERY_PARAMETER_SIP_ADDRESS,

                        String.valueOf(PhoneNumberHelper.isUriNumber(number)))

                .build();

                String.valueOf(PhoneNumberHelper.isUriNumber(number)));

        if (directoryId != -1) {

            builder.appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,

                    String.valueOf(directoryId));

        }

        return builder.build();

    }



    /**