diff options
| author | Anju Mathapati <anjucm@codeaurora.org> | 2015-09-22 22:34:04 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:28:56 -0600 |
| commit | 3614116d468d077641b0374997c45978d3c738a9 (patch) | |
| tree | 049f70a66b8875fcfcfec894239a7343daad213c /telecomm | |
| parent | aa93b84cd3bea6df3f3a142e168ea922059e06d3 (diff) | |
| download | frameworks_base-3614116d468d077641b0374997c45978d3c738a9.zip frameworks_base-3614116d468d077641b0374997c45978d3c738a9.tar.gz frameworks_base-3614116d468d077641b0374997c45978d3c738a9.tar.bz2 | |
Ims: Handle conference call in DIALING state
Handle conference call in DIALING state that is
originated by conference uri dialer
Change-Id: I6ac0c8fa160e9b4792fbf7f382bf4ab603370552
CRs-Fixed: 910274
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecom/Conference.java | 1 |
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.", |