summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWenlu Wu <wenlu.xa.wu@sonymobile.com>2017-01-06 03:24:36 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-06 03:24:36 +0000
commitf6a3e266444e7e440232e68662c2d1086893eaef (patch)
tree6125f03544d59ab4d27d64544b3d2d5803386948
parent8590508144f14c67b73f493fd9a5fc8e34dbfdcd (diff)
parent2f06e83ade3ca65568fcf8115b3fe6a5ace99427 (diff)
Merge "Display incoming call when phone account selection dialog shows" am: fdf68fbd0b
am: 2f06e83ade Change-Id: I782d4bed3ad3150d0f5b4b87b687d923ca913e68
-rw-r--r--InCallUI/src/com/android/incallui/InCallActivity.java12
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();
+ }
}
/**