Merge "Add null-check to isMultiparty method, additional debug strings." into lmp-mr1-dev

import android.os.PowerManager;

import android.os.Registrant;

import android.os.SystemClock;

import android.telecom.Log;

import android.telephony.DisconnectCause;

import android.telephony.PhoneNumberUtils;

import android.telephony.Rlog;

    @Override

    public boolean isMultiparty() {

        Rlog.d(LOG_TAG, "isMultiparty "+mImsCall.isMultiparty());

        return mImsCall.isMultiparty();

        return mImsCall != null && mImsCall.isMultiparty();

    }

    /*package*/ ImsCall getImsCall() {

                    "Failed to disconnect endpoint = " + endpoint);

        }

    }

    /**

     * Provides a string representation of the {@link ImsPhoneConnection}.  Primarily intended for

     * use in log statements.

     *

     * @return String representation of call.

     */

    @Override

    public String toString() {

        StringBuilder sb = new StringBuilder();

        sb.append("[ImsPhoneConnection objId: ");

        sb.append(System.identityHashCode(this));

        sb.append(" address:");

        sb.append(Log.pii(getAddress()));

        sb.append(" ImsCall:");

        if (mImsCall == null) {

            sb.append("null");

        } else {

            sb.append(mImsCall);

        }

        sb.append("]");

        return sb.toString();

    }

}