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

Commit 2ad7aaed authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Remove onCallInitiating/Progressing order exceptions. 

The onCallInitiating API should be called before onCallProgressing.
There was code present to validate that the OEM is implementing the
behavior correctly.
However unfortunately the ImsCall.Listener instance is shared among all
calls, so in multi-call scenarios the IllegalStateExceptions can trip when
there is not actually an invalid scenario.  Moving to a non-shared
listener is a bigger change and not something we can easily regression
test, so removing the exception throws is a reasonable solution.

Test: Dialing regression testing; this an edge case which is not
possible to produce manually.
Bug: 189291969

Change-Id: I075f5081a3a04d4adb6674a8deb4ae6e155ce5ad
parent 08000e49

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+0 −14
Original line number Diff line number Diff line
@@ -2867,21 +2867,9 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    private ImsCall.Listener mImsCallListener = new ImsCall.Listener() {

        boolean mOnCallInitiatingCalled = false;

        boolean mOnCallProgressingCalled = false;



        @Override

        public void onCallInitiating(ImsCall imsCall) {

            if (DBG) log("onCallInitiating");



            if (mOnCallInitiatingCalled) {

                throw new IllegalStateException("onCallInitiating cannot be called twice.");

            } else if (mOnCallProgressingCalled) {

                throw new IllegalStateException("onCallInitiating cannot be called after "

                        + "onCallProgressing has been called.");

            }

            mOnCallInitiatingCalled = true;



            mPendingMO = null;

            processCallStateChange(imsCall, ImsPhoneCall.State.DIALING,

                    DisconnectCause.NOT_DISCONNECTED, true);
@@ -2892,8 +2880,6 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        public void onCallProgressing(ImsCall imsCall) {

            if (DBG) log("onCallProgressing");



            mOnCallProgressingCalled = true;



            mPendingMO = null;

            processCallStateChange(imsCall, ImsPhoneCall.State.ALERTING,

                    DisconnectCause.NOT_DISCONNECTED);