summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--telecomm/java/android/telecom/Conference.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java
index 1f9ceee..f6a6dcc 100644
--- a/telecomm/java/android/telecom/Conference.java
+++ b/telecomm/java/android/telecom/Conference.java
@@ -573,6 +573,7 @@ public abstract class Conference extends Conferenceable {
private void setState(int newState) {
if (newState != Connection.STATE_ACTIVE &&
+ newState != Connection.STATE_DIALING &&
newState != Connection.STATE_HOLDING &&
newState != Connection.STATE_DISCONNECTED) {
Log.w(this, "Unsupported state transition for Conference call.",