Merge "Normalize the number before inserting into list of calls in connectionservice"

import android.bluetooth.BluetoothHeadsetClientCall;

import android.net.Uri;

import android.telecom.PhoneAccount;

import android.telephony.PhoneNumberUtils;

import android.text.TextUtils;

/* Matching a call to internal state requires understanding of the ph number and the state of the

 * remote itself. The best way to associate a call with remote is to use the Call IDs that are

    public static final int INVALID_ID = -1;

    private final int mId;

    private final Uri mPhoneNumber;

    private final String mPhoneNumber;

    ConnectionKey(int id, Uri phoneNumber) {

        if (id == INVALID_ID && phoneNumber == null) {

            throw new IllegalStateException("invalid id and phone number");

        }

        mId = id;

        mPhoneNumber = phoneNumber;

        mPhoneNumber = normalizePhoneUri(phoneNumber);

    }

    private static String normalizePhoneUri(Uri phoneNumber) {

        // Sometimes the number can be rewritten with brackets and such, we normalize to take that

        // factor out.

        String schemeSpecificPart = phoneNumber.getSchemeSpecificPart();

        if (!TextUtils.isEmpty(schemeSpecificPart)) {

            if (schemeSpecificPart.startsWith("+")) {

                schemeSpecificPart = schemeSpecificPart.substring(1);

            }

            schemeSpecificPart = PhoneNumberUtils.normalizeNumber(schemeSpecificPart);

        }

        return schemeSpecificPart;

    }

    public static ConnectionKey getKey(BluetoothHeadsetClientCall call) {

        return mId;

    }

    public Uri getPhoneNumber() {

    public String getPhoneNumber() {

        return mPhoneNumber;

    }