summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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();
+ }
}
/**