diff options
author | Wenlu Wu <wenlu.xa.wu@sonymobile.com> | 2017-01-06 03:32:04 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-06 03:32:04 +0000 |
commit | 8b3f8daa8bd6564f460daa3ad227f3eaa3c5aae4 (patch) | |
tree | f4d02bbcb8e606097b78053c53910b9ecaee5e88 /InCallUI/src/com/android/incallui | |
parent | d8976a96df2bf8389c40d32c1e7b06f77e469084 (diff) | |
parent | 8012f1a83f45913f13209e6074300df2bbadd75b (diff) |
Merge "Display incoming call when phone account selection dialog shows" am: fdf68fbd0b am: 2f06e83ade am: f6a3e26644
am: 8012f1a83f
Change-Id: Ife7419f7c86aafe4a2a6a3656e257383b1f0c079
Diffstat (limited to 'InCallUI/src/com/android/incallui')
-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 5ae231ae1..eaaedff2c 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -848,6 +848,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); } @@ -892,6 +898,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(); + } } /** |