Merge "Populate call initiation type log state" into ub-contactsdialer-a-dev
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 5fa57f9..1098341 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -239,6 +239,7 @@
@Override
protected void onSaveInstanceState(Bundle out) {
+ mIsVisible = false;
// TODO: The dialpad fragment should handle this as part of its own state
out.putBoolean(SHOW_DIALPAD_EXTRA,
mCallButtonFragment != null && mCallButtonFragment.isDialpadVisible());
@@ -399,6 +400,9 @@
// BACK is also used to exit out of any "special modes" of the
// in-call UI:
+ if (!isVisible()) {
+ return;
+ }
if ((mConferenceManagerFragment == null || !mConferenceManagerFragment.isVisible())
&& (mCallCardFragment == null || !mCallCardFragment.isVisible())) {