summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android/telecom/Conference.java
Commit message (Expand)AuthorAgeFilesLines
* Proper supplementary service notification handling (1/5).Danny Baumann2015-12-151-1/+32
* Ims: Handle conference call in DIALING stateAnju Mathapati2015-10-061-0/+1
* IMS: Conference URI support.Suchand Ghosh2015-10-061-0/+8
* IMS Connection Capabilities UpdateOmkar Kolangade2015-10-061-2/+8
* API Cleanup: Remove VideoState class.Tyler Gunn2015-06-031-1/+1
* IMS: Conference fixesTyler Gunn2015-06-011-0/+7
* Add extras to Connections/Calls. (1/3)Santos Cordon2015-05-281-0/+25
* Make Conferenceable an abstract classYorke Lee2015-05-131-1/+1
* Rename AudioState to CallAudioStateYorke Lee2015-05-131-6/+31
* More video related API fixesYorke Lee2015-05-121-4/+4
* Fix build break.Santos Cordon2015-05-121-1/+1
* Rename Connection time APIs for Conference.javaSantos Cordon2015-05-121-9/+32
* Un-@hiding some missed VT APIs.Tyler Gunn2015-05-081-4/+0
* Merge commit '7f61051' into merge2Etan Cohen2015-04-241-0/+21
|\
| * resolve merge conflicts of edc625f to m-wireless-dev.Andrew Lee2015-04-161-0/+21
| |\
| | * Add StatusHints to Conference object.Andrew Lee2015-04-151-0/+21
| * | DO NOT MERGE Make Telecom/InCallUI APIs publicJay Shrauner2015-04-151-4/+1
| * | DO NOT MERGE Remove deprecated telecom APIs. Mark others final.Jay Shrauner2015-04-151-12/+2
* | | API Cleanup - rename IConferenceable to Conferenceable.Tyler Gunn2015-04-201-1/+1
* | | Make Telecom/InCallUI APIs publicJay Shrauner2015-04-151-4/+1
* | | Remove deprecated telecom APIs. Mark others final.Jay Shrauner2015-04-141-12/+2
|/ /
* | IMS-VT: Upgrade/Downgrade changeRekha Kumar2015-04-011-0/+64
|/
* Fix for call timer resetting when starting IMS conference call. 1/4Tyler Gunn2015-01-121-0/+27
* IMS: Set phone account in IMS Conference objectAnju Mathapati2014-12-171-1/+1
* Telecom API updates (1/6)Ihab Awad2014-11-281-14/+70
* Change Connections to allow setting conferenceable with conferences.Tyler Gunn2014-11-171-1/+1
* Apply @hide / @SystemApi to android.telecom.*Evan Charlton2014-11-101-0/+4
* Replace onConferenceChanged with onConnectionAdded.Andrew Lee2014-11-061-0/+8
* Adding method to get disconnect cause from conferencemike dooley2014-11-041-0/+7
* Creating connections for conference event package participants.Tyler Gunn2014-10-301-0/+13
* resolved conflicts for merge of ead63f02 to lmp-mr1-devIhab Awad2014-10-011-0/+60
|\
| * Refine implementation of GSM conferences (1/3)Ihab Awad2014-09-301-0/+60
* | Revert "@hide ConnectionService APIs."Evan Charlton2014-09-241-4/+0
|/
* @hide ConnectionService APIs.Tyler Gunn2014-09-231-0/+4
* 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 new DisconnectCause class to telecomm.Andrew Lee2014-09-161-12/+8
|/
* Renaming Telecomm to Telecom.Tyler Gunn2014-09-121-0/+275