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

Commit fa270d23 authored by Pranav Madapurmath's avatar Pranav Madapurmath Committed by Android (Google) Code Review
Browse files

Merge "DSDA: Resolve missed call not received for 2nd MT." into main

parents 887b822b 49849546

src/java/com/android/internal/telephony/CallManager.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -30,6 +30,8 @@ import android.telephony.ServiceState; 




import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.imsphone.ImsPhoneConnection;

import com.android.internal.telephony.imsphone.ImsPhoneConnection;

import com.android.server.telecom.flags.FeatureFlags;

import com.android.server.telecom.flags.FeatureFlagsImpl;

import com.android.telephony.Rlog;

import com.android.telephony.Rlog;





import java.util.ArrayList;

import java.util.ArrayList;
@@ -120,6 +122,7 @@ public class CallManager { 




    private Object mRegistrantidentifier = new Object();

    private Object mRegistrantidentifier = new Object();





    private FeatureFlags mTelecomFeatureFlags;

    // state registrants

    // state registrants

    protected final RegistrantList mPreciseCallStateRegistrants

    protected final RegistrantList mPreciseCallStateRegistrants

    = new RegistrantList();

    = new RegistrantList();
@@ -196,6 +199,7 @@ public class CallManager { 
        mBackgroundCalls = new ArrayList<Call>();

        mBackgroundCalls = new ArrayList<Call>();

        mForegroundCalls = new ArrayList<Call>();

        mForegroundCalls = new ArrayList<Call>();

        mDefaultPhone = null;

        mDefaultPhone = null;

        mTelecomFeatureFlags = new FeatureFlagsImpl();

    }

    }





    /**

    /**
@@ -2070,7 +2074,8 @@ public class CallManager { 
                        incomingRejected = true;

                        incomingRejected = true;

                    }

                    }

                    if ((getActiveFgCallState(subId).isDialing() || hasMoreThanOneRingingCall())

                    if ((getActiveFgCallState(subId).isDialing() || hasMoreThanOneRingingCall())

                            && (!incomingRejected)) {

                            && (!incomingRejected)

                            && !mTelecomFeatureFlags.enableCallSequencing()) {

                        try {

                        try {

                            Rlog.d(LOG_TAG, "silently drop incoming call: " + c.getCall());

                            Rlog.d(LOG_TAG, "silently drop incoming call: " + c.getCall());

                            c.getCall().hangup();

                            c.getCall().hangup();