summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add methods for device telephony configs."Andrew Lee2015-03-062-1/+43
|\
| * Add methods for device telephony configs.Andrew Lee2015-03-042-1/+43
| | | | | | | | | | | | | | | | + Expose method for whether DTMF length can be changed. + Expose method for whether the device is a world phone. Bug: 19372734 Change-Id: I542e87cab1924eb600fdce929f5227e36112964b
* | Merge "Remove unused imports in frameworks/base."John Spurlock2015-03-028-16/+0
|\ \
| * | Remove unused imports in frameworks/base.John Spurlock2015-02-288-16/+0
| | | | | | | | | | | | Change-Id: I031443de83f93eb57a98863001826671b18f3b17
* | | Remove PROPERTY_SIM_COUNT and "ro.telephony.sim.count"leozwang2015-03-021-5/+0
|/ / | | | | | | | | | | These two defines are not being used anywhere. Change-Id: Ie08468b8be18bf1860627e644bbd984bd1c899f4
* | am 40aa30b3: am 654a473b: am 249f2c3a: am 025f0938: Merge "Changing usage of ↵Sanket Padawe2015-02-261-1/+2
|\ \ | |/ |/| | | | | | | | | carrier name field of SubInfoRecord" into lmp-mr1-dev * commit '40aa30b3747fc62b14832682d2cc3117edd93b80': Changing usage of carrier name field of SubInfoRecord
| * am 654a473b: am 249f2c3a: am 025f0938: Merge "Changing usage of carrier name ↵Sanket Padawe2015-02-261-1/+2
| |\ | | | | | | | | | | | | | | | | | | field of SubInfoRecord" into lmp-mr1-dev * commit '654a473bfea9a4197868ae81091812505da8ca87': Changing usage of carrier name field of SubInfoRecord
| | * Changing usage of carrier name field of SubInfoRecordSanket Padawe2015-02-241-1/+2
| | | | | | | | | | | | | | | Bug: 19476304 Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
* | | Add Sub-ID-from-phone-account converter method.Santos Cordon2015-02-192-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several places in the code that currently attempt to parse the sub ID directly from the phone account which is undesireable. Before we can change from using the subID to using an ICC ID with the phone accounts, we need to create a conversion method so that no other components are parsing the sub ID out of the phone account directly. Change-Id: I74547fe0807da2fe13f3ff4422cd1d0a7a20d04c
* | | GpsLocationProvider: Read data enabled status from TelephonyManager. ↵Shishir Agrawal2015-02-111-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | automerge: 64ce5f8 automerge: 6b27472 automerge: b7e04f3 * commit 'b7e04f3294d2ce60450fcc6881249b6b0c6c30b0': GpsLocationProvider: Read data enabled status from TelephonyManager.
| * | GpsLocationProvider: Read data enabled status from TelephonyManager. ↵Shishir Agrawal2015-02-111-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | automerge: 64ce5f8 automerge: 6b27472 * commit '6b274720c5a210c07256e5b9fc11a1e9aca59017': GpsLocationProvider: Read data enabled status from TelephonyManager.
| | * GpsLocationProvider: Read data enabled status from TelephonyManager.Shishir Agrawal2015-02-101-2/+2
| | | | | | | | | | | | | | | Bug: 18814559 Change-Id: I0333050d2a5b8d484466e1b1914dcfb9965398c9
* | | am 0a4c2646: am 04db9797: Merge "Suppress phone number from logcat." into ↵Sanket Padawe2015-02-051-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 4eed340 * commit '0a4c2646f4b72fdc78299dbb3dd86a7aecefff08': Suppress phone number from logcat.
| * | am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-devSanket Padawe2015-02-051-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: 4eed340 * commit '4eed340437d23a9b4fabf2881557325b863af23c': Suppress phone number from logcat.
| | * Suppress phone number from logcat.Sanket Padawe2015-02-051-1/+1
| | | | | | | | | | | | | | | Bug: 19251204 Change-Id: I042bc3c0a89967eeae547b059f06cf05de005b25
* | | Unhide and rename PhoneNumberUtils tts methodsBrian Attwell2015-02-051-13/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed ttsSpanAsPhoneNumber #1 -> getPhoneTtsSpannable Renamed ttsSpanAsPhoneNumber #2 -> addPhoneTtsSpan Added getPhoneTtsSpan Instead of removing the original hidden methods, I deprecated them. Since Telephony changes initially get checked into wireless-dev branch and dialer/contacts changes get checked into master branch, immediately deleting the ttsSpanAsPhoneNumber methods would break builds. In ContactsCommon, I plan on removing ContactDisplayUtils#getTelephoneTtsSpannable and instead using these Telephony APIs. Numbers I tested worked in ToT master talkback: 911, (650) 215 3111, 22222222222, 333-3333, 013334612234, +1 905 471 8484, 001 39 02 444 4444. The changes in this diff cause the numbers to be talked-back at least as well as before. Some context: go/question-about-telephonys-ttsspan Bug: 18777272 Change-Id: I3a6ead3ee9c030761bde903cf88f4aa4fc7a3460
* | | am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is ↵Robert Greenwalt2015-02-021-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | already merged" automerge: 21475c6 * commit '21475c6a92b893f5d078ba23f06f0be6edaaacbd':
| * | am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is ↵Robert Greenwalt2015-02-021-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | already merged" * commit '0cdd4560dac5784dda169863eb844d489bdc79d5':
| | * \ Fixing up the formatting code which is already mergedRobert Greenwalt2015-02-021-3/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I just apply google coding guide like space. Uploading the same code about + handling just apply the Google Coding Guide. The previous code is "https://android-review.googlesource.com/#/c/122770/" This code is about + plus number converting logic for international NANP. Change-Id: I23e4709294c603b387b28b3c2a56c932d838c666
* | | \ \ am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for ↵Stuart Scott2015-01-303-27/+462
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | telephony system property" into lmp-mr1-dev automerge: 2e233d3 * commit '2e233d30662d26846a42c298967842d2e8537653': [DS] Correct the access method for telephony system property
| * | | | am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for ↵Stuart Scott2015-01-303-27/+462
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | telephony system property" into lmp-mr1-dev * commit '712d5b3d582dfe8f7fb855ba98704c98e9441836': [DS] Correct the access method for telephony system property
| | * | | Merge "[DS] Correct the access method for telephony system property" into ↵Stuart Scott2015-01-303-27/+462
| | |\ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | [DS] Correct the access method for telephony system propertyLegler Wu2015-01-293-27/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise the method to access telephony system property. Add several PROPERTY_XXX_XXX_MSIM for MSIM type system properties. If caller use the old one, it will be dispatched to new one and get by default phone id. Ex. PROPERTY_ICC_OPERATOR_NUMERIC Bug: 18675498 Change-Id: I008a7390fefbbcd9f6569f059d48eedf1da28de0
* | | | | | am d492aa08: am 45446c63: Merge "Adding new API to ISms to check if default ↵Amit Mahajan2015-01-301-4/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SMS SIM needs to be chosen by user." into lmp-mr1-dev automerge: ed1a463 * commit 'ed1a46393e50cb2954876ef19ca539829fdf4a19': Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
| * | | | | am d492aa08: am 45446c63: Merge "Adding new API to ISms to check if default ↵Amit Mahajan2015-01-301-4/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SMS SIM needs to be chosen by user." into lmp-mr1-dev * commit 'd492aa08206d21ba2e5ba533532630e5abe0bffe': Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
| | * | | | Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen ↵Amit Mahajan2015-01-301-4/+8
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | by user." into lmp-mr1-dev
| | | * | | Adding new API to ISms to check if default SMS SIM needs to be chosen byAmit Mahajan2015-01-281-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user. Bug: 19112332 Change-Id: I7da30ebcebaf57f713acc6938626930dbc51d1f2
* | | | | | am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone ↵Sanket Padawe2015-01-291-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no." into lmp-mr1-dev automerge: f19485b * commit 'f19485b644b7ba7bda1f5c7a2279ca56c37923f0': Suppress logging to avoid showing phone no.
| * | | | | am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone ↵Sanket Padawe2015-01-291-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no." into lmp-mr1-dev * commit '60e4edfb94fd744001b4c7013a89ef4abb311f97': Suppress logging to avoid showing phone no.
| | * | | | Merge "Suppress logging to avoid showing phone no." into lmp-mr1-devSanket Padawe2015-01-291-1/+1
| | |\ \ \ \
| | | * | | | Suppress logging to avoid showing phone no.Sanket Padawe2015-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19193581 Change-Id: I6ee17a2eab9d0ed84c931d6395a5aeb148177f95
* | | | | | | am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev ↵Stuart Scott2015-01-292-8/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: f4e5236 automerge: cf8ae79 * commit 'cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b': Change getDeviceId to take phoneId.
| * | | | | | am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev ↵Stuart Scott2015-01-292-8/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: f4e5236 * commit '8d702000a7291068e639a9954e03c36d66144449': Change getDeviceId to take phoneId.
| | * | | | | Merge "Change getDeviceId to take phoneId." into lmp-mr1-devStuart Scott2015-01-292-8/+4
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Change getDeviceId to take phoneId.Stuart Scott2015-01-282-8/+4
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | bug:18827144 Change-Id: I32196f842504e63f4ddd45401e83e73afae81ad5
* | | | | | am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev ↵xinhe2015-01-281-1/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: fc921d1 automerge: 5e51c21 * commit '5e51c21943a4e9c0096acbaee5f923e9e0297f25': Sprint: MMS cannot be sent in the UK
| * | | | | am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev ↵xinhe2015-01-281-1/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: fc921d1 * commit '93487e286e6bfa434fb092c6276d96b40e5d62c4': Sprint: MMS cannot be sent in the UK
| | * | | | Sprint: MMS cannot be sent in the UKxinhe2015-01-281-1/+5
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to Sprint network at UK is actually GSM/UMTS. Thus we need GSM phone with CSIM to provide Nai too. Bug:18241756 Change-Id: Icec10c88834151f5e35e38db93af36d7f40890fd
* | | | | am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" ↵Robert Greenwalt2015-01-211-3/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: f19176f automerge: 52f25f7 * commit '52f25f7b30b684a46814cff60538e6a7636ed618': Add + code handling logic for SMS Global Roaming
| * | | | am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" ↵Robert Greenwalt2015-01-211-3/+7
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | automerge: f19176f * commit 'b73f431dddc0ba9260a342f2322e818460cf6f34': Add + code handling logic for SMS Global Roaming
| | * | | Add + code handling logic for SMS Global Roamingsohryun.shin2015-01-121-3/+7
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sending SMS from international CDMA NANP country, outgoing SMS is failed due to + code converting. (Send a SMS text message: to an international phone number using the plus code (+)). In kitkat, when user send a sms with plus code, the "+" converted to 011(NANP_IDP_STRING). And it works well. However, in lollipop, the "+" converted to current IDP, not NANP_IDP_STRING. And it failed to send the SMS. I think, we need to seperate SMS and Call logic like cdmaCheckAndProcessPlusCodeForSms and cdmaCheckAndProcessPlusCode. sohryun.shin@lge.com Change-Id: Ie9d402cbeb4de4ac30299d5820b33909d0e40320
* | | | am f0f5eee8: Merge "Fixed a crash in TelephonyManager while calling ↵Sanket Padawe2015-01-201-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | getDeviceID()" into lmp-mr1-dev automerge: e54e760 automerge: 76e9d18 * commit 'f0f5eee8238284aad08fd573959392542e57a8ab': Fixed a crash in TelephonyManager while calling getDeviceID()
| * | | Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into ↵Sanket Padawe2015-01-201-0/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: e54e760 automerge: 76e9d18 * commit '76e9d18055d131bede49886c9c86c9f59db3fac4': Fixed a crash in TelephonyManager while calling getDeviceID()
| | * | Fixed a crash in TelephonyManager while calling getDeviceID()Sanket Padawe2015-01-201-0/+2
| | | | | | | | | | | | | | | | | | | | Bug: 19056848 Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f
* | | | am 60b41e6a: am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get ↵Sanket Padawe2015-01-172-1/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | device id independent of Subscription." into lmp-mr1-dev * commit '60b41e6aa7a93bf90cb1b7715a2429dbe7c975fe': Modify getDeviceId() to get device id independent of Subscription.
| * | | am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id ↵Sanket Padawe2015-01-172-1/+15
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | independent of Subscription." into lmp-mr1-dev * commit '543348eb94624907102c1baffe5bdaf1087fede8': Modify getDeviceId() to get device id independent of Subscription.
| | * | Merge "Modify getDeviceId() to get device id independent of Subscription." ↵Sanket Padawe2015-01-172-1/+15
| | |\ \ | | | | | | | | | | | | | | | into lmp-mr1-dev
| | | * | Modify getDeviceId() to get device id independent of Subscription.Sanket Padawe2015-01-142-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Add getDeviceId() in ITelephony to find device id independent of subscription. Bug: 18780202 Change-Id: I21cc38418eb7f4f1b300c6372e1dc7548385c112
* | | | | am e2b9d5b5: am 542f4ee6: am a2fa3d21: Merge "Unhide getDataRoaming, ↵Stuart Scott2015-01-152-5/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Messenger uses it to decide to download MMS or not." into lmp-mr1-dev * commit 'e2b9d5b56c6b06418e85cd49afd87e0d08f57c71': Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
| * | | | am 542f4ee6: am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to ↵Stuart Scott2015-01-142-5/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | decide to download MMS or not." into lmp-mr1-dev * commit '542f4ee61986e2a2883211f229a1b3ad23ceca81': Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.