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

Commit d9eafd48 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "MSIM: Dismiss pending dialog on incoming call notification." into atel.lnx.2.0-dev

parents edefa46c 11cd7b71

InCallUI/src/com/android/incallui/InCallActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -924,6 +924,11 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD 
            mDialog.dismiss();

            mDialog = null;

        }

        SelectPhoneAccountDialogFragment dialogFragment = (SelectPhoneAccountDialogFragment)

                getFragmentManager().findFragmentByTag(TAG_SELECT_ACCT_FRAGMENT);

        if (dialogFragment != null) {

            dialogFragment.dismiss();

        }

        if (mAnswerFragment != null) {

            mAnswerFragment.dismissPendingDialogs();

        }

InCallUI/src/com/android/incallui/InCallPresenter.java

+1 −0
Original line number Diff line number Diff line
@@ -1492,6 +1492,7 @@ public class InCallPresenter implements CallList.Listener, 
            // We're about the bring up the in-call UI for an incoming call. If we still have

            // dialogs up, we need to clear them out before showing incoming screen.

            if (isActivityStarted()) {

                mInCallActivity.showCallCardFragment(true);

                mInCallActivity.dismissPendingDialogs();

            }

            if (!startUi(newState)) {