summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Collapse)AuthorAgeFilesLines
* am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into ↵Nick Vaccaro2015-03-181-96/+318
|\ | | | | | | | | | | | | lmp-mr1-modular-dev * commit '74a0eb360da012c5a13577a8af33f6b28b0fadf7': Avoid unhandled page fault cases on Android Wear
| * Avoid unhandled page fault cases on Android WearNick Vaccaro2015-02-271-96/+318
| | | | | | | | | | | | | | | | | | Telephony routines were dereferencing the null result of getITelephony() and getSubscriberInfo(), causing unhandled page faults at the hardware level. Bug: 18264818 Change-Id: I7d058aa881c7dac20051d6faea2a6d52be4bd74e
* | 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
* | 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 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
* | 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 * 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 * 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 * 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 * 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 * 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 * 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
* | | 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 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 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.
| * | | Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.Stuart Scott2015-01-142-5/+4
| | | | | | | | | | | | | | | | | | | | bug:19015551 Change-Id: Ibcad6424695a97bd9ae123010bdf740449d09327
* | | | am ead01845: am 6e410196: Merge "Rename setGlobalPreferredNetworkType to ↵Junda Liu2015-01-141-3/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev * commit 'ead0184548fdd341f5903d9ce35604c926dcddde': Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
| * | | Merge "Rename setGlobalPreferredNetworkType to ↵Junda Liu2015-01-141-3/+1
| |\ \ \ | | | | | | | | | | | | | | | setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev
| | * | | Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per ↵Junda Liu2015-01-131-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API council. Bug: b/18983535 Change-Id: I937b7ce38615e07f653d3ee02d734edfcfea3897
* | | | | am e3b0449b: Merge "Update javadoc and hide getNameSource and ↵Stuart Scott2015-01-131-11/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getDataRoaming." into lmp-mr1-dev automerge: dfb99e8 * commit 'dfb99e82740fe21006bb6972af6af610ed12edbe': Update javadoc and hide getNameSource and getDataRoaming.
| * | | | Merge "Update javadoc and hide getNameSource and getDataRoaming." into ↵Stuart Scott2015-01-131-11/+14
| |\ \ \ \ | | |/ / / | |/| | | | | | | | lmp-mr1-dev
| | * | | Update javadoc and hide getNameSource and getDataRoaming.Stuart Scott2015-01-131-11/+14
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Note SubscriptionInfo was not public in 21 and 22 hasn't been released yet. bug:18983672 Change-Id: I9e8684eea2462fb655846d0719158d54007fabc5
* | | | am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg ↵Wink Saville2015-01-132-8/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | OnSubscriptionsChangedListener." into lmp-mr1-dev * commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7': Rename reg/unreg OnSubscriptionsChangedListener.
| * | | Rename reg/unreg OnSubscriptionsChangedListener.Wink Saville2015-01-132-8/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | To addOnSubscriptionsChangedListener and removeOnSubscriptionsChangedListener. Bug: 18984103 Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
* | | am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class ↵Robert Greenwalt2015-01-051-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | members properly" * commit 'd38218d880f02951015733a3d3e00deb546465bf': Telephony: Initialize GsmCellLocation class members properly
| * | Telephony: Initialize GsmCellLocation class members properlySrikanth Chintala2014-12-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Default values for class members mLac, mCid, mPsc would be 0. Initialize these variables with -1 as 0 is considered as valid value. CRs-Fixed: 406479 Change-Id: Idb3d1737c7101b97a90eab3dc7436ee1806d0bc4
* | | am d00b6067: Merge "IMS: add the api to get IMS registration information." ↵Amit Mahajan2014-12-282-0/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 4f68c0c * commit '4f68c0c1d8811d610021d97839af303c2752eff2': IMS: add the api to get IMS registration information.
| * | IMS: add the api to get IMS registration information.Libin.Tang@motorola.com2014-12-222-0/+18
| | | | | | | | | | | | Bug: 18668325 Change-Id: Ie694c7f1cc12a573cbef2815199ae6c91cf8088e
* | | am 7c580cab: am b5f1e878: Fix build breakage.Wink Saville2014-12-191-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit '7c580caba94ca3b917c887b9e8353809c7f320c7': Fix build breakage.
| * | Fix build breakage.Wink Saville2014-12-191-0/+1
| | | | | | | | | | | | | | | | | | I rebased a change and didn't compile, my mistake. Change-Id: Iad7fc609b08d53aa7b8b96af609e3ff9a4f0e889
* | | am 57859d70: am f73c2d1f: Update mapping between RAF and Network Type.Wink Saville2014-12-191-17/+36
|\ \ \ | |/ / | | | | | | | | | * commit '57859d704ef2bc61798c172c4524596393f0beef': Update mapping between RAF and Network Type.
| * | Update mapping between RAF and Network Type.Wink Saville2014-12-191-17/+36
| | | | | | | | | | | | | | | bug:18754476 Change-Id: I5bdb8df192610b831a418ae810fe4f3b96c30f77
* | | am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network ↵Wink Saville2014-12-191-3/+26
|\ \ \ | |/ / | | | | | | | | | | | | | | | Type." into lmp-mr1-dev * commit 'aa40537ca56ce386edcdaed2d21a9e2f07975812': Update mapping between RAF and Network Type.