summaryrefslogtreecommitdiffstats
path: root/telephony/java/com
Commit message (Collapse)AuthorAgeFilesLines
* Fix RIL_UNSOL_CDMA_PRL_CHANGED constant typo (1/2)liquid06242013-07-231-1/+1
| | | | Change-Id: I6eef9350fa62857cb5fd133a385cb09150cb6d1b
* Merge commit 'android-4.2.2_r1' into mr1.1-stagingRicardo Cerqueira2013-02-152-42/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/java/android/os/Trace.java core/java/android/widget/Toast.java core/res/res/values-cs/strings.xml core/res/res/values-el/strings.xml core/res/res/values-iw/strings.xml core/res/res/values/config.xml core/res/res/values/symbols.xml media/java/android/media/AudioService.java packages/SystemUI/res/values-sv/strings.xml packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.java policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java services/java/com/android/server/NotificationManagerService.java services/java/com/android/server/power/ElectronBeam.java Change-Id: I60b8ddf20a1d7bcf9dc7b1a4ed841aaa4d953294
| * Enable Turkish language encoding for Turkish SIM cards.Jake Hamby2012-12-061-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | Enable Turkish language encoding for SMS messages. Adds an MCC-specific config.xml override to enable the Turkish language tables for Turkish SIM cards. Also modifies GsmAlphabet.java to load the config.xml values before use, so the SMSDispatcher will get the current values instead of caching the boot-time values before the MCC is loaded. Bug: 7422368 Change-Id: I57cd5fcc1d04a2d0cba3e8b9022078679cf5d4c1
| * Remove unused IExtendedNetworkServiceMakoto Onuki2012-11-291-31/+0
| | | | | | | | | | | | | | | | It was used in the cupcake era for docomo. Is not used anymore. Bug 7633569 Change-Id: I2ec826fc9a70d261a340957a937ed4c9f8e67c5c
* | TelephonyProperties: Alpha ID fix for OPEN_CHANNEL and other p-commands (1/2)dhacker292013-01-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | p-cmds that support the below mentioned scenarios: - SETUP CALL - OPEN CHANNEL - SEND DTMF - SEND SMS - SEND SS - SEND USSD - LAUNCH BROWSER - PLAY TONE - SELECT ITEM Senarios handled : - NO ALPHA ID : Introduce a new configurable sys prop "persist.atel.noalpha.usrcnf". -- Allow display of default UI confirmation if prop is set to true -- No UI confirmation to be show if prop is set to false - NULL ALPHA ID (len = 0 ) : -- NO UI confirmation to be displayed Cherry-picked from CAF commit 5ea0d64186ca08abc0857aae1f83de969393be3b Without this SimToolkit will pop up asking for user response instead of recieveing response from framework. Change-Id: I012707285ee3a93119c2e2956ec599d631db10d5 Signed-off-by: dhacker29 <davidhackerdvm@gmail.com> Conflicts: telephony/java/com/android/internal/telephony/TelephonyProperties.java
* | CDMA RIL: add SVDO support (1/2)Shareef Ali2012-12-231-0/+5
| | | | | | | | | | | | based on Richard Ross's commit Change-Id: I313edd3c52d1d0b397ca519757470b87882424d7
* | Merge "Samsung STK support" into mr1-stagingDaniel Hillenbrand2012-12-091-0/+1
|\ \
| * | Samsung STK supportJüri Schultz2012-12-061-0/+1
| | | | | | | | | | | | Change-Id: I08d169bc466df290fca838b09f6b0fbea2ac82a8
* | | PowerWidget: Re-enable LTE button.Mike Kasick2012-12-071-0/+6
|/ / | | | | | | | | | | | | | | | | | | | | - Implement toggleLTE, from CM 10.0: I3f7521f5ec4e9f9106c58afd4d5b10c7086b55fd. - Support all LTE network modes defined in RILConstants and com.android.internal.telephony.Phone. - Cleanup: Remove unused LTE_MODE, restrict state change to updateState. - Also use Settings.Global.getInt() for PREFERRED_NETWORK_MODE. Change-Id: I43bb2491d650d641d243d3cb67ee80bc7c8f5cdf
* | Telephony: Add getLteOnGsmMode() method (1/2)Ricardo Cerqueira2012-12-052-0/+7
| | | | | | | | | | | | | | | | | | Same functionality as the existing getLteOnCdmaMode, but for GSM LTE devices. Enable with the telephony.lteOnGsmDevice system property From CM 10.0: Ibfb47ca608e51393b99d3308e0a6c66050b3f32e - Moved getLteOnGsmModeStatic() to TelephonyManager.
* | frameworks/base: Support for LTE network modesUma Maheswari Ramalingam2012-11-271-1/+1
|/ | | | Change-Id: I93c102f92ff2d10856d91108bb50fe5c0f06ad66
* am 72c06bcf: am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify ↵Wink Saville2012-09-111-4/+7
|\ | | | | | | | | | | | | IccCardConstants.State enum" * commit '72c06bcf1970f615f5037b9f63759d06a527cb4e': Telephony: Clarify IccCardConstants.State enum
| * Telephony: Clarify IccCardConstants.State enumAlex Yakavenka2012-09-051-4/+7
| | | | | | | | Change-Id: I57c6704dbefbcca5d1c6b28e72f0fb80bdbea7fc
* | am 4e9c7e3f: am 5a60f058: am 13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent"Wink Saville2012-08-241-0/+2
|\ \ | |/ | | | | | | * commit '4e9c7e3f60cee01b5bf376d53938b07c97f35a9e': Telephony: Add ICC_UNKNOWN intent
| * Telephony: Add ICC_UNKNOWN intentAlex Yakavenka2012-08-231-0/+2
| | | | | | | | Change-Id: I1a666973dd23f510a0cce60ef7db462728717fc0
* | am eb2257cc: am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard"Wink Saville2012-08-081-0/+1
|\ \ | |/ | | | | | | * commit 'eb2257ccc94679404cf22d876f0a98109a5dc25d': Telephony: Dynamically instantiate IccCard
| * Telephony: Dynamically instantiate IccCardAlex Yakavenka2012-08-081-0/+1
| | | | | | | | | | | | Add required constant for Dct Change-Id: I61cafee25cb40fe7de606a78566f93dfee523c73
* | am 8f82961f: am 98853623: Merge "Telephony: Move AdnRecord.aidl into ↵Wink Saville2012-08-041-20/+0
|\ \ | |/ | | | | | | | | | | opt/telephony" * commit '8f82961f5ace376cb2f888f8d4e53fe8a49f7315': Telephony: Move AdnRecord.aidl into opt/telephony
| * Telephony: Move AdnRecord.aidl into opt/telephonyAlex Yakavenka2012-08-031-20/+0
| | | | | | | | Change-Id: Ib22f3e777f1cd39fb6da5b907bcec57c2c66ce3a
| * Create telephony-common and mms-common - DO NOT MERGEWink Saville2012-07-17190-71739/+495
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been created to reduce the size and complexity of frameworks/base. mms-common was created by moving all of frameworks/base/core/java/com/google/android/mms to: frameworks/opt/mms telephony-common was created by moving some of frameworks/base/telephony to: frameworks/opt/telephony Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
* | Revise and update CellInfo API'sWink Saville2012-07-252-2/+2
| | | | | | | | Change-Id: I25a46076a244f50edb9da65816b3717e00820b34
* | Create telephony-common and mms-commonWink Saville2012-07-11190-71813/+495
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been created to reduce the size and complexity of frameworks/base. mms-common was created by moving all of frameworks/base/core/java/com/google/android/mms to: frameworks/opt/mms telephony-common was created by moving some of frameworks/base/telephony to: frameworks/opt/telephony Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
* | am d2246930: Merge "Preserve retryCount when retrying." into jb-devWink Saville2012-07-105-28/+100
|\ \ | | | | | | | | | | | | * commit 'd22469302707d87ee56d7a30dd8b38e671ee0179': Preserve retryCount when retrying.
| * \ Merge "Preserve retryCount when retrying." into jb-devWink Saville2012-07-105-28/+100
| |\ \
| | * | Preserve retryCount when retrying.Wink Saville2012-06-285-28/+100
| | | | | | | | | | | | | | | | | | | | Bug: 6529189 Change-Id: I743aed08aa161d91899aeb2ccacffcd224e48c0a
* | | | am e87c71f8: Merge "When reconnecting disassociate dc and apnContext." into ↵Wink Saville2012-07-101-0/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | jb-dev * commit 'e87c71f8c1db547831e8f91be765a6eecee27342': When reconnecting disassociate dc and apnContext.
| * | Merge "When reconnecting disassociate dc and apnContext." into jb-devWink Saville2012-07-101-0/+2
| |\ \ | | |/
| | * When reconnecting disassociate dc and apnContext.Wink Saville2012-06-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done in onActionIntentReconnectAlarm, which is called when retrying after an error, by setting the ApnContext.DataConnection & DataConnctionAc to null which intern clears the DataConnection.mApnList. With the mApnList cleared DataConnection.mRefCount will not be incremented because the DC will not be found by findReadyDataConnection. Thus fixing at least one cause of 6529189. Bug: 6529189 Change-Id: I40ff1966f6fbd2f69e97d77b9db7122e4c5b992f
* | | Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into ↵Jean-Baptiste Queru2012-07-021-0/+55
|\ \ \ | | | | | | | | | | | | jb-dev-plus-aosp
| * | | Revert "DO NOT MERGE: Remove SMS shortcode warning feature."Jean-Baptiste Queru2012-07-021-0/+55
| | | | | | | | | | | | | | | | This reverts commit 004ff5ad2aa02daff607bcf1712f3efbb84c58ca.
* | | | Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into ↵Jean-Baptiste Queru2012-07-022-9/+373
|\ \ \ \ | |/ / / | | | | | | | | jb-dev-plus-aosp
| * | | Revert "DO NOT MERGE: Remove SMS shortcode warning feature."Jean-Baptiste Queru2012-07-022-9/+373
| | | | | | | | | | | | | | | | This reverts commit b1fc08ca082db8ecad54c792485ff7915e3513ce.
* | | | Merge "Fix a bad comment. - DO NOT MERGE" into jb-dev-plus-aospJean-Baptiste Queru2012-07-021-1/+1
|\ \ \ \ | |/ / /
| * | | Fix a bad comment. - DO NOT MERGESantos Cordon2012-07-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: I923fb003cc37f562ff6cc5a4cdcc8dd4ea227dc0
* | | | Merge "Telephony Capability-Distinguish dialing & connect - DO NOT MERGE" ↵Jean-Baptiste Queru2012-07-021-0/+11
|\ \ \ \ | |/ / / | | | | | | | | into jb-dev-plus-aosp
| * | | Telephony Capability-Distinguish dialing & connect - DO NOT MERGESantos Cordon2012-07-021-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New capability returns true if the device can distinguish between dialing/active and connected reliably. Currently returns true only for GSM phones. Change-Id: I50751abaf74b31fdc747f4d04ca9a2ac4d73a1ff
* | | | Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into ↵Jean-Baptiste Queru2012-07-023-20/+31
|\ \ \ \ | |/ / / | | | | | | | | jb-dev-plus-aosp
| * | | When we disconnect shutdown the StateMachine. DO NOT MERGEWink Saville2012-07-023-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to stop the StateMachine threads and release all resources when we disconnect. bug: 6342470 Change-Id: Ibf7a2ebf4f7ecd667c5d95579e66ecd5086103ea
* | | | Merge "Enhance StateMachine Quitting and logging support. DO NOT MERGE" into ↵Jean-Baptiste Queru2012-07-021-4/+4
|\ \ \ \ | |/ / / | | | | | | | | jb-dev-plus-aosp
| * | | Enhance StateMachine Quitting and logging support. DO NOT MERGEWink Saville2012-07-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make StateMachine#quit non-conditional and remove the need to process the SM_QUIT_CMD it is now private. Rename halting to onHalting. Add onQuitting Change the message specific logging to be more generic and change the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add addLogRec(String) and addLogRec(String, State) as the generic logging methods. bug: 5678189 Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7 Conflicts: services/java/com/android/server/NsdService.java
* | | | am 46c923af: Merge "Fix country code for Netherlands Antilles." into jb-devJohn Huang2012-07-021-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '46c923afd50741c8d185a6d0c7666a86c9dfe712': Fix country code for Netherlands Antilles.
| * | Fix country code for Netherlands Antilles.Wink Saville2012-07-021-1/+1
| |/ | | | | | | | | | | | | | | | | Change the cc to "ai" from "nl" otherwise the timezone is set to Netherlands which is +1 rather than the Caribbean which is -4. Bug: 6765706 Change-Id: Ie399efe95ce93b73eb4e60cfc47e621cce85e6e5
* | am ca2c7b7d: Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-devJake Hamby2012-06-271-2/+1
|\ \ | |/ | | | | | | * commit 'ca2c7b7d96625cf515af88ad30062405b38cb094': Fix detection of CDMA CMAS cell broadcasts.
| * Fix detection of CDMA CMAS cell broadcasts.Jake Hamby2012-06-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | CMAS cell broadcasts do not necessarily set the message priority indicator subparameter. Interpret the user data as a CMAS message if the service category is in the CMAS range. Includes a new test case in CdmaSmsCbTest to verify correct decoding of an actual CMAS monthly test message. Bug: 6506785 Change-Id: I2a26a5194a1a02e34c1ef862ff348e1571df51c4
* | am 2dd63ccd: am d8ccd712: Merge "Parcel compRequired flag correctly."Jean-Baptiste Queru2012-06-151-2/+3
|\ \ | | | | | | | | | | | | * commit '2dd63ccdb0e4109d03c51a002ff785c9d8a8ccb9': Parcel compRequired flag correctly.
| * \ Merge "Parcel compRequired flag correctly."Jean-Baptiste Queru2012-06-151-2/+3
| |\ \
| | * | Parcel compRequired flag correctly.Danny Baumann2012-06-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix a couple of cases (e.g. SET_UP_MENU responses for Dual SIM adapters) whether a command response would be rejected due to a compRequired flag mismatch between the command sent to the Stk app and the response received from it. The problem was: - STK service received command without compRequired flag set - it passes it to the STK app, which sees compRequired set - STK app passes back the response with the user selection - STK service gets the response, which has compRequired set - it discards the response, as the command details don't match (CatService.java:646)
* | | | am 15319ded: am 460abe97: Merge "Add support for Caller Name Display"Robert Greenwalt2012-06-123-14/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '15319ded1545dbb266273439063caf6ca23629f5': Add support for Caller Name Display
| * | | Merge "Add support for Caller Name Display"Robert Greenwalt2012-06-123-14/+29
| |\ \ \
| | * | | Add support for Caller Name Displaykenshin2012-06-043-14/+29
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied relevant parts from CdmaConnection.java to get the information as/if presented by network operator (Fido/Rogers in canada provide that information, and it get displayed if there's no match in phonebook). Although it works (the nale is displayed when the call is received), the information is not stored (not kept in the log). * Patch Set 2 : correct coding style * Patch Set 3 : promote [get]cnapName, [get]cnapNapePresentation to parent class (Connection) * Patch Set 4 : -remove ref to CDMA in get[CnapName|CnapNamePresentation] headers -remove unnecessary self ref-reference * Patch Set 5 : -add forgoten "protected" modifier to newly promoted class memebers Change-Id: I2279f75d679d5afa716d9904fc3b3e33c77948c6