18 Commits

Author SHA1 Message Date
Narayan Kamath
12ca74e2a0 Revert "Remove deprecated Telecom APIs"
This reverts commit a7c9046973260aa71837410ffc8df8c296a2826f.

Change-Id: I66d3d961988ff8dd330c9482c070bfca055f6cb8
2015-01-30 13:07:32 +00:00
Sailesh Nepal
a7c9046973 Remove deprecated Telecom APIs
This APIs are no longer used and are safe to delete.

Bug: 18607657
Change-Id: I94dad196db9f8be544f05b12b7b71de124fc9328
2015-01-30 06:18:48 +00:00
Tyler Gunn
cd5d33c89f Fix for call timer resetting when starting IMS conference call. 1/4
- Added support in Conference for specifying the connect time when the
conference is created.

Bug: 18959443
Change-Id: I501edde3b62f6bf021eb7455089e80626013da12
2015-01-12 09:02:01 -08:00
Anju Mathapati
f9c4d84ea9 IMS: Set phone account in IMS Conference object
Get phone account from conference host connection and set
it to ImsConference while constructing

Bug: 18690773
Change-Id: I018a84512eb6ce001a8021d148895bf87dddc2ef
2014-12-17 13:06:46 -08:00
Ihab Awad
5c9c86ec0f Telecom API updates (1/6)
Bug: 18292176

Change-Id: I060366234a5a60510c385dc837f2b7e79596eaf5
2014-11-28 15:54:35 -08:00
Tyler Gunn
6d76ca0438 Change Connections to allow setting conferenceable with conferences.
- 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
2014-11-17 15:49:51 -08:00
Evan Charlton
0e094d926c Apply @hide / @SystemApi to android.telecom.*
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
2014-11-10 11:52:31 -08:00
Andrew Lee
46f7f5dce4 Replace onConferenceChanged with onConnectionAdded.
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
2014-11-06 17:19:51 -08:00
mike dooley
1cf14ac5dc Adding method to get disconnect cause from conference
Bug: 17842499
Change-Id: Ifb6e61d50d66aa8e8299e7024b2ab6d1d0f9d878
2014-11-04 11:21:21 -08:00
Tyler Gunn
4a57b9b59b Creating connections for conference event package participants.
- 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
2014-10-30 14:27:48 -07:00
Ihab Awad
12a4df2b66 resolved conflicts for merge of ead63f02 to lmp-mr1-dev
Change-Id: I20d5f9d8aae82f0cb6f0ebf2ac1cb0af05eb8c9b
2014-10-01 14:31:01 -07:00
Ihab Awad
50e3506533 Refine implementation of GSM conferences (1/3)
Bug: 17684223
Change-Id: I05d05b594803ea2c1da4247111b70ad5f870ac46
2014-09-30 16:46:39 -07:00
Evan Charlton
8635c578f0 Revert "@hide ConnectionService APIs."
This reverts commit 86935c406e4a8bb0e2ad871b51009f3603df9e87.
2014-09-24 14:06:12 -07:00
Tyler Gunn
711d876fd1 @hide ConnectionService APIs.
Bug: 17569532
Change-Id: I68f7237191bd6d7a1a00ba7bb4fd2f8e3d669e8f
2014-09-23 10:00:38 -07:00
Yorke Lee
1c4eb10cc1 Merge "Add missing methods to Conference object" into lmp-dev 2014-09-17 03:29:12 +00:00
Andrew Lee
7f3d41fd12 Add new DisconnectCause class to telecomm.
+ 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
2014-09-16 12:07:41 -07:00
Yorke Lee
a0d3ca9746 Add missing methods to Conference object
Add setAudioState, onPlayDtmf and onStopDtmf to the conference object.
This fixes DTMF tones for conference calls.

Bug: 17512380
Change-Id: Ice9403d3d750131f077a3ea129b7f67430c68348
2014-09-15 19:18:13 -07:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom.
- 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
2014-09-12 22:16:17 -07:00