summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android/telecom/Conference.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix for call timer resetting when starting IMS conference call. 1/4Tyler Gunn2015-01-121-0/+27
| | | | | | | | - Added support in Conference for specifying the connect time when the conference is created. Bug: 18959443 Change-Id: I501edde3b62f6bf021eb7455089e80626013da12
* IMS: Set phone account in IMS Conference objectAnju Mathapati2014-12-171-1/+1
| | | | | | | | Get phone account from conference host connection and set it to ImsConference while constructing Bug: 18690773 Change-Id: I018a84512eb6ce001a8021d148895bf87dddc2ef
* Telecom API updates (1/6)Ihab Awad2014-11-281-14/+70
| | | | | | Bug: 18292176 Change-Id: I060366234a5a60510c385dc837f2b7e79596eaf5
* Change Connections to allow setting conferenceable with conferences.Tyler Gunn2014-11-171-1/+1
| | | | | | | | | | | - Added IConferenceable interface used so that connections and conferences can both be considered candidates as "conferenceable" with a connection. - Fixed ConnectionService#conference to support cases where either call 1 or call 2 is a conference and the other is a connection. Previously did not support cases where call 2 is a conference. Bug: 18200934 Change-Id: I32a8dd30a154d6280f2ae89fd147817235998465
* Apply @hide / @SystemApi to android.telecom.*Evan Charlton2014-11-101-0/+4
| | | | | | | | Move the android.telecom.* namespace back to @hide, and also mark it with @SystemApi so that system-privileged apps can use them. Bug: 18302450 Change-Id: I33ae1b9b0dfdb1c5eff51ca3c829196bcfc9411c
* Replace onConferenceChanged with onConnectionAdded.Andrew Lee2014-11-061-0/+8
| | | | | | | | | | | | | | | | This change is motivated by a desire to be able to adjust the phone capabilities of a conference depending on its connections. Turns out Connection is not a good place to do this, because when the conference is set, this code is only fired if the connection service already contains the conference. Conference makes more sense to do this anyways, at the end of the day. + Add onConnectionAdded function to Conference.java. - Remove onConferenceChanged function from Connection.java. Bug: 18241753 Change-Id: Ib9212a8483a7a7b542618697399bbab8b2701b04
* Adding method to get disconnect cause from conferencemike dooley2014-11-041-0/+7
| | | | | Bug: 17842499 Change-Id: Ifb6e61d50d66aa8e8299e7024b2ab6d1d0f9d878
* Creating connections for conference event package participants.Tyler Gunn2014-10-301-0/+13
| | | | | | | | | | | | | - Add "addExistingConnection" method to connection service which provides a way for a connection service to notify telecom of a pre-existing connection (connections are normally created through telecom). - Modify TelephonyConferenceController to retrieve its state from a multiparty connection in the conference (in the case of IMS calls, this would be the ImsCall that manages the conference) instead of just taking the first one. Bug: 18057361 Change-Id: I26993aec54ecb0ce90ae6983fd3eed9d8d0a5773
* resolved conflicts for merge of ead63f02 to lmp-mr1-devIhab Awad2014-10-011-0/+60
|\ | | | | | | Change-Id: I20d5f9d8aae82f0cb6f0ebf2ac1cb0af05eb8c9b
| * Refine implementation of GSM conferences (1/3)Ihab Awad2014-09-301-0/+60
| | | | | | | | | | Bug: 17684223 Change-Id: I05d05b594803ea2c1da4247111b70ad5f870ac46
* | Revert "@hide ConnectionService APIs."Evan Charlton2014-09-241-4/+0
|/ | | | This reverts commit 86935c406e4a8bb0e2ad871b51009f3603df9e87.
* @hide ConnectionService APIs.Tyler Gunn2014-09-231-0/+4
| | | | | Bug: 17569532 Change-Id: I68f7237191bd6d7a1a00ba7bb4fd2f8e3d669e8f
* Merge "Add missing methods to Conference object" into lmp-devYorke Lee2014-09-171-0/+41
|\
| * Add missing methods to Conference objectYorke Lee2014-09-151-0/+41
| | | | | | | | | | | | | | | | Add setAudioState, onPlayDtmf and onStopDtmf to the conference object. This fixes DTMF tones for conference calls. Bug: 17512380 Change-Id: Ice9403d3d750131f077a3ea129b7f67430c68348
* | Add new DisconnectCause class to telecomm.Andrew Lee2014-09-161-12/+8
|/ | | | | | | | | | | | | | | | + Add a hidden "UNKNOWN" default type to ToneGenerator. - Hide the Telephony DisconnectCause from the public API. + Add a Telecomm DisconnectCause. This is parcelable, and contains information (code, user facing message, non-user facing reason, and tone) to help describe the disconnect state and what behaviors an application can implement for the user experience. This reduces the causes for a disconnect to a more generic set. + Lots of work to pipe this through. DisconnectCause replaces the code and message which were formerly passed around. Bug: 17241433 Bug: 17329632 Change-Id: I9d337e478a8784bcc0ade02267c2df52cac9bf17
* Renaming Telecomm to Telecom.Tyler Gunn2014-09-121-0/+275
- Changing package from android.telecomm to android.telecom - Changing package from com.android.telecomm to com.android.server.telecomm. - Renaming TelecommManager to TelecomManager. Bug: 17364651 Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638