summaryrefslogtreecommitdiffstats
path: root/telephony/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Document procedure for adding carrier config variables." into mnc-devJonathan Basseri2015-06-031-0/+4
|\
| * Document procedure for adding carrier config variables.Jonathan Basseri2015-05-291-0/+4
| | | | | | | | | | | | | | | | Readers of CarrierConfigManager.java should find enough info in the comments to add new variables and override them in either their own carrier app or the default carrier app. Change-Id: Ib1d87c24543491ad8b4ef0b1d08148a07fb1ace3
* | Merge "API Cleanup: Remove VideoState class." into mnc-devTyler Gunn2015-06-031-12/+12
|\ \
| * | API Cleanup: Remove VideoState class.Tyler Gunn2015-06-031-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove VideoState class. - Replace references to VideoState constants with VideoProfile equivalent. - Push VideoState static methods into VideoProfile. Bug: 21573551 Change-Id: I1bca02772b5b7d86643f612824b07faef7618725
* | | Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-devJonathan Basseri2015-06-021-1/+68
|\ \ \ | |/ / |/| |
| * | Migrating MmsConfig to CarrierConfigManager.Jonathan Basseri2015-06-021-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define variables in CarrierConfigManager that mirror those in SmsManager. These will replace MmsConfig. The literal values had to be moved into this class because classes in frameworks/base/telephony cannot reference classes in frameworks/opt/telephony. There is no change to the SmsManager API, but the data available from SmsManager#getCarrierConfigValues is moving from mms_config.xml files into the new carrier config API. This was originally Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a Bug: 21085630 Change-Id: I5a55873465c36ea8a7e3915b8b98a65b47c60dfa
* | | Rename PhoneNumberUtils APIsBrian Attwell2015-06-021-9/+9
|/ / | | | | | | | | | | | | In response to more API review. Bug: 21571895 Change-Id: Ia1fa69da07a3427997919ba61c77fcbad7e79f2a
* | Merge "Revert "Migrating MmsConfig to CarrierConfigManager."" into mnc-devJonathan Basseri2015-06-021-68/+1
|\ \
| * | Revert "Migrating MmsConfig to CarrierConfigManager."Jonathan Basseri2015-06-021-68/+1
| | | | | | | | | | | | | | | | | | | | | | | | Forgot to update-API This reverts commit 9444f4be82d2bbc6b8668e73e91cfa70aee2d4dc. Change-Id: I8e1bb7ff5b86d478ae7a79497d28ee9310209de6
* | | Merge "Hide and disable emergency assist API" into mnc-devAdrian Roos2015-06-021-0/+7
|\ \ \ | |/ / |/| |
| * | Hide and disable emergency assist APIAdrian Roos2015-05-271-0/+7
| |/ | | | | | | | | Bug: 21471480 Change-Id: If53926ebd6451b05ccacf06342cc648185dc5eaf
* | Migrating MmsConfig to CarrierConfigManager.Jonathan Basseri2015-06-021-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Define variables in CarrierConfigManager that mirror those in SmsManager. These will replace MmsConfig. The literal values had to be moved into this class because classes in frameworks/base/telephony cannot reference classes in frameworks/opt/telephony. There is no change to the SmsManager API, but the data available from SmsManager#getCarrierConfigValues is moving from mms_config.xml files into the new carrier config API. Bug: 21085630 Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a
* | Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-devBrian Attwell2015-05-281-4/+4
|\ \
| * | Rename "end" to "endExclusive" in addPhoneTtsSpanBrian Attwell2015-05-281-4/+4
| | | | | | | | | | | | | | | Bug: 21209482 Change-Id: If505acecf5ca398560a9a23ea23ff8dd741e4025
* | | Merge "Cleaning up logging in TelephonyManager." into mnc-devAmit Mahajan2015-05-281-4/+0
|\ \ \
| * | | Cleaning up logging in TelephonyManager.Amit Mahajan2015-05-281-4/+0
| |/ / | | | | | | | | | | | | Bug: 21474174 Change-Id: I4555ada69c233ee9e9d9e45c1d619e8b779d9016
* | | Merge "Update docstring for STRING_VVM_TYPE to point to possible values." ↵Nancy Chen2015-05-281-1/+2
|\ \ \ | | | | | | | | | | | | into mnc-dev
| * | | Update docstring for STRING_VVM_TYPE to point to possible values.Nancy Chen2015-05-271-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | The possible values for CarrierConfgiManager.STRING_VVM_TYPE now live in TelephonyManager. Update the reference. Bug: 21446369 Change-Id: I85e3ab4f64d54f0cb8bf16b2ada67cae36cefdd2
* | | Add a hidden telephony API for querying SIM derived locales.Narayan Kamath2015-05-282-0/+22
| | | | | | | | | | | | | | | bug: 19818550 Change-Id: Ide6c05ad8fe7b0cff6f20ddfe755e83e9b3a21aa
* | | Drop the "Config". Just "CarrierService". It's cleaner.Zach Johnson2015-05-271-1/+1
| |/ |/| | | | | | | | | b/21308727 Change-Id: I6515888c7804349ecd07c4dd74575ef89a4bea59
* | Add vvm type for t-mobile.Nancy Chen2015-05-252-10/+17
|/ | | | | | | | T-Mobile has slightly different configuration details so add a vvm type to correspond to what they use: comverse vvm. Bug: 21126480 Change-Id: I83fd0c5651bf94eb912dd44f4b52924d8bcdd4e7
* Add support for static RadioCapabilities.Robert Greenwalt2015-05-131-1/+39
| | | | | | | | | | | | | | | | Some RILs don't support RIL_REQUEST_GET_RADIO_CAPABILITY. Add code to RIL.java to notice a REQUEST_NOT_SUPPORTED response and check config.xml (config_radio_access_family) for a static answer. Also catching GENERIC_FAILURE responses because Hammerhead modem returns that. B 21079604 created for this. If neither Modem nor config.xml provide data, uses RAF_UNKNOWN so we don't lie about capabilities and also so we fail fast (setPreferredNetwork won't work). bug:20561357 Change-Id: I49e4527fe94919a7094bc7c1e100d20e8f833865
* Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes ↵Junda Liu2015-05-131-3/+3
|\ | | | | | | more sense." into mnc-dev
| * Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.Junda Liu2015-05-131-3/+3
| | | | | | | | | | Bug: b/21028396 Change-Id: I029671b6bcd03a07956ccf35f4e5fe03d16a2218
* | Add null annotations for getting carrier config.Jonathan Basseri2015-05-131-0/+5
|/ | | | | | | | CarrierConfigManager can return null Bundles for carrier config, but never returns null when getting default values. Add the appropriate annotations. Change-Id: Iffbed3b54ca7cc28cf8b04f133aacdf9e6e4fd20
* Switching to PersistableBundle in carrier config API.Jonathan Basseri2015-05-132-11/+11
| | | | | | | | | | | | | | | 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: I17989ce840014c2a0ed3679c1bca5a8498082c7f
* More video related API fixesYorke Lee2015-05-121-1/+2
| | | | | | | | | | | | | | | | | 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
* Fixes for APi reviewYorke Lee2015-05-121-2/+1
| | | | | | | | | Move CameraCapabilities into VideoProfile Make PhoneAccount and PhoneAccountHandle final Bug: 21040387 Bug: 21066505 Change-Id: I72453c89ae3765f9b9cf263938fce96d5978d2e0
* 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