summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Change sendSessionModifyRequest VideoProvider API signature." into ↵Tyler Gunn2015-05-061-1/+1
|\ | | | | | | mnc-dev
| * Change sendSessionModifyRequest VideoProvider API signature.Tyler Gunn2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Including a fromProfile in addition to the requestedProfile. - Changed VideoCallImpl to generate the fromVideoProfile based on the call's current videoState. This ensures the InCall UI only needs to pass in the new video profile; the VideoCall Impl already has enough knowledge to generate the fromProfile. - Changed VideoCallImpl to track the current videoQuality, which forms a part of the fromVideoProfile. Bug: 20704229 Change-Id: I89f293f03a2b13fc8c1dcfd8a07ab8640d3950e0
* | Merge "WiFi Calling: Show different operator name string in Data usage ↵Pavel Zhamaitsiak2015-05-051-0/+1
|\ \ | |/ |/| | | dialog." into mnc-dev
| * WiFi Calling: Show different operator name string in Data usage dialog.Pavel Zhamaitsiak2015-05-051-0/+1
| | | | | | | | | | | | Bug: 19950657 Change-Id: I9999d58e78154ed2d6d824973c40011875de15ef (cherry picked from lmp-mr1-wfc-dev)
* | Merge changes from topic 'mwd-merge-050415' into mnc-devPrerepa Viswanadham2015-05-054-215/+28
|\ \ | |/ |/| | | | | | | | | | | | | | | | | * changes: Merge commit 'b6f59f4' into master_merge Merge commit 'f6db0ce' into master_merge Merge commit '17455a3' into master_merge Merge commit 'b4d5b32' into master_merge Merge commit 'a1a2fa7' into master_merge Merge commit '8dfdb98' into master_merge Merge commit 'eba66c3' into master_merge
| * Merge commit '17455a3' into master_mergePrerepa Viswanadham2015-05-013-215/+24
| |\
| | * Merge "add injectSmsPdu with subId to ISms.aidl" into m-wireless-devCheuksan Wang2015-04-241-215/+9
| | |\
| | | * add injectSmsPdu with subId to ISms.aidlCheuksan Wang2015-04-031-215/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | also clean up unused methods from ISms.aidl and UiccSmsController.java BUG: 20015121 Change-Id: I60237e2e8964f9db5cceab7b09112a49f92f5c47
| | * | Merge "Fail SmsManager requests if SubId is not active." into m-wireless-devCheuksan Wang2015-04-242-0/+15
| | |\ \
| | | * | Fail SmsManager requests if SubId is not active.Shishir Agrawal2015-03-302-0/+15
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If subId is not active, expected subIds can be assigned to the messages being processed due to SmsManager calls. The change will fail any SmsManager calls if SubId is not active. Bug: 18629526 Change-Id: I8da1b1e2c477f32dcbaff417fc4e14ba2a225414
| | * | DO NOT MERGE Remove connection substateJay Shrauner2015-04-161-7/+0
| | | | | | | | | | | | | | | | | | | | Bug:20300433 Change-Id: Ifefc08b5165de3e0b6ce92007e5f612879dcc4d9
| | * | LCE service implementation - connectivity sidefenglu2015-04-151-3/+10
| | | | | | | | | | | | | | | | Change-Id: If11bd99c44c7dc8d2aa2bc05a10e04421739baa6
| | * | Add keys for visual voicemail carrier configuration valuesNancy Chen2015-04-151-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-152-0/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | DO NOT MERGE Make Telecom/InCallUI APIs publicJay Shrauner2015-04-151-2/+0
| | | | | | | | | | | | | | | | | | | | Bug:20260870 Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8
| | * | Add support for Bluetooth Sim Access Profile (2/4)Casper Bonde2015-04-151-0/+10
| | | | | | | | | | | | | | | | Change-Id: I6c634aa38d31a7b5a98c9089840557257fd58209
| * | | am 89319a95: am e6a8bf80: am 08b51bfe: Merge "Add default dialer checks to ↵Yorke Lee2015-04-301-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Telecom/Telephony" into mnc-dev * commit '89319a9562d2b205a6b004a04e132b0219f92f9c': Add default dialer checks to Telecom/Telephony
| * \ \ \ am 01da3124: am df3a6f3e: am bd0ffb8e: Merge "Moving all Telephony overlays ↵Junda Liu2015-04-291-22/+158
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to CarrierConfigManager." into mnc-dev * commit '01da31247b8b2999bcfefe1f55ca396ee177ad69': Moving all Telephony overlays to CarrierConfigManager.
| * | | | | Use a separate intent action for subscription phone state changes.Sharvil Nanavati2015-04-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Global phone state changes and subscription phone state changes are aliased to the same intent. As a result, apps can't distinguish between the two types of updates. This change teases the two apart by using a different intent action for each type of phone state change. This will break carrier apps that depend on subscription phone state changes, but will fix state inconsistencies in non-carrier apps. Bug: 20309009 Change-Id: Ie81c37247917573a3ef5d957fda1087c16736e85
* | | | | | Support for bearer_bitmask.Amit Mahajan2015-05-011-0/+52
| |_|/ / / |/| | | | | | | | | | | | | | Change-Id: I7cae3d229445607c66b6472124264588f7571097
* | | | | Merge "Add default dialer checks to Telecom/Telephony" into mnc-devYorke Lee2015-04-301-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add default dialer checks to Telecom/TelephonyYorke Lee2015-04-291-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for the default dialer or the modify phone state permission for various TelecomManager/TelephonyManager methods. Make sure to check the user-selected default rather than the hardcoded package name. Exercise this code in TestDialerActivity. Bug: 20304458 Change-Id: Ic04cd8f2ba98e1d54c39549ae89d3e11cd5cdafb
* | | | Moving all Telephony overlays to CarrierConfigManager.Jonathan Basseri2015-04-291-22/+158
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds every variable and its default value from packages/services/Telephony/res/values/config.xml to the new CarrierConfigManager API. Variable docstrings are also taken from config.xml, with minimal edits. These variables were not included because either they are not carrier specific, or they are device specific: OtaPlaySuccessFailureTone OtaShowActivateFailTimes OtaShowActivationScreen OtaShowListeningScreen carrier_settings carrier_settings_menu config_allow_hfa_outside_of_setup_wizard config_enabled_lte csp_enabled dialer_default_class dtmf_type_enabled hac_enabled send_mic_mute_to_AudioManager ui_default_package This also adds BOOL_HIDE_CARRIER_NETWORK_SETTINGS which is a replacement for android.provider.Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS. Bug: 20270007 Change-Id: I985a55cf88d3bd1863e28af7790b59eef01d6504
* | | 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
generated by cgit v1.1 at 2025-01-07 05:26:39 +0000