summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-06-01 14:29:11 -0700
committerTyler Gunn <tgunn@google.com>2015-06-01 14:53:55 -0700
commitd46595a673eba0df624d9d92b6f981e3483e0d20 (patch)
tree3c22af28c09cb1a7b42f8dc150c5944077eda26b /telecomm
parentbdd500ecd4ceea7d4e4a06ece08c9b9fd5d8aec5 (diff)
downloadframeworks_base-d46595a673eba0df624d9d92b6f981e3483e0d20.zip
frameworks_base-d46595a673eba0df624d9d92b6f981e3483e0d20.tar.gz
frameworks_base-d46595a673eba0df624d9d92b6f981e3483e0d20.tar.bz2
IMS: Conference fixes
- Set phoneaccount to Conference - Handle conference call in DIALING state Change-Id: I549bf664724473f0d5d4450cbc8d96f7b534f43a Bug: 21376607
Diffstat (limited to 'telecomm')
-rw-r--r--telecomm/java/android/telecom/Conference.java7
1 files changed, 7 insertions, 0 deletions
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() {