summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristine Chen <christinech@google.com>2013-10-02 09:52:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-02 09:52:06 -0700
commitb48045c6093ce7a1c925e19a51e2d7e39b14e22e (patch)
tree5345a9e90d58c35a560042a123852c564fec9759
parentf99f4d57e5f8085d081769356c5471d3d351ff4b (diff)
parent5a07f6cff2c591b9e089d97af9050b8791dc372f (diff)
am dd4532a0: am b2dae0b5: am 577c7fe0: Go back to the main ui when conference call splits
* commit 'dd4532a0a045ad2815e9afc7687535b2caec0d8d': Go back to the main ui when conference call splits
-rw-r--r--InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
index d0f62d78b..1ba88cbd7 100644
--- a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
+++ b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
@@ -64,6 +64,8 @@ public class ConferenceManagerPresenter
Log.v(this, "Number of existing calls is " +
String.valueOf(call.getChildCallIds().size()));
update(callList);
+ } else {
+ getUi().setVisible(false);
}
} else {
getUi().setVisible(false);