am 1bb79c7f: Merge "Fixing resume of FG call after failure to merge IMS calls." into lmp-mr1-dev

                ImsPhoneCall.State oldState = mBackgroundCall.getState();

                processCallStateChange(imsCall, ImsPhoneCall.State.HOLDING,

                        DisconnectCause.NOT_DISCONNECTED);

                // Note: If we're performing a switchWaitingOrHoldingAndActive, the call to

                // processCallStateChange above may have caused the mBackgroundCall and

                // mForegroundCall references below to change meaning.  Watch out for this if you

                // are reading through this code.

                if (oldState == ImsPhoneCall.State.ACTIVE) {

                    // Note: This case comes up when we have just held a call in response to a

                    // switchWaitingOrHoldingAndActive.  We now need to resume the background call.

                        if (mPendingMO != null) {

                            sendEmptyMessage(EVENT_DIAL_PENDINGMO);

                        }

                        // In this case there will be no call resumed, so we can assume that we

                        // are done switching fg and bg calls now.

                        // This may happen if there is no BG call and we are holding a call so that

                        // we can dial another one.

                        mSwitchingFgAndBgCalls = false;

                    }

                }

            }