From d46595a673eba0df624d9d92b6f981e3483e0d20 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Mon, 1 Jun 2015 14:29:11 -0700
Subject: IMS: Conference fixes

- Set phoneaccount to Conference
- Handle conference call in DIALING state

Change-Id: I549bf664724473f0d5d4450cbc8d96f7b534f43a
Bug: 21376607
---
 telecomm/java/android/telecom/Conference.java | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'telecomm')

diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java
index 9db0b92..b18feb5 100644
--- a/telecomm/java/android/telecom/Conference.java
+++ b/telecomm/java/android/telecom/Conference.java
@@ -295,6 +295,13 @@ public abstract class Conference extends Conferenceable {
     }
 
     /**
+     * Sets state to be dialing.
+     */
+    public final void setDialing() {
+        setState(Connection.STATE_DIALING);
+    }
+
+    /**
      * Sets state to be active.
      */
     public final void setActive() {
-- 
cgit v1.1