summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Collapse)AuthorAgeFilesLines
* am cc41b92e: am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: ↵Wink Saville2010-12-081-0/+11
|\ | | | | | | | | | | | | Release wakelock on RIL request send error" * commit 'cc41b92ed7e66cc5d4e14f22b3ea914175d662ec': frameworks/base/telephony: Release wakelock on RIL request send error
| * am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock ↵Wink Saville2010-12-081-0/+11
| |\ | | | | | | | | | | | | | | | | | | on RIL request send error" * commit '0a5ae453e50144b31c7f544714feb5bbc7b77d18': frameworks/base/telephony: Release wakelock on RIL request send error
| | * am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL ↵Wink Saville2010-12-081-0/+11
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | request send error" * commit '7f7474ddd6170b68b8b58cc03b75df85c96f08f2': frameworks/base/telephony: Release wakelock on RIL request send error
| | | * Merge "frameworks/base/telephony: Release wakelock on RIL request send error"Wink Saville2010-12-081-0/+11
| | | |\
| | | | * frameworks/base/telephony: Release wakelock on RIL request send errorAnshul Jain2010-12-081-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android telephony does not release the partial wakelock right away if there is an error in sending the RIL request. The wake lock is released only after EVENT_WAKE_LOCK_TIMEOUT occurs that prevents the phone to go in power collpase. The change is to release the wake lock as soon as the error in send is detected. Also, change RIL#send not not send a request if there is no connection to vendor RIL, as the request will always fail. Change-Id: Ia39a4b9ac12f4064e301a65abfd26409d49babe1
* | | | | Merge "Modify emergency number detection"Nick Kralevich2010-12-081-2/+2
|\ \ \ \ \
| * | | | | 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
* | | | | | am d9c7fde9: am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read ↵Wink Saville2010-12-071-0/+149
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 3GPP2 sms from CSIM/RUIM" * commit 'd9c7fde961dbb78f980be08b9be77b929630c897': Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
| * | | | | am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms ↵Wink Saville2010-12-071-0/+149
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | from CSIM/RUIM" * commit 'a00d89e824c523c51955176b61e50472828fd8b1': Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
| | * | | | am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"Wink Saville2010-12-071-0/+149
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit '2b858caecb3c293c47b48eed12a55a49e3039874': Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
| | | * | | Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"Wink Saville2010-12-071-0/+149
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Telephony: Add support to read 3GPP2 sms from CSIM/RUIMRekha Kumar2010-11-021-0/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add parser to parse 3GPP2 format sms stored in CSIM/RUIM card Change-Id: I4720ba7602fcc1b078de0d5fea34247541242c1c
* | | | | | Have MobileDataStateTracker & DataConnectionTracker communicate directly.Wink Saville2010-12-073-24/+66
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added CMD_SET_DATA_ENABLE which is sent when data is enabled/disabled via the ConnectivityService. It is anticipated that the communication channel will be used for additional commands and to receive unsoliciated commands from DataConnectionTracker back to MobileDataStateTracker. Change-Id: I3863e7385155d503f069b1dcb7e4f766ec78b5f8
* | | | | am c9cc9ab5: am 5f86d7f5: Merge "Fix SIP bug of different transport/port ↵Chung-yih Wang2010-12-061-1/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | used for requests." into gingerbread * commit 'c9cc9ab590ef879877e466c0b5f5823e11bb4c47': Fix SIP bug of different transport/port used for requests.
| * | | | am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for ↵Chung-yih Wang2010-12-061-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requests." into gingerbread * commit '5f86d7f50beba9f6327b8a04defe4e989a153d4a': Fix SIP bug of different transport/port used for requests.
| | * | | | Fix SIP bug of different transport/port used for requests.Chung-yih Wang2010-12-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: http://b/3156148 Change-Id: I4fa5b274d2e90ebde12d9e99822dc193a65bad32
* | | | | | Block incoming calls for non-voice-device.John Wang2010-12-061-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For bug 3038102. Non-voice capable means that this device doesn't support circuit-switched phone calls over the telephony network. It blocks the new ringing notification at PhoneBase level. Change-Id: Ibef28dadae222c7ad169ee59e5c11a2c93e60e93
* | | | | | Add reason field to DEACTIVATE_DATA_CALL request.Kazuhiro Ondo2010-12-027-103/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 323f059d65db8413ee2ca8ce04533bc00e4f84e4 introduced a side effect that PPP and MIP cannot be disconnected gracefully in case of 1X data calls. The new disconnect reason field in DEACTIVATE_DATA_CALL will help RIL and Modem to know whether the disconnect was done for modem shutdown or not. And the followings can be achieved at the same time. - Graceful PPP termination - MIP de-registration - RF Release Order with "Power Down De-registration" if modem is powered off. (Also cleaned up the deprecated functions for setup/deactivate default PDP) Change-Id: If79842ad05827326b6994e1148a6ae68b4467c45
* | | | | | am ae2a4419: am 4567847d: Add "canDial" check.John Wang2010-12-011-0/+30
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'ae2a44191188cde1dc4a1bbb0134d775f0dc4126': Add "canDial" check.
| * | | | | am 4567847d: Add "canDial" check.John Wang2010-12-011-0/+30
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '4567847d461afac08a80518637a0e48eff3c5247': Add "canDial" check.
| | * | | | Add "canDial" check.John Wang2010-12-011-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For bug #3164802. CallManager allow a new phone call only if ALL of the following are true: - Phone is not powered off - There's no incoming or waiting call - There's available call slot in either foreground or background - The foreground call is ACTIVE or IDLE or DISCONNECTED. Change-Id: I0124d600fd8c63b8c608301f3889b3faec47f1db
* | | | | | am ed34b244: am d7116ff1: Merge "Do not suppress error feedback during a SIP ↵Hung-ying Tyan2010-12-011-6/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call." into gingerbread * commit 'ed34b244f1665b604d2a291db504415b10a514d7': Do not suppress error feedback during a SIP call.
| * | | | | am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into ↵Hung-ying Tyan2010-11-301-6/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'd7116ff1f0d1a3c14992273d0b899c3b71ba6d3f': Do not suppress error feedback during a SIP call.
| | * | | | Merge "Do not suppress error feedback during a SIP call." into gingerbreadHung-ying Tyan2010-11-301-6/+0
| | |\ \ \ \
| | | * | | | Do not suppress error feedback during a SIP call.Hung-ying Tyan2010-11-301-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3124788 Change-Id: Ia0a06f72336d1795515428eba0c9f875c32d13d1
* | | | | | | am 4c11eee7: am 04639ba0: Reduce the outrageous verbosity of ↵David Brown2010-12-011-22/+35
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CallerInfo.toString(). * commit '4c11eee7ec3dafe943af7f4222e29b550163e58c': Reduce the outrageous verbosity of CallerInfo.toString().
| * | | | | | am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().David Brown2010-11-301-22/+35
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '04639ba0a939988d00131e61458807dac650f9c3': Reduce the outrageous verbosity of CallerInfo.toString().
| | * | | | | Reduce the outrageous verbosity of CallerInfo.toString().David Brown2010-11-301-22/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3121292 Change-Id: Ia8383891ef29a003acbd627b25ce87a187ef95c0
* | | | | | | am b9c19be7: am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown ↵David Brown2010-12-011-28/+90
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly for SIP calls" into gingerbread * commit 'b9c19be7c198dcdac7a37ea4af901af5179933d9': Fix bug 3121292: Contact photo not shown correctly for SIP calls
| * | | | | | am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for ↵David Brown2010-11-301-28/+90
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SIP calls" into gingerbread * commit '91abcb624a6a873a2becbbf0f8186d6533daeb89': Fix bug 3121292: Contact photo not shown correctly for SIP calls
| | * | | | | Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" ↵David Brown2010-11-301-28/+90
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | | | Fix bug 3121292: Contact photo not shown correctly for SIP callsDavid Brown2010-10-261-28/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when we did a contact lookup based on a SIP address, the resulting CallerInfo object did not have the person_id field set correctly. That meant we had no way to look up the photo for that person. This was because of a missing case in the logic to determine which column (in the resulting cursor) to use for the person_id lookup. We were handling lookups fine in the PhoneLookup and Phone tables, but were missing a case for direct lookups in the Data table (which is how we look up SIP addresses.) The fix is to add a case for URIs like "content://com.android.contacts/data" when looking up the person_id. Also, since the person_id lookup is pretty hairy (and includes ~20 lines of comments to explain what it's doing!) refactor it out into a helper method. TESTED: Both SIP and PSTN calls; verified that contact name *and* photo are displayed correctly in all cases. Bug: 3121292 Change-Id: I2b0083cc5394c1a49bbdc9a4e5651854aedb82f7
| * | | | | | | am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into ↵Wink Saville2010-11-301-12/+18
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'f316679971be356dbb01f991e95742bc5f2a8383': Fix GSM permanent failure handling, DO NOT MERGE.
| | * | | | | | Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbreadWink Saville2010-11-301-12/+18
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Fix GSM permanent failure handling, DO NOT MERGE.Wink Saville2010-11-171-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wait until all APN's have been tried before checking for permanent errors and then, don't do retires only if all of the APN's had permanent errors. Also, don't disable the requested apn type because if we do we won't be able to setup data because there won't be an apn type. This was tested by creating a new non existent APN, I chose: Name="badapn1" APN="badapn1" Server="noapn.com" Then selecting "badapn1" will cause a permanent error. bug: 3202729 Change-Id: I182c7197456c849176ce08d7d1459359f8c3b30e
* | | | | | | | am 0e58a952: am 0bba9535: Merge "Throw proper exceptions in SipManager" into ↵Hung-ying Tyan2010-11-301-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '0e58a9529895e270dae90e69486a59e41de714b8': Throw proper exceptions in SipManager
| * | | | | | | am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbreadHung-ying Tyan2010-11-301-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | | * commit '0bba9535413f9ceefe03f1cef9ddaddccd05cae5': Throw proper exceptions in SipManager
| | * | | | | Merge "Throw proper exceptions in SipManager" into gingerbreadHung-ying Tyan2010-11-301-2/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Throw proper exceptions in SipManagerHung-ying Tyan2010-11-031-2/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of silently returning null and causing NPE in applications as returning null is not documented in the javadoc. Add connection to the connection list in SipCall after dial() succeeds so that we don't need to clean up if it fails. The original code will cause the failed connection to continue to live in the SipCall and in next dial() attempt, a new connection is created and the in-call screen sees two connections in the call and thus shows conference call UI. Bug: 3157234, 3157387 Change-Id: Iabc3235f781c4f1e09384a67ad56b09ad2c12e5e
* | | | | | Make the internal data-disable mechanism internalRobert Greenwalt2010-11-299-104/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Break links to the outside world and limit its use. A new public, persisted and separate mechanism will be coming soon. Change-Id: Ia51a663125f7fe583e6d5d93bc2253f4e318847b
* | | | | | Use apn types instead of host when sending notifications.Wink Saville2010-11-246-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were passing the apn host not the type and this caused us to sometimes not send out network change notifications. Also rename of getActivceApn to getActiveApnHost to make the method clearer on what is being returned and add some debug. A future change will rename ApnSetting.apn to ApnSetting.host and getActiveApnString. bug: 2995554 Change-Id: I0c405b0f823f62c9596968c8516b820d9f8a94f2
* | | | | | Promote ActiveApn and methods to DataConnectionTracker.Wink Saville2010-11-243-63/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, add getActiveApnType. Change-Id: If44d2c35617a1ad385a7e5b7c1028751ded3ead2
* | | | | | Merge "Promote ApnSetting to com.android.internal.telephony."Wink Saville2010-11-246-17/+16
|\ \ \ \ \ \
| * | | | | | Promote ApnSetting to com.android.internal.telephony.Wink Saville2010-11-236-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8244331c123ccb33704dd7ae8342327a1a3f7124
* | | | | | | resolved conflicts for merge of 8484e57f to masterJean-Baptiste Queru2010-11-2211-1/+1064
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653
| * | | | | resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aospJean-Baptiste Queru2010-11-2211-1/+1064
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
| | * | | | Enabling cell broadcast (SMS-CB) support in the platform.Henrik Hall2010-11-1911-1/+1064
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Remove pingtest in GsmDataConnectionTracker.Wink Saville2010-11-202-48/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pingtest have been disabled since petit-four and ping's use is being deprecated. Removing the ping test code, if needed use InetAddress.isReachable instead. bug: 1824738 Change-Id: I42b3de85b67b82dc6389e7a2234afa7b1d687209
* | | | | | Notify all VMs when proxy changes.Robert Greenwalt2010-11-191-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:2700664 Change-Id: I74cc6e0bd6e66847bf18f524ce851e3e9d2c4e87
* | | | | | Use TextUtils.isEmpty to simplify code.Wink Saville2010-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I189c7c124419373c747c42504e656343728d0a15