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

Commit a2595ad8 authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge CAF branch 'LA.BR.1.2.1_rb2.19' into caf/cm-12.0.

parents f43a8c5e 5ce3994f

src/com/android/server/telecom/Call.java

+2 −1
Original line number Diff line number Diff line
@@ -1367,7 +1367,8 @@ final class Call implements CreateConnectionResponse { 
    }



    public boolean getIsVoipAudioMode() {

        return mIsVoipAudioMode;

            return mIsVoipAudioMode ||((mHandle != null) ?

                    (mHandle.getScheme() == PhoneAccount.SCHEME_SIP): false);

    }



    public void setIsVoipAudioMode(boolean audioModeIsVoip) {

src/com/android/server/telecom/CallActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ public class CallActivity extends Activity { 
        Log.d(this, "isAddparticipant = "+isAddParticipant);

        if (isAddParticipant) {

            String number = PhoneNumberUtils.getNumberFromIntent(intent, this);

            boolean isConferenceUri = intent.getBooleanExtra(

                    TelephonyProperties.EXTRA_DIAL_CONFERENCE_URI, false);

            if (!isConferenceUri) {

                number = PhoneNumberUtils.stripSeparators(number);

            }

            CallsManager callsManager = CallsManager.getInstance();

            if (callsManager != null) {

                callsManager.addParticipant(number);

src/com/android/server/telecom/CallsManager.java

+7 −1
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ public final class CallsManager extends Call.ListenerBase { 
    private static final int MAXIMUM_DSDA_LIVE_CALLS = 2;

    private static final int MAXIMUM_DSDA_HOLD_CALLS = 2;

    private static final int MAXIMUM_TOP_LEVEL_CALLS = 2;

    private static final int MAXIMUM_DSDA_TOP_LEVEL_CALLS = 4;



    private static final int[] OUTGOING_CALL_STATES =

            {CallState.CONNECTING, CallState.DIALING};
@@ -1115,7 +1116,12 @@ public final class CallsManager extends Call.ListenerBase { 
            // we could put InCallServices into a state where they are showing two calls but

            // also support add-call. Technically it's right, but overall looks better (UI-wise)

            // and acts better if we wait until the call is removed.

            if (count >= MAXIMUM_TOP_LEVEL_CALLS) {

            if (TelephonyManager.getDefault().getMultiSimConfiguration()

                    == TelephonyManager.MultiSimVariants.DSDA) {

                if (count >= MAXIMUM_DSDA_TOP_LEVEL_CALLS) {

                    return false;

                }

            } else if (count >= MAXIMUM_TOP_LEVEL_CALLS) {

                return false;

            }