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

Commit a6de88d9 authored by Youming Ye's avatar Youming Ye Committed by Gerrit Code Review
Browse files

Merge "Reset mPendingUssd when mUssdSession is not null"

parents 3171e248 86fda682

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

+3 −0
Original line number Diff line number Diff line
@@ -1759,6 +1759,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 


        try {

            if (mUssdSession != null) {

                // Doesn't need mPendingUssd here. Listeners would use it if not null.

                mPendingUssd = null;

                mUssdSession.sendUssd(ussdString);

                AsyncResult.forMessage(response, null, null);

                response.sendToTarget();
@@ -1778,6 +1780,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 


            mUssdSession = mImsManager.makeCall(profile, callees, mImsUssdListener);

            mPendingUssd = response;

            if (DBG) log("pending ussd updated, " + mPendingUssd);

        } catch (ImsException e) {

            loge("sendUSSD : " + e);

            mPhone.sendErrorResponse(response, e);