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

Commit e04e0029 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Issue 127875492: USSD progress dialog didn't dismiss when user press cancel button."

parents 10d6f803 eb0d7079

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

+6 −1
Original line number Diff line number Diff line
@@ -3923,7 +3923,12 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    public void callEndCleanupHandOverCallIfAny() {

    }



    public void cancelUSSD() {

    /**

     * Cancel USSD session.

     *

     * @param msg The message to dispatch when the USSD session terminated.

     */

    public void cancelUSSD(Message msg) {

    }



    /**

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

+2 −2
Original line number Diff line number Diff line
@@ -1128,8 +1128,8 @@ public class ImsPhone extends ImsPhoneBase { 
    }



    @Override

    public void cancelUSSD() {

        mCT.cancelUSSD();

    public void cancelUSSD(Message msg) {

        mCT.cancelUSSD(msg);

    }



    @UnsupportedAppUsage

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

+7 −2
Original line number Diff line number Diff line
@@ -1788,9 +1788,14 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        }

    }



    public void cancelUSSD() {

    /**

     * Cancel USSD session.

     *

     * @param msg The message to dispatch when the USSD session terminated.

     */

    public void cancelUSSD(Message msg) {

        if (mUssdSession == null) return;



        mPendingUssd = msg;

        mUssdSession.terminate(ImsReasonInfo.CODE_USER_TERMINATED);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
        mState = State.CANCELLED;



        if (mIsPendingUSSD) {

            mPhone.cancelUSSD();

            mPhone.cancelUSSD(obtainMessage(EVENT_USSD_CANCEL_COMPLETE, this));

        } else {

            mPhone.onMMIDone (this);

        }

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java

+2 −2
Original line number Diff line number Diff line
@@ -357,8 +357,8 @@ public class ImsPhoneTest extends TelephonyTest { 
        mImsPhoneUT.sendUSSD("1234", msg);

        verify(mImsCT).sendUSSD("1234", msg);



        mImsPhoneUT.cancelUSSD();

        verify(mImsCT).cancelUSSD();

        mImsPhoneUT.cancelUSSD(msg);

        verify(mImsCT).cancelUSSD(msg);



    }