summaryrefslogtreecommitdiffstats
path: root/telecomm
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of d0694da4 to mnc-dr-devTyler Gunn2015-07-312-8/+28
|\ | | | | | | Change-Id: Ifd2636d0e1b7eae15d412cfa0a948a572c905b3a
| * Add telecom extra keys required for DMR release.Tyler Gunn2015-07-302-0/+30
| | | | | | | | | | Bug: 22848290 Change-Id: I3328234e3f07d83d0dbe5b61b959344b6cc5cc3f
* | am 6b96de8d: Merge "Default permissions for sim call manager" into mnc-devSailesh Nepal2015-07-292-0/+25
|\ \ | |/ | | | | | | * commit '6b96de8dae8be99f75c86c795672905e10fca153': Default permissions for sim call manager
| * Default permissions for sim call managerSailesh Nepal2015-07-282-0/+25
| | | | | | | | | | | | | | | | | | | | This CL adds the following permissions by default to the SIM call manager: - microphone - phone BUG: 22790160 Change-Id: Icaf1db6c6943b3ddbd16a946a81d1bfb734d761f
* | am bdbec480: Merge "Add "Call subject" capability to phone accounts." into ↵Tyler Gunn2015-07-281-0/+9
|\ \ | |/ | | | | | | | | | | mnc-dev * commit 'bdbec480e8598bd959a2fc047cfad8b72c8a645b': Add "Call subject" capability to phone accounts.
| * Add "Call subject" capability to phone accounts.Tyler Gunn2015-07-271-0/+9
| | | | | | | | | | | | | | | | | | Indicates whether the phone account supports displaying a subject line for incoming calls and sending a subject line for outgoing calls. Supports the IMS Instant Lettering feature. Bug: 22769741 Change-Id: I6d803dc288bfd6d4e356310a8d10d5468c5d4186
* | Add child_address call extra.Tyler Gunn2015-07-241-1/+10
| | | | | | | | | | | | | | Used to pass the child number up from IMS to InCall via extras. Bug: 22685113 Change-Id: I8990e4e74be5052f5ff840f8277abd2df1cb4c9d
* | am 660322d8: Merge "Add transcription field to voicemail object and related ↵Nancy Chen2015-07-171-2/+19
|\ \ | |/ | | | | | | | | | | changes." into mnc-dev * commit '660322d8259cb256745f15219af0b9004063ea8d': Add transcription field to voicemail object and related changes.
| * Merge "Add transcription field to voicemail object and related changes." ↵Nancy Chen2015-07-171-2/+19
| |\ | | | | | | | | | into mnc-dev
| | * Add transcription field to voicemail object and related changes.Nancy Chen2015-07-161-2/+19
| | | | | | | | | | | | | | | Bug: 22542002 Change-Id: I05c18e8f82a4f318fb59228e4d6eb844d64bee30
* | | am 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-devRoshan Pius2015-07-163-0/+38
|\ \ \ | |/ / | | | | | | | | | * commit '5aff3b5489262ccff4b6f9e18e0d990ebfe4d7bc': Maintain call time across SRVCC (2/3).
| * | Maintain call time across SRVCC (2/3).Roshan Pius2015-07-153-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an IMS conference call encounters an SRVCC event requiring a fallback to GSM/CDMA, we need to maintain the call time for the conference host across this fallback. So, adding a connectTime attribute in the underlying conference host's connection object which can be used to account for the call time from the now inactive conference call into the new call created. BUG: 21918593 Change-Id: I13e7ae6e31f004e798776c02ac7a6ac09a10f0bd
* | | am b63b031c: Merge "Standardize stateToString return values" into mnc-devYorke Lee2015-07-141-6/+6
|\ \ \ | |/ / | | | | | | | | | * commit 'b63b031cb5b9338daa3de76ee9976ba493037d92': Standardize stateToString return values
| * | Merge "Standardize stateToString return values" into mnc-devYorke Lee2015-07-141-6/+6
| |\ \ | | |/ | |/|
| | * Standardize stateToString return valuesYorke Lee2015-07-141-6/+6
| | | | | | | | | | | | | | | Bug: 20303674 Change-Id: I884029614c8ce36120c1fc039ef33c0e6736ed5c
* | | am 1cb0de17: Merge "Correct the comparison done in removeAdapter." into mnc-devRoshan Pius2015-07-101-2/+13
|\ \ \ | |/ / | | | | | | | | | * commit '1cb0de17a9a4de137247f7bf69ec44a83e30efa2': Correct the comparison done in removeAdapter.
| * | Correct the comparison done in removeAdapter.Roshan Pius2015-07-081-2/+13
| |/ | | | | | | | | | | | | | | | | | | Since addAdapter is storing the proxy binder objects in the adapter set, we need to compare the underlying binder objects when trying to remove the adapter from the adapter set. This was resulting in adapters accumulating in adapter set every time a RemoteService was created. BUG: 22062692 Change-Id: Ib9cc25a8b95622a524ed5a07d3ef56673669cd27
* | am 8f596907: Merge "Change sequence of call removal from Phone\'s db." into ↵Roshan Pius2015-07-081-7/+36
|\ \ | |/ | | | | | | | | | | mnc-dev * commit '8f596907a5241badad821a6d3490eb2cd7dd23c5': Change sequence of call removal from Phone's db.
| * Change sequence of call removal from Phone's db.Roshan Pius2015-07-081-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the Call API's callbacks are now fired from handlers, they end up changing the order in which the callbacks from the Phone and Call API's are fired. To preserve the below ordering, we move the call removal from Phone's db to after all the onCallDestoryedcallbacks have executed. 1. Call->onStateChanged 2. Call->onDetailsChanged 3. Call->onCallDestroyed 4. Phone->onCallRemoved BUG: 22127504 Change-Id: Ice17f727decb516baabbe69adae598ebdf370094
* | Added support for mid-call enabled SRVCC conference callShriram Ganesh2015-07-061-0/+13
| | | | | | | | | | | | | | | | | | | | When TelephonyConnection is created for an unknown connection, the recalculation of conference participants have to be retriggered. This is because, unless that TelephonyConnection is added to ConnectionService, it cannot be added as part of a conference call in CallsManager. Change-Id: Ic9359104f02eddff655d84fd25f5c28c9158e5f4
* | MWI,phantom call,Suppl services, error codesShriram Ganesh2015-07-063-2/+17
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. IMS MWI Feature - Add new API to update waiting voice message count, for UI propagation based on RFC 3842 2. phantom call support Supplementary services 3. IMS : Incoming Call Barring - Modified existing API to support request like registration,activation, deactivation,erasure,interogation. 4.Unsol supplementary service notification - send unsol supplementary notification to UI - add call history info Miscellaneous 5. Ims: Originate conference call in DIALING state 6. IMS: Addition of Extras to ImsCallProfile - Add EXTRA string definitions to ImsCallProfile 7. IMS: Definition of error code - answered elsewhere - FDN call failure 8. - Propagate IMS supplementary services to telephony framework - Introduce call forwarding history info. Bug: 21725750 Squash of 2 earlier CLs: Change-Id: I52a64e9a5df3479189f62921a01655a50fb386fc Change-Id: Idc3a433785e84a3d683cbcfc7fb90f0b89dced12 Change-Id: I428ce3c6a043e43b86dea41622e0a828d8b45e53
* Merge "Add capability to indicate a conference will never have children." ↵Anthony Lee2015-07-021-2/+26
|\ | | | | | | into mnc-dev
| * Add capability to indicate a conference will never have children.Tyler Gunn2015-06-291-2/+26
| | | | | | | | | | | | | | | | Used to mark IMS conference calls so that it is possible to know that we never expect child calls to be associated with the conference. Bug: 21085329 Change-Id: I7e5c82622ed382e431d4156878c28b37421e1e35
* | Telecom API council changes.Santos Cordon2015-06-297-18/+127
|/ | | | | | | | | - adding more javadocs. - fixing javadoc on isEnabled - renaming to CONFIGURE_PHONE_ACCOUNT Bug: 21573551 Change-Id: Ice035b8573a08ea18181a73c9e9a462520a934f1
* Merge "InCallService meta-data [2/4]" into mnc-devSantos Cordon2015-06-242-1/+26
|\
| * InCallService meta-data [2/4]Santos Cordon2015-06-232-1/+26
| | | | | | | | | | | | Bug: 21816241 Change-Id: I9af91a1287f652247ef590878759aa277bd925e5
* | Merge "Additional javadoc." into mnc-devSantos Cordon2015-06-241-1/+9
|\ \ | |/
| * Additional javadoc.Santos Cordon2015-06-221-1/+9
| | | | | | | | Change-Id: Iba7f9315521314d066a166ba884ac71c3a9c2496
* | Fix crash when doing conferencing over Wi-FiSailesh Nepal2015-06-211-0/+3
|/ | | | | | | | | | The problem was that we were calling Connection.getAudioState in the conferencing code. This led to a null pointer exception. Fix was to add a null pointer check. BUG: 21957102 Change-Id: Ibad0f6cc70a5bc4a30023beb857125802bc35cd4
* Clean up SIM CallManager APIs.Santos Cordon2015-06-182-43/+0
| | | | | Bug: 21499476 Change-Id: Iaded74c6b885b0745dfa85d0b7733bdad75d615a
* Send broadcast when default dialer changesYorke Lee2015-06-151-0/+35
| | | | | | | | Add hidden TelecomManager.setDefaultDialer for system apps to set the default dialer and trigger the broadcast Bug: 21846308 Change-Id: Ifdd30cd1323ab0157edf7fd966173b6c52df6ba0
* Merge "Correct issues with VideoProvider discovered via CTS tests." into mnc-devTyler Gunn2015-06-121-24/+40
|\
| * Correct issues with VideoProvider discovered via CTS tests.Tyler Gunn2015-06-121-24/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While authoring the CTS tests I discovered a few issues with the VideoProvider. 1. The VideoProvider's default handler should be on the main Looper, similar to other Telecom components. 2. When calling IVideoCallbacks, the try/catch for RemoteExceptions was around the for-loop which iterates over the various VideoCallbacks. If one was to fail, the other VideoCallbacks would not be called. 3. The mVideoCallbacks hashmap should use a ConcurrentHashMap; in CTS tests I ran into a few concurrency exceptions related to the various InCallServices registering callbacks while other methods on the provider were being called. Bug: 21802841 Change-Id: Ib0d46daf03554309044e9efaa991a15cb2c4b46b
* | Fix typo in Call.Details.propertiesToStringYorke Lee2015-06-121-1/+1
|/ | | | Change-Id: I7bb52138912fddef20862f5f7a29a8ec2e0a1d66
* Add support for specifying looper on VideoProviders.Tyler Gunn2015-06-101-2/+22
| | | | | | | | | Added constructor for VideoProviders to allow creating instances where the Looper is specified. This is required for creating VideoProviderProxy instances within Telecom. Bug: 20232310 Change-Id: Ieb31e499caca9d65ff4b52c287e030c0ceeeb6ee
* Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-devTyler Gunn2015-06-091-1/+26
|\
| * Remove use of STATE_AUDIO_ONLY in a comparison.Tyler Gunn2015-06-091-1/+26
| | | | | | | | | | | | | | | | - Cleanup javadoc to make it more explicit how to use STATE_AUDIO_ONLY. - Use VideoProfile.isAudioOnly() instead of doing == comparison. Bug: 21645094 Change-Id: I5a67290a996f8f338aebab72a4d3cb57f1b1993b
* | Merge "Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS" into mnc-devYorke Lee2015-06-091-2/+2
|\ \
| * | Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESSYorke Lee2015-06-091-2/+2
| | | | | | | | | | | | | | | Bug: 19696065 Change-Id: Ibe253c8cd66938ea1cd560d443008026eb1005d9
* | | Merge "Add API docs for RemoteConnection VideoProvider/Callback." into mnc-devTyler Gunn2015-06-093-5/+170
|\ \ \ | |/ / |/| |
| * | Add API docs for RemoteConnection VideoProvider/Callback.Tyler Gunn2015-06-043-5/+170
| | | | | | | | | | | | | | | Bug: 21573551 Change-Id: I434d83fa84f9515634776820b2e6a8004cf693ee
* | | Add telecom extra to specify handle for incoming callYorke Lee2015-06-051-0/+7
| |/ |/| | | | | | | Bug: 19696065 Change-Id: Ie7c9e3f982808abd4944cfa7bd3c754b93479f84
* | Merge "API Cleanup: Remove VideoState class." into mnc-devTyler Gunn2015-06-036-133/+97
|\ \
| * | API Cleanup: Remove VideoState class.Tyler Gunn2015-06-036-133/+97
| |/ | | | | | | | | | | | | | | | | - Remove VideoState class. - Replace references to VideoState constants with VideoProfile equivalent. - Push VideoState static methods into VideoProfile. Bug: 21573551 Change-Id: I1bca02772b5b7d86643f612824b07faef7618725
* | Merge "Allow default dialer changes and phone account enable/disable via ↵Yorke Lee2015-06-033-51/+19
|\ \ | |/ |/| | | ADB" into mnc-dev
| * Allow default dialer changes and phone account enable/disable via ADBYorke Lee2015-06-023-51/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add commands accessible via adb shell that can be used for CTS tests without the need for adb root *set-phone-account-enabled *set-phone-account-disabled *set-default-dialer *get-default-dialer Modify enablePhoneAccount/setDefaultDialer to indicate success. Remove now unused functionality in ProtectedEnableAccountPreferenceActivity and ProtectedChangeDefaultDialerActivity. Bug: 21583012 Change-Id: I542d145cc969334c004b8344fbbb01f278256f9d
* | Fix ringback return value.Santos Cordon2015-06-021-1/+1
| | | | | | | | | | Bug: 21474410 Change-Id: I6e08e89636c3b42c97fc194a314a325245755d09
* | Merge "Cleanup Video API javadoc." into mnc-devTyler Gunn2015-06-012-118/+313
|\ \
| * | Cleanup Video API javadoc.Tyler Gunn2015-05-292-118/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Cleaned up documentation and added more details where possible. - Also added cross references from the VideoProvider and VideoCall APIs to make it more clear what the link is between the two. Bug: 21520606 Change-Id: I0a79450d69841df5850061311a523b37688efc49
* | | IMS: Conference fixesTyler Gunn2015-06-011-0/+7
| |/ |/| | | | | | | | | | | | | - Set phoneaccount to Conference - Handle conference call in DIALING state Change-Id: I549bf664724473f0d5d4450cbc8d96f7b534f43a Bug: 21376607