14 Commits

Author SHA1 Message Date
Tyler Gunn
3b4b1dcb60 Support disconnecting conference participants from conference.
- Added "onDisconnectConferenceParticipant" method used to inform a
connection acting as the conference host that one of the participants
should be disconnected.
- Added "VIRTUAL_CALL" PhoneCapability used to indicate that a call cannot
be the active or background call, but only be a child of another call.

Bug: 18228141
Bug: 18176606
Change-Id: I7aec631cc89c0f08e174b24ce3a9cb547b47e36b
2014-11-04 14:53:37 -08:00
Tyler Gunn
3bffcf78b5 Communicating participant changes to conference controller.
- Add new ConferenceParticipant parcelable class which represents a
single participant contained in the conference event package.
- Adding callbacks/listeners to Connection to handle changes to
participant state.

Bug: 18057361
Change-Id: Iadfebe84959f30f8e835f282aa994c0b92768aa6
2014-10-28 13:51:27 -07:00
Santos Cordon
05f4d8d1d0 am 40f15895: am 028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev
* commit '40f158954491c4d2587e0b2a13cd07195bc27b25':
  Add hidden method to access a connection's service.
2014-10-22 20:47:15 +00:00
Andrew Lee
8f8e473cac Fire onConferenceChanged after reseting conference.
Bug: 17423848
Change-Id: Ic53f40e806f2bfd5b49bff2caad64bb93b290bad
2014-10-21 10:32:49 -07:00
Santos Cordon
af1b296a41 Add hidden method to access a connection's service.
This change exposes a method that is used by the actual
fix here: I4e4789c044d9e3614f42143cfa6053881a6d109b

Bug: 17962996
Change-Id: Iec3795ea372634120c71b0a80ee046e372569ecf
2014-10-20 18:38:55 +00:00
Andrew Lee
4b116453e8 Add functions to update on conference changes.
+ Add onConferenceChanged() to Connection, so that the Connection can
make act on changes to the conference.
+ Add a utility function to PhoneCapabilities to remove a capability
from a PhoneCapabilities bitmask. Figure this abstracts some bit
logic away to make things more readable.

Bug: 17429707
Change-Id: I0c97731a95dd6573488cd10f094a63abe2428bce
2014-10-17 10:38:02 -07:00
Jay Shrauner
2ec53ebbc6 Remove unused onConferenceWith method
Never part of public API

Bug:17860628
Change-Id: Ib7c4f4c402bd29d82cc0b9e1f496496ea86efce1
2014-10-15 11:48:04 -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
mike dooley
f34519b4dd Fix a small printf format bug.
Bug: 17534940
Change-Id: Idc3c1105c72714f138b07012d0ad9e0bf0ba17f1
2014-09-16 18:14:14 -07: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
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