| 740e31b5407af1879548e952d774d07fdb87f16e |
|
17-Feb-2015 |
mike dooley <mdooley@google.com> |
Fix Cdma conference cleanup bug.
The conference pointer in the CdmaConferenceController wasn't being cleared after the
conference was destroyed. This prevented subsequent conferences from being created
correctly (ie. couldn't merge calls into a new conference).
Bug: 19355781, 18612712
Change-Id: I0612d7e2f89cdb56ed330289d08ee4e7ef007970
/packages/services/Telephony/src/com/android/services/telephony/CdmaConferenceController.java
|
| 3cc8121590b5b05af65a9aeaa8948834e4983adc |
|
12-Nov-2014 |
Ihab Awad <ihab@google.com> |
Telecom API updates (5/6)
Bug: 18292176
Change-Id: I706c5a120e8a136d084d4b7f9f0fbc2653a5b86b
/packages/services/Telephony/src/com/android/services/telephony/CdmaConferenceController.java
|
| dc54843caff3c706461d30b7f8476b2d82d054fa |
|
19-Nov-2014 |
Andrew Lee <anwlee@google.com> |
Set GENERIC_CONFERENCE capability on CDMA conferences.
Use updateCapabilities instead of setCapabilities in the CDMA
conference controller, so that default properties (MUTE/GENERIC)
are always set.
Bug: 18284408
Change-Id: I8333c033b2e2cd634f530bebf91d3266f9238bb2
/packages/services/Telephony/src/com/android/services/telephony/CdmaConferenceController.java
|
| 0354bb00a40fd946bbd9761fd20ec772a6d5eaa1 |
|
11-Nov-2014 |
Andrew Lee <anwlee@google.com> |
Update CDMA conference capabilities on recalculate.
Before merge/swap was set when the conference was initially created,
but not updated afterwards. This meant that if a conference later
received an incoming call, it would not be updated to show SWAP.
Bug: 18321767
Change-Id: I907c3bbb38c7cfe26aaa7d881a72110a3d2d29eb
/packages/services/Telephony/src/com/android/services/telephony/CdmaConferenceController.java
|
| df4fceef2f1cdbe1a8d6494abc7e57ea6602fd2d |
|
23-Oct-2014 |
Yorke Lee <yorkelee@google.com> |
Add connection before resetting state of sibling connections
This allows the CDMA conference to be created before any state changes in
sibling connections occur, allowing listeners to know that they are in a
conference and respond appropriately.
Bug: 18053043
Change-Id: I21322769656aca9e109088d7f186a5a0a75136c3
/packages/services/Telephony/src/com/android/services/telephony/CdmaConferenceController.java
|
| d9d19ecdfb9018eef212b82320a25216543438de |
|
01-Oct-2014 |
Santos Cordon <santoscordon@google.com> |
Set CDMA calls as on-hold if there is a dialing CDMA call.
Bug:17699262
Change-Id: I251e59b1f15b5e2d9a6b2929ec1fcaba3d9f4101
/packages/services/Telephony/src/com/android/services/telephony/CdmaConferenceController.java
|
| 154063ca9072731712af0e9d5200939e56ff37a7 |
|
23-Sep-2014 |
Nancy Chen <nancychen@google.com> |
Enable swap when receiving (incoming) second CDMA call.
Merge should only be available when the second active call on a CDMA
phone is a result of an outgoing call. Incoming calls should only enable
swap.
Bug: 17581658
Change-Id: I7c49d201a441538106364cd357e69b66af823ca2
/packages/services/Telephony/src/com/android/services/telephony/CdmaConferenceController.java
|
| aef7a4bc4f85149de427d7506ebe97753b2ca6c2 |
|
12-Sep-2014 |
Andrew Lee <anwlee@google.com> |
Use newly added Telecomm DisconnectCase.
+ Add utility, DisconnectCauseUtil, to convert from telephony
DisconnectCauses to telecomm DisconnectCauses. For this, map
from specific disconnect causes into a more generic set which
the UI is concerned about. Provide user-localized strings or
tones for certain cases.
- The string conversion sucks a little because it covers both
strings which are intended to be show in the InCallUi (short)
and messages which are to be displayed to the user in a dialog
when there is some termination (long). =(
+ Where possibly, use this utility for converting error
messages as well.
- Not able to convert with message and tone for many of the
failure cases, because no context exists for obtaining the
message to display.
Bug: 17329632
Change-Id: I84ee358cc8e014f110bab4c0ae7c1cb02aeebdf6
/packages/services/Telephony/src/com/android/services/telephony/CdmaConferenceController.java
|
| 4d45d1cf58a2003378fd35912d6d73a00001bf06 |
|
13-Sep-2014 |
Tyler Gunn <tgunn@google.com> |
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: Ic33bafd37200e65431543a9889aed549dbb04831
/packages/services/Telephony/src/com/android/services/telephony/CdmaConferenceController.java
|
| a956f73382c3aa2619c73b880a11ee1899c2fe18 |
|
04-Sep-2014 |
Santos Cordon <santoscordon@google.com> |
Add support for Multiple calls on CDMA devices.
Includes changes for call-waiting, adding outgoing calls, mergig and
conferenceing.
Bug: 17316859
Change-Id: Ia71c1b9b61d93a40cd717e74b33786ae07b656b6
/packages/services/Telephony/src/com/android/services/telephony/CdmaConferenceController.java
|