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

Commit 9e0a6420 authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

Merge "fix the issue of ussd not working under GSM" into nyc-dev

parents 29f2f999 6916d439

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

+2 −2
Original line number Diff line number Diff line
@@ -1850,8 +1850,8 @@ public class GsmCdmaPhone extends Phone { 
         * The exception is cancellation of an incoming USSD-REQUEST, which is

         * not on the list.

         */

        if (mPendingMMIs.remove(mmi) && (!isPhoneTypeGsm() || mmi.isUssdRequest() ||

                ((GsmMmiCode)mmi).isSsInfo())) {

        if (mPendingMMIs.remove(mmi) || (isPhoneTypeGsm() && (mmi.isUssdRequest() ||

                ((GsmMmiCode)mmi).isSsInfo()))) {

            mMmiCompleteRegistrants.notifyRegistrants(new AsyncResult(null, mmi, null));

        }

    }