diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-01-06 03:13:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-06 03:13:55 +0000 |
commit | fdf68fbd0b17879ad7d8dfd06b58ba182e00a0b7 (patch) | |
tree | f4b516c0aec4cdeb42ec2d0b281b5c52f6b8fca7 /InCallUI/src/com/android/incallui/InCallActivity.java | |
parent | c4a1ab0a731d28e5701a58e08a3eac0d6e0f1dc4 (diff) | |
parent | 4a220bd6fda5df9be02e2473b49518cb0db9b7c8 (diff) |
Merge "Display incoming call when phone account selection dialog shows"
Diffstat (limited to 'InCallUI/src/com/android/incallui/InCallActivity.java')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index eca79f8a7..abbdf4679 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -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(); + } } /** |