summaryrefslogtreecommitdiff
path: root/telecomm/java/android/telecom/Conference.java
Commit message (Collapse)AuthorAgeFilesLines
* Annotation and doc improvement for adhoc conference APIs.Grace Jia2021-01-201-1/+1
| | | | | | | | | | Annotate Conference#onAnswer with @VideoState Mark parameters of adhoc conference APIs with @NonNull. Document the distinction between returning null and returning a failed conference. Bug: 165801368 Test: make Change-Id: Ic0bd1a1e431ca0dec52afc8a28996929684236ba
* Remove @TestApi from @SystemApi symbolsAnton Hansson2020-10-191-6/+0
| | | | | | | | | | | | | | I ran these commands: cd frameworks/base grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \ 's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs' grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \ 's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs' Bug: 171179806 Test: m checkapi Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789 Merged-In: I772790b783b0a8730b8bf680c9e569a886b8d789
* Expose adhoc conference calling API as public.Grace Jia2020-07-271-8/+2
| | | | | | Bug: 159944852 Test: make Change-Id: I2cf39a6fd8a02ca4f2d0c83c484ab12bb13f74c3
* Ensure conference state is posted to Telecom for new conferences.Tyler Gunn2020-05-111-2/+18
| | | | | | | | | | | | | | | | | | | | | There is an edge-case where an IMS conference fails to merge two participants into a conference, AND the conference event package comes in before the ImsCall indicates it is multiparty. In this case, the CEP will have a single participant which means we'll treat the call as a standalone call. ImsConference correctly sets the conference state, but this was previously just passed along the ConnectionService adapter to Telecom. In this case the conference isn't even added to Telecom so the method call in effect does nothing. Changed to cache the conference state and ensure when adding the conference to Telecom that we call the setConferenceState method (yeah, could have put this in the ParcelableConference, but this is an edge case). Test: Wrote unit test to verify property is set. Bug: 134047008 Fixes: 155097934 Merged-In: I203880c593f6bac471a06eb9dcbb529d0bb75ba5 Change-Id: Ib48437abb1295d147e227727ce4ff2996f28b5de
* Merge "Add a new call direction parameter to conferences for multiparty"Brad Ebinger2020-04-231-6/+6
|\
| * Add a new call direction parameter to conferences for multipartyBrad Ebinger2020-04-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | 1) Refactor ParcelableConference - too many optional params 2) Add a new call direction parameter for external multiparty call scenarios, where a conference is assigned a direction. Bug: 153595501 Fixes: 154246448 Test: atest TelecomUnitTests TeleServiceTests Merged-In: Icb576a07b9a7a81e228babfea53474be83da7593 Change-Id: Icb576a07b9a7a81e228babfea53474be83da7593
* | Add new @hide API to pass call direction changes through TelecomBrad Ebinger2020-04-201-0/+30
|/ | | | | | | | Bug: 153277327 Fixes: 154245581 Test: atest TelecomUnitTests Merged-In: Icad12c4144bf185c24ee80bcbdd1aec29550bf4e Change-Id: Icad12c4144bf185c24ee80bcbdd1aec29550bf4e
* Merge "API Review cleanups."Tyler Gunn2020-02-131-12/+76
|\
| * API Review cleanups.Tyler Gunn2020-02-131-12/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New @SystemApis on Conference and PhoneAccount were missing the required permissions annotations. - Rename PROPERTY_ASSISTED_DIALING_USED to PROPERTY_ASSISTED_DIALING - Standardize get/setConnectionStartElapsedRealtimeMillis method naming across Connection and Conference classes. - Clarify Conference#sendConferenceEvent API documentation to match the docs present for similar method in Connection; include some examples of valid event/extras combinations. - Update TelecomManager#getDefaultdialerPackage to use UserHandle instead of userId. - Move Conference#getConnectionStartElapsedRealtimeMillis to public API since the setter is already part of the public API. Test: Run Telecom and Telephony CTS tests. Test: Run Telephony unit tests. Test: Perform manual single-party-conference regression test to confirm that conference behavior does not regress. Bug: 147301297 Bug: 148286830 Bug: 148284863 Bug: 148284843 Bug: 148287068 Bug: 148285484 Bug: 148285560 Change-Id: I1f446d81859fa109d74af3661a42a0bd224de5aa Merged-In: I1f446d81859fa109d74af3661a42a0bd224de5aa
* | Mark adhoc conference call APIs as @hide.Tyler Gunn2020-02-111-2/+3
| | | | | | | | | | | | | | Test: make -j update-api Test: Run unit tests Bug: 62151032 Change-Id: I8fe9c4d2c9a8861deea3a0def82c432762cd1222
* | Ims: Add support to add participants to existing callRavi Paluri2020-02-111-0/+6
| | | | | | | | | | | | | | | | | | Supports initiation of a conference call by directly adding participants to existing call Test: Manual Bug: 62151032 Change-Id: I4e60efafab4761ae65a460fdc6c4cacc3e233220
* | Hide Adhoc conference call API.Tyler Gunn2020-02-101-0/+6
|/ | | | | | | | Marking the adhoc conference call API as @hide. Test: make -j update-api Bug: 148165780 Change-Id: I447ec317c66f0c1b4e7a828635b5dcf8b144e32a
* Ims: Add support for Adhoc Conference callsRavi Paluri2020-01-221-9/+96
| | | | | | | | Add support for Adhoc Conference calls Test: Manual Bug: 62151032 Change-Id: Id50d235595d2133f867848ffdebdfe11e2f1c896
* Moved RilRadioTechnology annotationDaniel Bright2019-12-271-3/+0
| | | | | | | | | Moved annotation from Annotation to ServiceState Bug: 146084549 Test: FrameworkTests, TeleServiceTests Change-Id: I2411052465204d87cb5982102df0fd1af012a97c Merged-In: I2411052465204d87cb5982102df0fd1af012a97c
* telephony annotations part 2Chen Xu2019-11-201-0/+1
| | | | | | | | | | | adding missing annotations Bug: 140908357 Test: Build Merged-In: I6de632ef7ef01a939971b7d1bacb227ec5ff4048 Change-Id: I6de632ef7ef01a939971b7d1bacb227ec5ff4048 (cherry picked from commit f85cf993d38462a45a7c4c4ab623742a13a7c4e8)
* More telephony updates for mainline.Tyler Gunn2019-11-081-104/+43
| | | | | | | | | | | | | | | Add new TelecomManager#getDefaultDialerPackage which is multiuse aware; this is used when showing the voicemail notification. Remove some @hide methods from Conference; push these inline. Move ConferenceParticipantConnection into frameworks/opt/net/ims since it is just an IMS implementation detail. Bug: 141576016 Test: Manual smoke test. Test: Run unit tests. Test: Run CTS tests. Change-Id: I39b6955cb14cc1ca68b05c620c3d09a2cdfe30c9 Merged-In: I39b6955cb14cc1ca68b05c620c3d09a2cdfe30c9
* Enhancements to conference for non-conference host scenarios.Tyler Gunn2019-05-311-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a device A creates a conference call containing device B and C, both B and C can receive IMS signaling to indicate that they are in a conference call. This occurs on most domestic carriers; the Telephony framework uses the "multiparty" indicator on the IMS call to switch the call to a conference call. We made some changes to how conference calls are logged in Q which improves the accuracy of the call durations. We used to log calls as they're merged into a conference. In the case of a participant in a remotely hosted conference call, we'd log the call as soon as they are remotely added to the conference. This is unfortunate as the call durations are grossly under-reported. The conference call logging changes now assume we'll log the conference event package children in the conference instead of the participants which merge into the conference itself. On domestic carriers, since the call on B (or C) becomes a conference, we would then no longer log the call. This is FURTHER complicated because on some carriers, B and C will ALSO receive a conference event package from the network showing all the participants in the conference. So if B hangs up on the conference, they will have entries in their call log for A and C, which is really strange because a call to C was never originated on their device. In Telecom we need to ensure we do not log remotely hosted conference participants, and we need to ensure that we DO log a remotely hosted conference as if its just a single party call. To accomplish this we need: 1. the address and name display information associated with the call from A-B / A-C prior to the call turning into a remotely hosted conference. We need this to log to the call log 2. the remotely hosted conference and participants need to be marked in a manner that Telecom can identify them. Test: Manual test. Test: Add unit test to cover this logging scenario. Bug: 132325382 Change-Id: I65e713f68d1695a48d96dacbf7faa4476cd8d815
* Make connection events work for conferencesHall Liu2019-04-161-0/+11
| | | | | | | | | Pipe through the onConnectionEvent call between the conference host connection and the android.telecom.Conference object. Fixes: 130404376 Test: manual Change-Id: Ifad3e59dc9764aa2efb2b9766271e18853bf1c76
* Expose some APIs as test APIs to facilitate CTSTyler Gunn2019-02-041-0/+2
| | | | | | Test: added new cts tests Bug: 123896388 Change-Id: I742f23be57e731307338591d816f7888e198b333
* Support for treating single party IMS conference as a standalone call.Tyler Gunn2019-01-191-0/+61
| | | | | | | | | Adding @hide APIs which Telephony can use to make a conference call with a single participant look like its a standalone call. Test: Manual testing Bug: 75975913 Change-Id: Id8532234ab295785fc749b120898f43911e12637
* Propagates voice call radio technology to connectionWei Huang2018-09-191-0/+47
| | | | | | | | | | This patch mainly takes below changes: 1) Add new extra to indicates the call network technology. 2) Provides basic function to set/get call radio technology. Bug: 67856372 Test: Manual Change-Id: I1a12382fdb589ce823fe7af025832db4cdc152c2
* Rename Conference#setConnectionElapsedTime to clarity.Tyler Gunn2018-02-121-14/+19
| | | | | | | | | | Change name of conference connection elapsed time method to make it more clear what it is for. Updated documentation of this method and its companion to make it more clear what they are for. Test: Compile - this is a docs and naming change only. Bug: 70639525 Change-Id: I02662cb0331cba0d1fe2d4353438a68f334f9192
* Merge "Track conference start in system elapsed time."Tyler Gunn2017-08-241-1/+36
|\ | | | | | | | | | | am: 3b166fba8a Change-Id: I8b78aaa447adcc1bfce0fec8f50857daa37d0575
| * Track conference start in system elapsed time.Tyler Gunn2017-08-221-1/+36
| | | | | | | | | | | | | | | | | | This is important so that Telecom can track the duration of the call, which is tracked using wall clock time. Test: Manual, unit test Bug: 64068300 Change-Id: If642d282cd8134060acf6ffe8d81215c394d800c
* | Remove Conferenceable update squelchingBrad Ebinger2017-08-011-4/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | In an effort to remove redundant updates to Telecom, conferenceable connection updates for a conference were being removed if the list of connections hasn't changed. For GSM, when a new outgoing call was placed, it was added to the conference controller before being added to the list of connections. The conference controller was updating the conferenceable connections for that conference with a connection that wasn't being tracked yet, so it was not notifying telecom of the connection. It was still added to the list of conferenceable connections in the conference, however, so later conferenceable updates were being disregarded before being sent to Telecom. This change removes conferenceable update squelching so that we always update telecom with the correct conferencable connections for a conference. Bug: 37989809 Test: Manual, Procedure in Bug, unit tests Change-Id: I62960df9db27f0b303431aef99e73ef87498d374
* Add carrier configuration options to allow enforcing max conference size.Tyler Gunn2016-12-071-0/+5
| | | | | | | | | | | | Adding carrier config options to to allow enforcing a maxmimum size for IMS conferences. Also adding small performance enhancement to setConferenceables so that if the list of conferenceable connections does not change it does not send an update to listeners. Test: Manual Bug: 29548224 Change-Id: I109c91c4147814547bb75003d312d81d41a52c13
* API cleanups per API review.Tyler Gunn2016-06-291-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | 1. removing deprecation for setExtras on Connection/Conference as these have legitimate use-cases going forward. 2. Expanded documentation on Call.Callback class to clarify how it is expected to be used. 3. Updated Callback#onConnectionEvent callback docs to clarify its usage. 4. Expanded Call#sendCallEvent docs to clarify expected namespacing of call event keys and extras keys, as well as clarification about backwards compatibility and expectations of ConnectionServices. 5. Standardized the "invoked" vs "notifies" language in the Conference docs. 6. Clarified how Connection callbacks from Telecom should be implemented. 7. Added Bundle parameter expectations for pre-defined connection events. 8. Documented capabilities and properties toString methods. 9. Documented expectations for onCallEvent method. 10. Expanded documentation for sendConnectionEvent method to clarify namespacing, use cases, etc. Bug: 29759275 Bug: 29759954 Bug: 29759773 Change-Id: Ib8c983af4dbbfee68edb60937b268e2c1a9b5e64
* Merge \"Handle Concurrency issues in Connection\" into nyc-devBrad Ebinger2016-06-151-35/+51
|\ | | | | | | | | | | am: df41725e53 Change-Id: I0332df9dc96086a3094dc4ab53573b5cf57f8730
| * Handle Concurrency issues in ConnectionBrad Ebinger2016-06-151-35/+51
| | | | | | | | | | | | | | | | | | | | Currently, there is a possibility of concurrent thread operations to the Extras bundle in Conference/Connection. This can cause unexpected behavior. We have added a lock on the Extras to prevent that from occuring. Bug: 29330310 Change-Id: Id63a9797c2f748120a3df8e3ce06c4ce3891c651
* | Add removeExtras(String...) prototype per API review.Tyler Gunn2016-05-101-2/+12
| | | | | | | | | | | | | | Per API review, adding a convenience prototype of the removeExtras method. Bug: 28295516 Change-Id: Icc0e040516c06205540c5683bde16882a73a89d6
* | Un-@hide multi-endpoint APIs.Tyler Gunn2016-05-061-5/+11
|/ | | | | | Bug: 28621640 This reverts commit 1bf206b766654ea9c4e9bc7a703a9d5f1d30ab72. Change-Id: If8c85e4adeb017eec2b7e8199010deae2a920c6a
* Hide multi-endpoint APIs.Tyler Gunn2016-04-151-11/+5
| | | | | | | | Per feature council decision, the multi-endpoint APIs will be @hide for the N release. Bug: 28196918 Change-Id: Ia80b089bc754ce87ca208382eb79442b5265844d
* Merge "Add missing null checks on Conference and Connection." into nyc-devTyler Gunn2016-03-291-2/+4
|\
| * Add missing null checks on Conference and Connection.Tyler Gunn2016-03-291-2/+4
| | | | | | | | | | | | | | Also add missing bundle passing for Connection Events. Bug: 27850430 Change-Id: I0f79635929cbe5da18b528b6c1119c7ce4d8e32b
* | Add connection properties to Connections.Tyler Gunn2016-03-241-1/+30
|/ | | | | | | | - Per suggestion of API council, moving properties of a Connection from CAPABILITIES_* to PROPERTIES_*. Bug: 27458894 Change-Id: Icce921b03cda514a991646ed39a26559c7e91230
* Expand call/connection extras API.Tyler Gunn2016-03-231-6/+158
| | | | | | | | | | | | | | | | | Currently, connection extras are propagated up to Telecom as an entire bundle. This is not ideal, as any time a change is made to the extras, the bundle needs to be fetched, changed, and then re-set on the connection, where it is parceled to Telecom as a whole. Using how extras on an Intent as inspiration, this CL adds separate putExtras, putExtra, and removeExtra methods to allow manipulation of the extras bundle without operating on it in its entirety. This Cl also adds support for Calls modifying the extras bundle, with changes propagated back down to ConnectionServices. Bug: 27458894 Change-Id: I152340a3bca2dc03f170b06b172a6823410fb961
* IMS Connection Capabilities UpdateOmkar Kolangade2016-01-251-2/+8
| | | | | | | | | IMS connection capabilities were not getting propagated to the upper layers whenever a capability was added or removed. Adding the same. Change-Id: Ic67d76df05c8b2a1b8abaf27f266fe9693764e52
* merge from masterJack Yu2015-12-101-0/+21
| | | | Change-Id: Ic03669db3f4595336a7dbc13ffc77d055d11acf9
* API Cleanup: Remove VideoState class.Tyler Gunn2015-06-031-1/+1
| | | | | | | | | - Remove VideoState class. - Replace references to VideoState constants with VideoProfile equivalent. - Push VideoState static methods into VideoProfile. Bug: 21573551 Change-Id: I1bca02772b5b7d86643f612824b07faef7618725
* IMS: Conference fixesTyler Gunn2015-06-011-0/+7
| | | | | | | | - Set phoneaccount to Conference - Handle conference call in DIALING state Change-Id: I549bf664724473f0d5d4450cbc8d96f7b534f43a Bug: 21376607
* Add extras to Connections/Calls. (1/3)Santos Cordon2015-05-281-0/+25
| | | | | | | | | | | Two major changes: 1) Add the notion of extras to a Connection. These extras will be parceled through to InCallService as Call.getExtras() 2) The previously existing Call.getExtras() has been renamed to getIntentExtras(). This name better describes the fact that these particular extras are from the original CALL or INCOMING_CALL intents. Change-Id: I08c1baf4f08d54757f98012f0c08b423a707c53d
* Make Conferenceable an abstract classYorke Lee2015-05-131-1/+1
| | | | | Bug: 21066017 Change-Id: Ibcbccfc7b1380e417b464aed9b968cbc0a6a1cc2
* Rename AudioState to CallAudioStateYorke Lee2015-05-131-6/+31
| | | | | | | | | | | | | Deprecate AudioState class and make methods @SystemApi where necessary to minimize impact to SystemApi Replace usages of AudioState inside Telecom sub-systems Fire both onCallAudioStateChanged and onAudioStateChanged callbacks for backward compatibility Support both setAudioState and setCallAudioState for all classes Bug: 21040387 Bug: 21088300 Change-Id: I3ec7b3afdaa344c6d639d1c421f1842d67f7d0f7
* More video related API fixesYorke Lee2015-05-121-4/+4
| | | | | | | | | | | | | | | | | android.telecom.Connection.VideoProvider * onSetPauseImage takes Uri instead of String * changeCallDataUsage -> setCallDataUsage * add quality constants to changeVideoQuality() docs android.telecom.InCallService.VideoCall * setPauseImage takes Uri instea dof String android.telecom.VideoProfile.VideoState * Move constants to VideoProfile, prefix with STATE_ Bug: 21040387 Bug: 21066505 Change-Id: I764e72aced9d1e2d30d6d0cf0862100860d47c79
* Fix build break.Santos Cordon2015-05-121-1/+1
| | | | Change-Id: Icca3603d3f4a38146fb9bc04a384a22ece4014f4
* Rename Connection time APIs for Conference.javaSantos Cordon2015-05-121-9/+32
| | | | | Bug: 21072487 Change-Id: I7bed9957770639f2adf3c7bd31a4821c0ff0f0dd
* Un-@hiding some missed VT APIs.Tyler Gunn2015-05-081-4/+0
| | | | | Bug: 20947116 Change-Id: Idda9b7c7debafbea8c42eaadb75c3375b2c8ddb2
* Merge commit '7f61051' into merge2Etan Cohen2015-04-241-0/+21
|\
| * resolve merge conflicts of edc625f to m-wireless-dev.Andrew Lee2015-04-161-0/+21
| |\ | | | | | | | | | Change-Id: Ibbcd764505ccc38f9f61c96993d979a099f1cc6b
| | * Add StatusHints to Conference object.Andrew Lee2015-04-151-0/+21
| | | | | | | | | | | | | | | | | | | | | + Consolidated ParcelableConference constructors; only one is used. Bug: 20181703 Change-Id: Iad49f10404e1c1eedc4ef68525bde0f10a8dfc97
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-13 11:31:36 +0000