summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Refactor Cell Location public API." into jb-mr1-devWink Saville2012-09-2312-226/+39
|\
| * Refactor Cell Location public API.Wink Saville2012-09-2112-226/+39
| | | | | | | | | | Bug: 7189651 Change-Id: I173412095a5f7ae6116ee65b5315782f1c0c7688
* | Suppress location information for non-active users.Wink Saville2012-09-201-0/+1
|/ | | | | | | | Specifically, don't allow call backs for LISTEN_CELL_LOCATION and LISTEN_CELL_INFO. Bug: 7087342 Change-Id: Ida7f60b5bde3f28264dcb454b38fcfb1f1616d11
* 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
| * am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"Wink Saville2012-09-111-4/+7
| |\ | | | | | | | | | | | | * commit 'ba3cf72a08368ab40556b07b4518536bb59eb2f6': Telephony: Clarify IccCardConstants.State enum
| | * Telephony: Clarify IccCardConstants.State enumAlex Yakavenka2012-09-051-4/+7
| | | | | | | | | | | | Change-Id: I57c6704dbefbcca5d1c6b28e72f0fb80bdbea7fc
* | | Unhide some CellSignalStrength methods.Wink Saville2012-08-284-34/+6
| | | | | | | | | | | | | | | | | | When submitting originally I'd missed unhiding these methods. Change-Id: I627a5ea0c8c29b6ddfe5b1c49f9c0789d5e86456
* | | 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
| * | am 5a60f058: am 13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent"Wink Saville2012-08-231-0/+2
| |\ \ | | |/ | | | | | | | | | * commit '5a60f058891fa5417df7d53be28521b604071fea': Telephony: Add ICC_UNKNOWN intent
| | * Telephony: Add ICC_UNKNOWN intentAlex Yakavenka2012-08-231-0/+2
| | | | | | | | | | | | Change-Id: I1a666973dd23f510a0cce60ef7db462728717fc0
* | | Fix build.Wink Saville2012-08-132-0/+121
| | | | | | | | | | | | | | | | | | | | | I tried to get these into the merge conflict resolution, but didn't succeed. Change-Id: Id474415869182da438c09f7a75ee54c098fbc81e
* | | Merge commit 'e0df2c4f' into fix-merge-conflictWink Saville2012-08-131-124/+151
|\ \ \ | |/ / | | | | | | | | | | | | | | | * commit 'e0df2c4f': Telephony: Signal Strength cleanup & LTE support Change-Id: I655fcc0cf430820a50a8751ac132c73f7d8e0c6f
| * | am eca64977: Merge "Telephony: Signal Strength cleanup & LTE support"Wink Saville2012-08-131-56/+159
| |\ \ | | |/ | | | | | | | | | * commit 'eca64977041c5df0c987bdae56006ebbe86de677': Telephony: Signal Strength cleanup & LTE support
| | * Merge "Telephony: Signal Strength cleanup & LTE support"Wink Saville2012-08-131-56/+159
| | |\
| | | * Telephony: Signal Strength cleanup & LTE supportUma Maheswari Ramalingam2012-08-101-56/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make signal strength parsing common for all modes Add Support to calculate LTE level for UI signal bar display Update the lowest of Evdo/ CDMA dbm value in phone status instead of using only CDMA dbm Change-Id: I41bce658c536dc30558224c8ca76d6d70afb78ee
* | | | am eb2257cc: am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard"Wink Saville2012-08-081-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'eb2257ccc94679404cf22d876f0a98109a5dc25d': Telephony: Dynamically instantiate IccCard
| * | | am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard"Wink Saville2012-08-081-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '6f2361e7a97329feba7ac19b1a2635e315f73021': 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
| * | | am 98853623: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"Wink Saville2012-08-041-20/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '98853623bcb27155e9b030301a0cb2a987cfc612': Telephony: Move AdnRecord.aidl into opt/telephony
| | * | Telephony: Move AdnRecord.aidl into opt/telephonyAlex Yakavenka2012-08-031-20/+0
| | |/ | | | | | | | | | Change-Id: Ib22f3e777f1cd39fb6da5b907bcec57c2c66ce3a
* | | Merge "Unhide the new location API's" into jb-mr1-devWink Saville2012-08-0114-31/+19
|\ \ \
| * | | Unhide the new location API'sWink Saville2012-07-2614-31/+19
| | | | | | | | | | | | | | | | Change-Id: I41cc89998b8bd1e6686ea30475ab8905a133e312
* | | | Reduce log spam.Robert Greenwalt2012-07-271-1/+1
|/ / / | | | | | | | | | | | | | | | Turn off DBG in SignalStrength.java Change-Id: Ida1bded2551272956115aef5f3eda0f2a8cf3aed
* | | am 0c8a7768: am 893d93d2: Implement CMAS service category program results.Jake Hamby2012-07-252-9/+153
|\ \ \ | |/ / | | | | | | | | | * commit '0c8a7768e04513f5175add42c7be6240a703ff73': Implement CMAS service category program results.
| * | Implement CMAS service category program results.Jake Hamby2012-07-252-9/+153
| |/ | | | | | | | | | | | | | | | | | | Correctly handle CDMA Service Category Program Data requests, and send the SCPT response to the message center. Parcel SCPD operations as an ArrayList instead of an array (current version will throw ClassCastException when the array is cast). Bug: 6853691 Change-Id: I949ea68891c78306059248832e59a593ab606e11
* | Revise and update CellInfo API'sWink Saville2012-07-2518-402/+2187
|/ | | | Change-Id: I25a46076a244f50edb9da65816b3717e00820b34
* Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephonyNaveen Kalla2012-07-181-466/+0
| | | | | | This test was missed out while migrating telephony to frameworks/opt. Change-Id: I75d5bfef81352ebb916b3a4b3e482550478b797b
* Create telephony-common and mms-common - DO NOT MERGEWink Saville2012-07-17240-86742/+635
| | | | | | | | | | | | | | | | | 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
* 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-023-9/+839
|\ \ | |/ | | | | jb-dev-plus-aosp
| * Revert "DO NOT MERGE: Remove SMS shortcode warning feature."Jean-Baptiste Queru2012-07-023-9/+839
| | | | | | | | 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-272-2/+39
|\ \ | |/ | | | | | | * commit 'ca2c7b7d96625cf515af88ad30062405b38cb094': Fix detection of CDMA CMAS cell broadcasts.
| * Fix detection of CDMA CMAS cell broadcasts.Jake Hamby2012-06-252-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \