summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android/telecom/RemoteConference.java
Commit message (Collapse)AuthorAgeFilesLines
* Telecom API updates (1/6)Ihab Awad2014-11-281-8/+15
| | | | | | Bug: 18292176 Change-Id: I060366234a5a60510c385dc837f2b7e79596eaf5
* Apply @hide / @SystemApi to android.telecom.*Evan Charlton2014-11-101-0/+3
| | | | | | | | 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
* resolved conflicts for merge of ead63f02 to lmp-mr1-devIhab Awad2014-10-011-0/+20
|\ | | | | | | Change-Id: I20d5f9d8aae82f0cb6f0ebf2ac1cb0af05eb8c9b
| * Refine implementation of GSM conferences (1/3)Ihab Awad2014-09-301-0/+20
| | | | | | | | | | Bug: 17684223 Change-Id: I05d05b594803ea2c1da4247111b70ad5f870ac46
* | am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference ↵Sailesh Nepal2014-09-261-0/+14
|\ \ | |/ | | | | | | | | | | calling." into lmp-dev * commit '5926650d6099469981369cf5235da6d2b135ba0d': Adding support for Cdma conference calling.
| * Adding support for Cdma conference calling.mike dooley2014-09-251-0/+14
| | | | | | | | | | | | | | | | Adding methods to merge and swap Cdma conference calls from hangouts. Bug: 17658943 Change-Id: I0ce472415e3455503223fc0dab5e1a8ee415cde9
* | Revert "@hide ConnectionService APIs."Evan Charlton2014-09-241-3/+0
|/ | | | This reverts commit 86935c406e4a8bb0e2ad871b51009f3603df9e87.
* @hide ConnectionService APIs.Tyler Gunn2014-09-231-0/+3
| | | | | Bug: 17569532 Change-Id: I68f7237191bd6d7a1a00ba7bb4fd2f8e3d669e8f
* Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConferenceYorke Lee2014-09-161-0/+21
| | | | | Bug: 17512380 Change-Id: Ie26bef643bdec97f64247b5f8099f2676ae6c63e
* Add new DisconnectCause class to telecomm.Andrew Lee2014-09-161-13/+6
| | | | | | | | | | | | | | | | + 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/+198
- 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