commit 8a76b6b8715188f00fff4c0e52d579f10cc53de3
author Andrew Lee <anwlee@google.com> Thu Aug 28 12:22:51 2014 -0700
committer Andrew Lee <anwlee@google.com> Thu Aug 28 12:24:55 2014 -0700
tree 715e5fe685416a9f1d0d566cda04419b4283b22b
parent 297d540b8f2294245f4ecc69a9c2dc9a02b689ea

Update GsmConference state to the same as its child calls.

Bug: 17304107
Change-Id: I02b7dfb58084416152bd71810c7fe1527c3e04ab

src/com/android/services/telephony/GsmConferenceController.java

diff --git a/src/com/android/services/telephony/GsmConferenceController.java b/src/com/android/services/telephony/GsmConferenceController.java
index 8cdc9e9..894e5bb 100644
--- a/src/com/android/services/telephony/GsmConferenceController.java
+++ b/src/com/android/services/telephony/GsmConferenceController.java
@@ -176,6 +176,17 @@
                 }
                 mConnectionService.addConference(mGsmConference);
             }
+
+            // Set the conference state to the same state as its child connections.
+            Connection conferencedConnection = mGsmConference.getConnections().get(0);
+            switch (conferencedConnection.getState()) {
+                case Connection.STATE_ACTIVE:
+                    mGsmConference.setActive();
+                    break;
+                case Connection.STATE_HOLDING:
+                    mGsmConference.setOnHold();
+                    break;
+            }
         }
     }
 }