commit 416f6978b449a3cbd695e99ccc31e1953c5e4253
author The Android Automerger <android-build@google.com> Wed Oct 02 06:01:34 2013 -0700
committer The Android Automerger <android-build@google.com> Wed Oct 02 06:01:34 2013 -0700
tree 5345a9e90d58c35a560042a123852c564fec9759
parent 9e21a8b3dd1eab756c3cde836c39d7a408467e5a
parent ab8be33f9292f085aa51c851ca9056e97a520619

merge in klp-release history after reset to klp-dev

InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java

diff --git a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
index d0f62d7..1ba88cb 100644
--- a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
+++ b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
@@ -64,6 +64,8 @@
                     Log.v(this, "Number of existing calls is " +
                             String.valueOf(call.getChildCallIds().size()));
                     update(callList);
+                } else {
+                    getUi().setVisible(false);
                 }
             } else {
                 getUi().setVisible(false);