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

Commit c0af923d authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Fix NPE in ImsPhoneCallTracker"

parents 288d6531 ac1c4c78

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -2356,8 +2356,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                        || mPendingMO.getDisconnectCause() != DisconnectCause.NOT_DISCONNECTED) {

                        || mPendingMO.getDisconnectCause() != DisconnectCause.NOT_DISCONNECTED) {

                    mHoldSwitchingState = HoldSwapState.INACTIVE;

                    mHoldSwitchingState = HoldSwapState.INACTIVE;

                    logHoldSwapState("onCallTerminated hold to dial but no pendingMo");

                    logHoldSwapState("onCallTerminated hold to dial but no pendingMo");

                }

                } else if (imsCall != mPendingMO.getImsCall()) {

                if (imsCall != mPendingMO.getImsCall()) {

                    sendEmptyMessage(EVENT_DIAL_PENDINGMO);

                    sendEmptyMessage(EVENT_DIAL_PENDINGMO);

                    mHoldSwitchingState = HoldSwapState.INACTIVE;

                    mHoldSwitchingState = HoldSwapState.INACTIVE;

                    logHoldSwapState("onCallTerminated hold to dial, dial pendingMo");

                    logHoldSwapState("onCallTerminated hold to dial, dial pendingMo");