Merge "Display incoming call when phone account selection dialog shows" am: fdf68fbd0b (f6a3e266) · Commits · e / os / android_packages_apps_Dialer

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -844,6 +844,12 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD
		}

		public void showAnswerFragment(boolean show) {
		// CallCardFragment is the parent fragment of AnswerFragment.
		// Must create the CallCardFragment first before creating
		// AnswerFragment if CallCardFragment is null.
		if (show && getCallCardFragment() == null) {
		showCallCardFragment(true);
		}
		showFragment(TAG_ANSWER_FRAGMENT, show, true);
		}

		@@ -888,6 +894,12 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD
		if (mAnswerFragment != null) {
		mAnswerFragment.dismissPendingDialogs();
		}

		SelectPhoneAccountDialogFragment dialogFragment = (SelectPhoneAccountDialogFragment)
		getFragmentManager().findFragmentByTag(TAG_SELECT_ACCT_FRAGMENT);
		if (dialogFragment != null) {
		dialogFragment.dismiss();
		}
		}

		/**