summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
Commit message (Collapse)AuthorAgeFilesLines
* am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1Wink Saville2011-03-171-3/+3
|\ | | | | | | | | * commit '651f38d71788d6b1d50cb6c9810ba31f903407d9': Change stopship to todo.
| * Change stopship to todo.Wink Saville2011-03-171-3/+3
| | | | | | | | | | | | | | | | For MR1 LTE isn't supported so the various lte routines aren't used and are not a stopship. bug: 4126216 Change-Id: I2a5f86161b616b57c6fe4b9de85db2492914009a
* | Do not merge: Telephony: Corrections to LTE and eHRPD constant values.Ramesh Sudini2011-03-141-4/+9
| | | | | | | | | | | | LTE and EHRPD values are not consistent with ril.h Change-Id: I76d1ff408a37960873f537772637ff3ae3ac056f
* | Do not merge: Revert the revert of "LTE Changes for Telephony including ↵Wink Saville2011-03-141-0/+10
|/ | | | | | | | | | Multiple PDN support and IPV6 support" This reverts commit eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7 and is the first of the LTE commits in master being back ported to the LTE branch. Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
* DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN ↵Wink Saville2011-03-031-10/+0
| | | | | | | | support and IPV6 support" This reverts commit 2b8bcfe5b74e1a34d136f4ff46e3c94397f38f82. Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636
* LTE Changes for Telephony including Multiple PDN support and IPV6 supportWink Saville2011-02-241-0/+10
| | | | | | Added init for CDMAPhone.java Change-Id: I2392b5ad3382ee1993537b8477ef00dd036c6fe9
* Changes for ril.h version 6.Wink Saville2011-02-181-19/+406
| | | | Change-Id: Iacd9d362c4836546ac277cf3571227d426a721aa
* Merge "Add new network type for HSPA+."Robert Greenwalt2011-02-021-0/+3
|\
| * Add new network type for HSPA+.Robert Greenwalt2011-02-021-0/+3
| | | | | | | | Change-Id: Ia949a02e5cb66bc9f7d4d5e7e771e592231c729b
* | Have SmsMessage use getCurrentPhoneTypeWink Saville2011-02-022-24/+24
| | | | | | | | | | | | | | | | | | Although our first tablet doesn't support SMS messages there are testing scenarios where they can be used. To preserve proper behavior now that getPhoneType can return PHONE_TYPE_NONE use getCurrentPhoneType. bug: 3198435 Change-Id: I48ef294f563351c66971b4e89e6dcb3326b0ae92
* | Use a cached context when possible.Robert Greenwalt2011-02-021-9/+20
| | | | | | | | | | | | | | | | | | It's always possible after services have been registered, so it's just early in the process that's a problem. Lie correctly in those early cases and fix this in MR1. bug:3415254 Change-Id: I95811d1efd676fde01f66b742393d3aa4623482f
* | Add TelephonyManager.getCurrentPhoneTypeWink Saville2011-02-012-10/+24
|/ | | | | | | | | The new method getCurrentPhoneType has the old behavior of getPhoneType and does not check for voice capable. This allows code to assume the old behavior. bug: 3198435 Change-Id: I0542838ceca2f757cceb6cd7f795e95fe886523e
* Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.Wink Saville2011-01-311-0/+3
| | | | | bug: 3198435 Change-Id: I1a19863c106a9394dbc941f396400e31dca95b92
* Merge 6b739dc7 from gingerbreadJean-Baptiste Queru2011-01-291-1/+0
|\ | | | | | | Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
| * Add some network types that OEM's are asking for.Robert Greenwalt2011-01-281-1/+4
| | | | | | | | | | | | | | | | Adding them hidden so that if OEM's are rolling their own at least they can use the same values. Will mark them unhidden in a future sdk release. bug:3395729 Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
* | Block SMS service for non-sms-capable device.John Wang2010-12-101-0/+16
| | | | | | | | | | | | | | | | | | | | If device doesn't support sms service, SMSDispatcher will ignore incoming SMS in dispatching messge and return ERROR_NO_SERVICE in sending sms messgae. bug: 3250029 bug: 3038102 Change-Id: Ic72a9192aa128c43cf31da04907620bc680656c6
* | Merge "Add iDEN to getNetworkTypeName."John Wang2010-12-091-0/+2
|\ \
| * | Add iDEN to getNetworkTypeName.John Wang2010-12-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For bug 2667143. Integrated Digital Enhanced Network (iDEN) is a mobile telecommunications technology which provides its users the benefits of a trunked radio and a cellular telephone. Change-Id: I4a1f5dbdd22a2c4ce5252688053ec4a47805d6b9
* | | Modify emergency number detectionNick Kralevich2010-12-071-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | It's possible for an application to dial an emergency number by appending extra digits to the phone number. For example, one could dial "9111" instead of "911", and a strict .equals wouldn't detect this as an emergency number. Replace .equals() with .startsWith() Change-Id: I87f34fc2b9bbee2c4fa6be511bcc3b955559e0a9
* | resolved conflicts for merge of 8484e57f to masterJean-Baptiste Queru2010-11-222-1/+328
|\ \ | | | | | | | | | Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653
| * \ resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aospJean-Baptiste Queru2010-11-222-1/+328
| |\ \ | | | | | | | | | | | | Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
| | * | Enabling cell broadcast (SMS-CB) support in the platform.Henrik Hall2010-11-192-1/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a simple API enabling applications to control SMS-CB reception. Implementing parsing, assembly and dispatching of SMS-CB messages over GSM. Change-Id: Iee841605a45a3af60c7602af175056afb03a38da
* | | | Cleanup some debug output.Wink Saville2010-11-161-3/+3
| | | | | | | | | | | | | | | | Change-Id: Iac39e7ffb1f7409647ce112f9347c42d2909846a
* | | | Fix data state change callbacksRobert Greenwalt2010-11-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial state should be unknown or we miss the first connected change. Don't send a disconnected msg when changing network types. Filter out redundent disconnects. Add some logging. bug:3060742 Change-Id: Idc797c1276b7417337a91ed60b12b1bf392d57c0
* | | | Add some network/phone type constants.Robert Greenwalt2010-11-032-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for LTE (and SIP-based voice) and the stepping-stone eHPRD. bug:3125398 Change-Id: Ied3d96fa09d9c758a82a2fd1817f55db711d1a4f
* | | | Add PhoneStateListener.onOtaspChanged.Wink Saville2010-11-011-0/+31
| | | | | | | | | | | | | | | | | | | | Bug: 3102320 Change-Id: I46e8d33a4ed80e5e074e92135653d57598d4c865
* | | | am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from ↵David Brown2010-10-111-1/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | SipPhone Merge commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3' * commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3': Don't manually create CallerInfo objects from SipPhone
| * | | am d07833f5: Don\'t manually create CallerInfo objects from SipPhoneDavid Brown2010-10-101-1/+8
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit 'd07833f54b6e8e361b666ae16efa15fdf60159de' into gingerbread-plus-aosp * commit 'd07833f54b6e8e361b666ae16efa15fdf60159de': Don't manually create CallerInfo objects from SipPhone
| | * | Don't manually create CallerInfo objects from SipPhoneDavid Brown2010-10-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the SipPhone class manually creates a CallerInfo object, and populates it with very basic info from the SIP address, when making an outgoing call. But this is no longer needed, now that we do caller-id lookup properly for SIP addresses (based on real data from the contacts database -- see bug 3004127 and change https://android-git.corp.google.com/g/70555). And in fact the presence of this initial CallerInfo object actually *disabled* contacts lookup for outgoing calls (bug 3072731). This change removes all that CallerInfo-related stuff from SipPhone. (Thus SipPhone is now consistent with the other phone objects, like GSMPhone and CDMAPhone, in that it doesn't muck with CallerInfo data at all, but instead lets the phone app do it.) Also, update isUriNumber() to handle "%40" in case the passed-in string is URI-escaped. (Nobody depends on that now, but it may be needed in the future, and it's certainly safe to say that "%40" will never be found in a legal PSTN number.) TESTED: - Outgoing SIP call: - In-call UI shows correct contact info - After the call, Call Log shows correct contact info - Incoming SIP call: - In-call UI shows correct contact info - After the call, Call Log shows correct contact info - PSTN calls: - correct contact info everywhere Bug: 3072731 Change-Id: I51434e4e5ad66d2e8ff51fc220001fb74485f0f5
* | | | am b30f2188: am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into ↵jsh2010-09-151-1/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94' * commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94': Unhide GsmCellLocation.getPsc().
| * | | am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbreadjsh2010-09-141-1/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4' into gingerbread-plus-aosp * commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4': Unhide GsmCellLocation.getPsc().
| | * | Unhide GsmCellLocation.getPsc().jsh2010-09-141-1/+3
| | | | | | | | | | | | | | | | | | | | bug: 2465036 Change-Id: If071c4e0f1f3484c010ec908b02800361cbf8a86
* | | | Support MBCS characters in contacts and SMS messages that are stored in SIM ↵Sang-il, Lee2010-09-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | cards. Change-Id: I0438c5748a47512fc2a0e4b89ac85e30e3f5c6de
* | | | am 4f24aed2: am 66907078: Merge "Fix the dialing from contact for internet ↵Chung-yih Wang2010-09-081-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | address." into gingerbread Merge commit '4f24aed2a13d9ba89e2402894353176e19571e6e' * commit '4f24aed2a13d9ba89e2402894353176e19571e6e': Fix the dialing from contact for internet address.
| * | | am 66907078: Merge "Fix the dialing from contact for internet address." into ↵Chung-yih Wang2010-09-081-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp * commit '669070787cc10377c2e5c3fa187babc728d96245': Fix the dialing from contact for internet address.
| | * | Fix the dialing from contact for internet address.Chung-yih Wang2010-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | the bug is http://b/issue?id=2982290 +Log outbound proxy address if exists for debugging.
* | | | Added new method to format the phone number when neccessary.Bai Tao2010-08-301-1/+45
| | | | | | | | | | | | | | | | Change-Id: I90fb38c1d36dc1ccf7eaa3b4cc34cd29f5151493
* | | | am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to ↵Wink Saville2010-08-241-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | return MEID or ESN. Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2' * commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2': Change CDMAPhone.getDeviceId to return MEID or ESN.
| * | | am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.Wink Saville2010-08-201-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e' into gingerbread-plus-aosp * commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e': Change CDMAPhone.getDeviceId to return MEID or ESN.
| | * | am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.Wink Saville2010-08-201-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b' into gingerbread * commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b': Change CDMAPhone.getDeviceId to return MEID or ESN.
| | | * | Change CDMAPhone.getDeviceId to return MEID or ESN.Wink Saville2010-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows devices with only ESN's to work. bug: 2938223 Change-Id: I33939151c59f598b939e73d98f1178669d6ceb75
* | | | | Move the "voice_capable" resource into the framework.David Brown2010-08-181-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's currently a config.xml param in the phone app saying whether the current device is "voice capable", which is used to determine (among other things) whether the OTASP call should run in interactive mode. But both Contacts and Settings are about to need this flag too, so it really belongs in the framework instead. As of this change it's now "com.android.internal.R.bool.voice_capable". Also add a corresponding TelephonyManager call so that unbundled and 3rd party apps can access it too. Change-Id: Ie9a8803295bf97eb32154291aac8fce1e21c7b25
* | | | | resolved conflicts for merge of 31202b1a to masterJake Hamby2010-08-161-6/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Ia8ae32c5ebcd13843ed9cc82c80bf551b38e586f
| * | | | am 3f442ece: Merge "Fix character count bug and Javadoc typos in SMS (with ↵Jake Hamby2010-08-131-6/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test cases)" into gingerbread Merge commit '3f442ece257d416b48f7803a4cc263f0215faa0d' into gingerbread-plus-aosp * commit '3f442ece257d416b48f7803a4cc263f0215faa0d': Fix character count bug and Javadoc typos in SMS (with test cases)
| | * | | Fix character count bug and Javadoc typos in SMS (with test cases)Jake Hamby2010-08-131-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a character count bug I discovered while working on related SMS bugs. Includes a new set of test cases to verify the fix for the buggy calculateLength() methods ("runtest frameworks-telephony"). You can also verify that the counter works properly in the Mms app by typing characters until the boundary is crossed where an additional message part is required. The counter should count down to 0 characters remaining before increasing the message count. Change-Id: I4de68b82dfc53dcae094865798f2c0235a355d43
* | | | | Keep the '+' when normalizing the phone numberDmitri Plotnikov2010-08-131-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I24731735ed18dbc92a643a0d99d35a1b58be40c8
* | | | | am 2835391c: am 686a9505: Merge "Update switch call and accept call." into ↵John Wang2010-08-121-0/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '2835391c1709a2b655940200dab0fc74ef08512d' * commit '2835391c1709a2b655940200dab0fc74ef08512d': Update switch call and accept call.
| * | | | am 686a9505: Merge "Update switch call and accept call." into gingerbreadJohn Wang2010-08-121-0/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '686a95055896c221c62fe7f4c3dda137809df91e' into gingerbread-plus-aosp * commit '686a95055896c221c62fe7f4c3dda137809df91e': Update switch call and accept call.
| | * | | Update switch call and accept call.John Wang2010-08-121-0/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifdd1af77e3eca08f6c931605ecfb275835b78709
| * | | | am 82cadee3: Merge "Add support for PSC of serving cell." into gingerbreadjsh2010-08-041-3/+25
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '82cadee3ca830315c617dfdbf3a8eef207c58436' into gingerbread-plus-aosp * commit '82cadee3ca830315c617dfdbf3a8eef207c58436': Add support for PSC of serving cell.