commit d46595a673eba0df624d9d92b6f981e3483e0d20
author Tyler Gunn <tgunn@google.com> Mon Jun 01 14:29:11 2015 -0700
committer Tyler Gunn <tgunn@google.com> Mon Jun 01 14:53:55 2015 -0700
tree 3c22af28c09cb1a7b42f8dc150c5944077eda26b
parent bdd500ecd4ceea7d4e4a06ece08c9b9fd5d8aec5

IMS: Conference fixes

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

Change-Id: I549bf664724473f0d5d4450cbc8d96f7b534f43a
Bug: 21376607

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 5a9be90..d2d920d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30080,6 +30080,7 @@
     method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
     method public final void setConnectionCapabilities(int);
     method public final void setConnectionTime(long);
+    method public final void setDialing();
     method public final void setDisconnected(android.telecom.DisconnectCause);
     method public final void setExtras(android.os.Bundle);
     method public final void setOnHold();

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index b4315fe..725f1df 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -32236,6 +32236,7 @@
     method public final deprecated void setConnectTimeMillis(long);
     method public final void setConnectionCapabilities(int);
     method public final void setConnectionTime(long);
+    method public final void setDialing();
     method public final void setDisconnected(android.telecom.DisconnectCause);
     method public final void setExtras(android.os.Bundle);
     method public final void setOnHold();

telecomm/java/android/telecom/Conference.java

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 @@
     }
 
     /**
+     * Sets state to be dialing.
+     */
+    public final void setDialing() {
+        setState(Connection.STATE_DIALING);
+    }
+
+    /**
      * Sets state to be active.
      */
     public final void setActive() {