History log of /packages/services/Telephony/src/com/android/services/telephony/CdmaConference.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
bf31ee144528524c57e97c4156d8d5acfd10d1b8 17-Mar-2016 Tyler Gunn <tgunn@google.com> Add connection properties to Connections.

- Per suggestion of API council, moving properties of a Connection from
CAPABILITIES_* to PROPERTIES_*.

Bug: 27458894
Change-Id: Id9c040c9baf3fae675c55d221b598cd250bd7b3b
/packages/services/Telephony/src/com/android/services/telephony/CdmaConference.java
9504c6b5c5c7072f72d8a9e6df59dbda8a6ccbe4 04-Jun-2015 Jonathan Basseri <misterikkit@google.com> Renaming carrier config variable keys.

API council advised us to use KEY_NAME_TYPE for our key constants.

Bug: 21571894
Change-Id: Ib5d5aff1c9070d9e5913a4099fcf55c67b800150
/packages/services/Telephony/src/com/android/services/telephony/CdmaConference.java
c31f1f32963534763aaf82ae2544f3a94f13edca 12-May-2015 Jonathan Basseri <misterikkit@google.com> Switching to PersistableBundle in carrier config API.

Part of this API involves persisting config bundles to avoid binding to
apps at critical moments (like boot). Regular bundles should not be
written to disk because they support object types that can lose their
meaning while the data is at rest.

In order to use PersistableBundle, we must either start with one or
filter unwanted types out of Bundle objects. Since the carrier config
API has no use for unsupported types, we chose to use PersistableBundle
everywhere.

Bug: 20268926
Change-Id: Ia85c1b2426907a5e6431095dbd3776213c7eb45d
/packages/services/Telephony/src/com/android/services/telephony/CdmaConference.java
12f7d80f47bdad9ed1c02b8b916f75e4f11fe873 01-May-2015 Junda Liu <junda@google.com> Update PhoneGlobals, PhoneInterfaceManager and CdmaConference to use carrierconfig.

Moved variables:
support_swap_after_merge
ignore_sim_network_locked_events
dtmf_type_enabled
world_phone

Bug: b/20270007
Change-Id: I12619f16b6a085b57edc1248b8445705bf5b11de
/packages/services/Telephony/src/com/android/services/telephony/CdmaConference.java
5a7153d1a276335ffa78850de5df4a1547568aac 15-Apr-2015 Jay Shrauner <shrauner@google.com> Don't use deprecated APIs

Use setConnectionCapabilities() instead of setCapabilities()

Bug:
Change-Id: Iaad45656dd6bad9a305e02d1068f5bb694a56eb5
/packages/services/Telephony/src/com/android/services/telephony/CdmaConference.java
8db1833973f154d0a1e72c78137f0e5030564aae 30-Jan-2015 Narayan Kamath <narayan@google.com> Revert "Telephony: Remove use of deprecated Telecom APIs"

This reverts commit 148ec4bf059de55c1cd38bdd4cdf986984c07101.

Change-Id: I5f78121c003a0244ad41bfe74fd01ea8964ceeee
/packages/services/Telephony/src/com/android/services/telephony/CdmaConference.java
148ec4bf059de55c1cd38bdd4cdf986984c07101 13-Dec-2014 Sailesh Nepal <sail@google.com> Telephony: Remove use of deprecated Telecom APIs

Bug: 18607657
Change-Id: I94dad196db9f8be544f05b12b7b71de124fc9328
/packages/services/Telephony/src/com/android/services/telephony/CdmaConference.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/CdmaConference.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/CdmaConference.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/CdmaConference.java
4a4974e04315e954c03d679027a53d8a3677a95d 21-Oct-2014 a20023 <a20023@motorola.com> Overlay swap capability after merge

Remove swap button after merge in some network

Bug: 17580817

Change-Id: I0bce9f81faccdaff7431a40ccbcf88e2c43a7688
/packages/services/Telephony/src/com/android/services/telephony/CdmaConference.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/CdmaConference.java
293b7bbbc7fb53fe62cd64a40324e11088153398 16-Sep-2014 Yorke Lee <yorkelee@google.com> Implement onPlayDtmfTone and onStopDtmfTone in Conferences

Bug: 17512380
Change-Id: Ide10729b5d2408e922ce8f448cb0be4f385ceddf
/packages/services/Telephony/src/com/android/services/telephony/CdmaConference.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/CdmaConference.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/CdmaConference.java