summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Collapse)AuthorAgeFilesLines
* Merge changes from topic 'mwd-merge-042415'Etan Cohen2015-04-251-0/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Rename removeVideoCallListener to unregisterCallback Bluetooth document fix: remove reference from open API to hidden entities Fix build due to merge of 7595842 and renaming due to 8eb87f0 Merge commit '052a0da' into merge2 Merge commit 'db1dbb8' into merge2 Merge commit '7e5e791' into merge2 Merge commit '170102d' into merge2 Merge commit '4cb5d80' into merge2 Merge commit '83cda00' into merge2 Merge commit 'c91bc62' into merge2 Merge commit 'cffc360' into merge2 Merge commit '7f61051' into merge2 Merge commit '167c3a7' into merge2 Merge commit '4467b98' into merge2 Merge commit '25a217c' into merge2 Merge commit '04b18ec' into merge2 Merge commit '7595842' into merge2 Merge commit '2bbd2b6' into merge2 Merge commit '4890351' into merge2 Merge commit 'cd405fe' into merge2 Merge commit '6ddbb5e' into merge2 Merge commit 'de93575' into merge2 Merge commit '9561e74' into merge2
| * Merge commit '9561e74' into merge2Etan Cohen2015-04-241-0/+8
| |\
| | * Prevent merging conference calls hosted on peer device.Tyler Gunn2015-04-141-0/+8
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | automerge: 6b91ebf * commit '6b91ebf58c928987ead635bb1c49a16965d4c835': Prevent merging conference calls hosted on peer device.
| | | * Prevent merging conference calls hosted on peer device.Tyler Gunn2015-04-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With IMS, the "multiparty" bit on an ImsCall is set to "true" when a call is merged into a conference. This not only occurs on the device hosting the conference call, but also on the devices of the callers merged into the conference. This CL adds a listener to the ImsCallSessionListener which is used to communicate a change in the multiparty state of an ImsCallSession to the ImsCall. This solves a problem where the RIL knows of the change, but since there is no callback, the change is not noticed by Telephony until another call state change occurrs (e.g. holding the call). Bug: 19478784 Change-Id: I4847ab3b63f6a00a91d1324196f181467d1753a4
* | | | Never return a reference to sDefaults.Jonathan Basseri2015-04-231-2/+2
|/ / / | | | | | | | | | | | | | | | | | | Final static fields in Java are still mutable, so CarrierConfigManager should not give callers the opportunity to mutate them. Change-Id: I413597fc5f59c249997967bb0aad2d09b54fa613
* | | Merge "Adding carrier variables to control certain network settings."Jonathan Basseri2015-04-231-0/+6
|\ \ \
| * | | Adding carrier variables to control certain network settings.Jonathan Basseri2015-04-231-0/+6
| | | | | | | | | | | | | | | | | | | | Bug: 20270007 Change-Id: I4075c159e4fceb2e8a5bdda1261f8b2470455595
* | | | Make sure to return network type after conversionSooraj Sasindran2015-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After converting raf to type, make sure to return network type Change-Id: I7fd338717be98a055cbaed66d1b15417da27a3d8
* | | | Radio Access Family related fixesAbhishek Adappa2015-04-231-7/+72
|/ / / | | | | | | | | | | | | | | | | | | | | | 1. Include EHRPD in the EVDO group 2. Fix mapping of CDMA network type to include EVDO 3. Add utility to get the network type from the Raf Change-Id: I35023083be4c681809c003c7ed6a31c698ea4647
* | | Merge "Unhide SignalStrength#getLevel()"Todd Kennedy2015-04-221-2/+0
|\ \ \
| * | | Unhide SignalStrength#getLevel()Todd Kennedy2015-04-211-2/+0
| | | | | | | | | | | | | | | | | | | | Bug: 20410696 Change-Id: I9f7f8c2949a9fdf5f84c4b567898c240034f5e85
* | | | Merge "Add OP_READ_PHONE_STATE app op continued - framework"Svet Ganov2015-04-212-29/+45
|\ \ \ \
| * | | | Add OP_READ_PHONE_STATE app op continued - frameworkSvet Ganov2015-04-182-29/+45
| | | | | | | | | | | | | | | | | | | | Change-Id: If1c2783ad9ea2aa773e5416e09a3cfd1817ef73f
* | | | | Merge "Add multi-sim support for getCarrierPackageNamesForIntent."Jonathan Basseri2015-04-202-7/+14
|\ \ \ \ \
| * | | | | Add multi-sim support for getCarrierPackageNamesForIntent.Junda Liu2015-04-202-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resbmit of change Id100b7c4606287a1daa90092cd3c8a5a6519247d Bug: 20268073 Change-Id: I852aac4da492e15f1dd7a3c88693fa14ec07b7c4
* | | | | | Move factoryReset to service and protect.Stuart Scott2015-04-202-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:16161518 Change-Id: I02d1bbae1887c62ee426e6f03e8bc1f18c6666bf
* | | | | | Merge "Revert "Add multi-sim support for getCarrierPackageNamesForIntent.""Jeff Sharkey2015-04-192-14/+7
|\ \ \ \ \ \
| * | | | | | Revert "Add multi-sim support for getCarrierPackageNamesForIntent."Jeff Sharkey2015-04-192-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0ff9fd87d0a0d88bf46945629d0a30f6e7fb3f55. Change-Id: I099c612ff1715c5c34c0ed9bc1bec460a1a5db01
* | | | | | | Merge "Add multi-sim support for getCarrierPackageNamesForIntent."Junda Liu2015-04-192-7/+14
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Add multi-sim support for getCarrierPackageNamesForIntent.Junda Liu2015-04-172-7/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: b/20268073 Change-Id: Id100b7c4606287a1daa90092cd3c8a5a6519247d
* | | | | Fix calling package for app opsSvet Ganov2015-04-181-2/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie867262e74d0b09e16193cb575b1c1cf942c83cb
* | | | | Teach telephony about location app opsSvetoslav2015-04-182-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I2bd8f0cb90d161994045d403f5d0c129ea951c3f
* | | | | Merge "Add OP_READ_PHONE_STATE app op - framework"Svet Ganov2015-04-173-17/+22
|\ \ \ \ \
| * | | | | Add OP_READ_PHONE_STATE app op - frameworkSvet Ganov2015-04-173-17/+22
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The READ_PHONE_STATE permission protects PII information and is in the Phone group. This change is adding the corrseponding app op for gating access to the API guarded by READ_POHNE state which will be used instead as an access control for legacy apps. Change-Id: I2ff895a5a0e529f26ec0ad706266a30d829268ba
* | | | | Set default values for VVM constants in CarrierConfigManagerYorke Lee2015-04-171-5/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also hide the constants, they don't need to be @SystemApi * Make VVM_PORT_NUMBER an Int Bug: 20272209 Change-Id: I0d47afd7916d40f77ba5bf8e95306b46b27c15b3
* | | | Merge "Remove connection substate"Jay Shrauner2015-04-161-7/+0
|\ \ \ \
| * | | | Remove connection substateJay Shrauner2015-04-161-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug:20300433 Change-Id: Ifefc08b5165de3e0b6ce92007e5f612879dcc4d9
* | | | | Add keys for visual voicemail carrier configuration valuesNancy Chen2015-04-161-0/+36
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Each carrier has its own set of visual voicemail configuration values to be retrieved from the carrier config manager API. Bug:19236241 Change-Id: Ic1d59a13d2203c70aba178c315c47ec2661ea56e
* | | | Adding Carrier Config API.Jonathan Basseri2015-04-162-0/+214
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UICC privileged carrier apps will extend CarrierConfigService to provide carrier-specific configuration. Apps/services will use CarrierConfigManager to read the current configuration. CarrierConfigManager also defines the set of configuration variables and their default values. Bug: b/19483786 Change-Id: I027211b43276afd6fe893ae50048c52f2aed5cf5
* | | LCE service implementation - connectivity sidefenglu2015-04-161-3/+10
| | | | | | | | | | | | Change-Id: If11bd99c44c7dc8d2aa2bc05a10e04421739baa6
* | | Add support for Bluetooth Sim Access Profile (2/4)Casper Bonde2015-04-151-0/+10
| | | | | | | | | | | | Change-Id: I6c634aa38d31a7b5a98c9089840557257fd58209
* | | Merge "TelephonyManager Carrier Network Change Notification"Vinit Deshpande2015-04-164-0/+63
|\ \ \
| * | | TelephonyManager Carrier Network Change NotificationAndrew Flynn2015-04-144-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a way for a carrier app to notify the system that an intended network change is starting or ending. This can be used by a system PhoneStateListener to provide custom UI or perform other actions during this period. - Adds new public TelephonyManager API: notifyCarrierNetworkChange(boolean) - Adds new @hide PhoneStateListener method: onCarrierNetworkChange(boolean) - Functionality merely serves as a pass-through of data from an app to a PhoneStateListener (SystemUI for the intended use case) - Protected by MODIFY_PHONE_STATE permission or hasCarrierPrivileges(). Bug: 11392659 Change-Id: I3199e21ec1ac124198f44b86c1534dd3ff1f6858
* | | | Make Telecom/InCallUI APIs publicJay Shrauner2015-04-151-2/+0
|/ / / | | | | | | | | | | | | Bug:20260870 Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8
* | | Merge "Merge commit 'e593d0a' into merge_work"Prerepa Viswanadham2015-04-127-13/+100
|\ \ \
| * \ \ Merge commit 'e593d0a' into merge_workPrerepa Viswanadham2015-04-107-13/+100
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
| | * | IMS-VT: Upgrade/Downgrade changeRekha Kumar2015-04-017-13/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Add isVideo API to VideoProfile.VideoState IMS-VT: Fix propagation of device orientation. Orientation received at VT Service is incorrect. Fixed propagation of device orientation to VT service. IMS-VT: Upgrade fix -Add session modify call timed out constant Notify listeners of video quality changed event - Propagate the video quality changed message to the UI. IMS: Add support for video quality - Add Config interface to get/set video quality IMS-VT: Multitasking feature -Support for video multitasking IMS-VT: Modification of data usage aidl Change data usage aidl interface to take parameter type long instead of int Change-Id: I7cda2a689edb86d025dfe8efc8f573918c4bd6bc Propagate the call substate changed message to the UI IMS-VT: Add call modifiable capability PhoneCapababilities call type modifiable constant added IMS-VT: Add a bit mask CALL_SUBSTATE_ALL with all call substate bits set IMS-VT: Enable Video conferencing. Enable Video conferencing. Change-Id: I4240aa6f32c75d6eea8a41da3c87bca651f0901b IMS-VT: Add hide for setVideoProvider API Observed compilation error for SDK generation due to setVideoProvider API. Marking setVideoProvider as hide inorder to resolve the compilation error. IMS-VT: Add persist.radio.ims.audio.output for VT calls -- Add persist.radio.ims.audio.output to set the default speaker for VT calls. -- Add required constants IMS-VT: Add additional error codes for upgrade downgrade -Add support to send additional error codes to UI during upgrade downgrade. Change-Id: Id452d225098fe3bccdcd37d242985c5c761144c1
| | * | Merge "WiFi Calling: Show different operator name string in Data usage ↵Pavel Zhamaitsiak2015-03-301-0/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dialog." into lmp-mr1-wfc-dev automerge: 5fd843b * commit '5fd843b33383266cfe5f79f7ba4c5134c104cda0': WiFi Calling: Show different operator name string in Data usage dialog.
| | | * WiFi Calling: Show different operator name string in Data usage dialog.Pavel Zhamaitsiak2015-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 19950657 Change-Id: I9999d58e78154ed2d6d824973c40011875de15ef
* | | | Merge "Create interface for SmsManager text sending methods."Nancy Chen2015-04-101-0/+56
|\ \ \ \ | |/ / / |/| | |
| * | | Create interface for SmsManager text sending methods.Nancy Chen2015-04-091-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of set of changes to make looser changes just internally to send SMS from packages/services/Telephony. Bug: 19236241 Change-Id: I207ab73b2f63f745a55cefd12c85a044f7bbf11d
* | | | Add SIM activation constants to TelephonyManagerSantos Cordon2015-04-081-0/+31
|/ / / | | | | | | | | | Change-Id: I43fe5de4a1137bede4e81f4d51f272ad92dc80d5
* | | Merge "Protect against null ITelephony to fix crash."Andrew Lee2015-04-031-4/+16
|\ \ \
| * | | Protect against null ITelephony to fix crash.Andrew Lee2015-04-031-4/+16
| | | | | | | | | | | | | | | | | | | | Bug: 20066803 Change-Id: I4336e979dab3a4b1b3d53078af572ff3f822377a
* | | | Merge changes from topic 'mwd-merge-040115'Etan Cohen2015-04-022-3/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * changes: Merge (manually) pag/209446: Increase allowed duration to connect to HOGP profile Merge commit 'd91f193' into merge2 Merge commit '5718646' into merge2 Merge commit '7aa0345' into merge2
| * | | Merge commit 'd91f193' into merge2Etan Cohen2015-04-012-3/+4
| |\ \ \ | | |/ /
| | * | Merge "Stop output of call number to logs" into lmp-mr1-wfc-devEtan Cohen2015-03-261-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | automerge: 817d718 * commit '817d718d33256c15422d889bd93fb5453ad836a1': Stop output of call number to logs
| | | * Merge "Stop output of call number to logs" into lmp-mr1-wfc-devEtan Cohen2015-03-261-1/+1
| | | |\
| | | | * Stop output of call number to logsShriram Ganesh2015-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19602904 Change-Id: Ieb6ae8d5ab27571d1f6cf91c530713f22b21b513
| | * | | Merge "IMS: UT ServiceClass" into lmp-mr1-wfc-devPavel Zhamaitsiak2015-03-251-2/+3
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d3b6cbe * commit 'd3b6cbe172f429038894b1fae09fb72e8a646519': IMS: UT ServiceClass