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

Commit 0d264192 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "IMS:3-way Conf Success but Active call refer fails"

parents f5bfbf0c c63e643a

telecomm/java/android/telecom/Call.java

+10 −0
Original line number Diff line number Diff line
@@ -665,6 +665,16 @@ public final class Call { 
        mIsActiveSub = isActiveSub;

    }



     /** {@hide} */

    Call(Phone phone, String telecomCallId, InCallAdapter inCallAdapter, boolean isActiveSub,

            int state) {

        mPhone = phone;

        mTelecomCallId = telecomCallId;

        mInCallAdapter = inCallAdapter;

        mState = state;

        mIsActiveSub = isActiveSub;

    }



    /** {@hide} */

    final String internalGetCallId() {

        return mTelecomCallId;

telecomm/java/android/telecom/Phone.java

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public final class Phone { 
    /** {@hide} */

    final void internalAddCall(ParcelableCall parcelableCall) {

        Call call = new Call(this, parcelableCall.getId(), mInCallAdapter,

                parcelableCall.mIsActiveSub);

                parcelableCall.mIsActiveSub, parcelableCall.getState());

        mCallByTelecomCallId.put(parcelableCall.getId(), call);

        mCalls.add(call);

        checkCallTree(parcelableCall);

telecomm/java/android/telecom/TelecomManager.java

+8 −0
Original line number Diff line number Diff line
@@ -138,6 +138,14 @@ public class TelecomManager { 
    public static final String EXTRA_UNKNOWN_CALL_HANDLE =

            "android.telecom.extra.UNKNOWN_CALL_HANDLE";



    /**

     * Similar to {@link #ACTION_INCOMING_CALL}, but is used only by Telephony to add a new

     * sim-initiated MO call for carrier testing and for conference scenarios

     * @hide

     */

    public static final String EXTRA_UNKNOWN_CALL_STATE =

            "codeaurora.telecom.extra.UNKNOWN_CALL_STATE";



    /**

     * Optional extra for {@link android.telephony.TelephonyManager#ACTION_PHONE_STATE_CHANGED}

     * containing the disconnect code.