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

Commit fe73e895 authored by Youming Ye's avatar Youming Ye Committed by android-build-merger
Browse files

Merge "Reset mPendingUssd when mUssdSession is not null" am: a6de88d9 am: 3b51ff1b 

am: 8f871d1a

Change-Id: I55563c8c03cdd38598da1f096a7f3d9194ffbe74
parents de36d075 8f871d1a

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);