1184 Commits

Author SHA1 Message Date
John Wang
a347afb90f Merge "Notify voicemail only for voice-capable device." 2010-12-10 16:55:36 -08:00
John Wang
e98ca4a858 Notify voicemail only for voice-capable device.
Only allow voicemail waiting notification for
device supporting voice-capable service.

Bug: 3038102
Change-Id: I7ee1f973755f007cdcd87c4326bc55229a575598
2010-12-10 16:07:32 -08:00
John Wang
9c1d5e997f Merge "Block SMS service for non-sms-capable device." 2010-12-10 16:05:51 -08:00
John Wang
c049f9ad5b Block SMS service for non-sms-capable device.
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
2010-12-10 15:29:03 -08:00
Wink Saville
ffbce12056 Make activation rejection a non-permanent error.
Removed ACTIVATION_REJECT_GGSN and ACTIVATION_REJECT_UNSPECIFIED from
DataConnection#isPermanentFail() so they won't be detected as permanent.


bug: 3070773
Change-Id: I18d10bc44609e550d7932cd9600116f074bcb8dd
2010-12-10 11:09:47 -08:00
Wink Saville
41cb9d10de am a7404130: am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit 'a740413022baca3d2bc365ade40f73a1fee46654':
  Fix for phone app crash in Icc Card.
2010-12-09 14:06:35 -08:00
Wink Saville
a740413022 am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit 'd0ffef4b43594e540cb867da18d4403b4f583622':
  Fix for phone app crash in Icc Card.
2010-12-09 14:02:09 -08:00
Wink Saville
d0ffef4b43 am 19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit '19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
  Fix for phone app crash in Icc Card.
2010-12-09 13:58:26 -08:00
Wink Saville
19b23afadf Merge "Fix for phone app crash in Icc Card." 2010-12-09 13:50:28 -08:00
John Wang
488a0d5ece Merge "Add iDEN to getNetworkTypeName." 2010-12-09 12:53:01 -08:00
Wink Saville
3345f27fbf am cc41b92e: am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit 'cc41b92ed7e66cc5d4e14f22b3ea914175d662ec':
  frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 22:00:58 -08:00
Wink Saville
cc41b92ed7 am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '0a5ae453e50144b31c7f544714feb5bbc7b77d18':
  frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 21:57:03 -08:00
Wink Saville
0a5ae453e5 am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
  frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 21:53:24 -08:00
Wink Saville
7f7474ddd6 Merge "frameworks/base/telephony: Release wakelock on RIL request send error" 2010-12-08 21:37:38 -08:00
Uma Maheswari Ramalingam
cc7605ce61 Fix for phone app crash in Icc Card.
- Check for active phone in ICC handler before processing messages.

- Boundary check for gsm/cdma subscription app index
while retrieving the ICC Card App.

Change-Id: I3d54447e8d48e3482763e78eeb2a737a34cec321
2010-12-08 10:33:24 -08:00
Anshul Jain
60bb9c9a81 frameworks/base/telephony: Release wakelock on RIL request send error
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
2010-12-08 10:25:41 -08:00
Nick Kralevich
ba82088b13 Merge "Modify emergency number detection" 2010-12-08 10:08:22 -08:00
Wink Saville
055ed42e70 am d9c7fde9: am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
* commit 'd9c7fde961dbb78f980be08b9be77b929630c897':
  Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
2010-12-07 23:00:56 -08:00
Wink Saville
d9c7fde961 am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
* commit 'a00d89e824c523c51955176b61e50472828fd8b1':
  Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
2010-12-07 22:22:01 -08:00
Wink Saville
a00d89e824 am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
* commit '2b858caecb3c293c47b48eed12a55a49e3039874':
  Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
2010-12-07 22:18:14 -08:00
Wink Saville
2b858caecb Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" 2010-12-07 21:57:53 -08:00
Nick Kralevich
1234ce117a Modify emergency number detection
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
2010-12-07 11:27:20 -08:00
Wink Saville
e798268f16 Have MobileDataStateTracker & DataConnectionTracker communicate directly.
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
2010-12-07 10:31:02 -08:00
Chung-yih Wang
c030a164c8 am c9cc9ab5: am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
* commit 'c9cc9ab590ef879877e466c0b5f5823e11bb4c47':
  Fix SIP bug of different transport/port used for requests.
2010-12-06 23:36:23 -08:00
Chung-yih Wang
c9cc9ab590 am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
* commit '5f86d7f50beba9f6327b8a04defe4e989a153d4a':
  Fix SIP bug of different transport/port used for requests.
2010-12-06 22:10:29 -08:00
Chung-yih Wang
f053292d7a Fix SIP bug of different transport/port used for requests.
bug: http://b/3156148
Change-Id: I4fa5b274d2e90ebde12d9e99822dc193a65bad32
2010-12-07 10:36:19 +08:00
John Wang
4d76f36422 Add iDEN to getNetworkTypeName.
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
2010-12-06 10:25:52 -08:00
John Wang
d6c3838672 Block incoming calls for non-voice-device.
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
2010-12-06 10:25:52 -08:00
Kazuhiro Ondo
6ef74b1b07 Add reason field to DEACTIVATE_DATA_CALL request.
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
2010-12-02 16:15:22 -08:00
John Wang
447a2b014b am ae2a4419: am 4567847d: Add "canDial" check.
* commit 'ae2a44191188cde1dc4a1bbb0134d775f0dc4126':
  Add "canDial" check.
2010-12-01 11:20:56 -08:00
John Wang
ae2a441911 am 4567847d: Add "canDial" check.
* commit '4567847d461afac08a80518637a0e48eff3c5247':
  Add "canDial" check.
2010-12-01 11:10:42 -08:00
John Wang
4567847d46 Add "canDial" check.
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
2010-12-01 10:26:49 -08:00
Hung-ying Tyan
db4245291b am ed34b244: am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread
* commit 'ed34b244f1665b604d2a291db504415b10a514d7':
  Do not suppress error feedback during a SIP call.
2010-12-01 09:21:36 -08:00
David Brown
1cc52df752 am 4c11eee7: am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().
* commit '4c11eee7ec3dafe943af7f4222e29b550163e58c':
  Reduce the outrageous verbosity of CallerInfo.toString().
2010-12-01 09:21:22 -08:00
David Brown
a4d785688c am b9c19be7: am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
* commit 'b9c19be7c198dcdac7a37ea4af901af5179933d9':
  Fix bug 3121292: Contact photo not shown correctly for SIP calls
2010-12-01 09:20:58 -08:00
Hung-ying Tyan
ed34b244f1 am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread
* commit 'd7116ff1f0d1a3c14992273d0b899c3b71ba6d3f':
  Do not suppress error feedback during a SIP call.
2010-11-30 22:55:37 -08:00
Hung-ying Tyan
d7116ff1f0 Merge "Do not suppress error feedback during a SIP call." into gingerbread 2010-11-30 22:53:26 -08:00
David Brown
4c11eee7ec am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().
* commit '04639ba0a939988d00131e61458807dac650f9c3':
  Reduce the outrageous verbosity of CallerInfo.toString().
2010-11-30 18:11:21 -08:00
Hung-ying Tyan
ebf28fa3f0 am 0e58a952: am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread
* commit '0e58a9529895e270dae90e69486a59e41de714b8':
  Throw proper exceptions in SipManager
2010-11-30 16:23:54 -08:00
David Brown
04639ba0a9 Reduce the outrageous verbosity of CallerInfo.toString().
Bug: 3121292
Change-Id: Ia8383891ef29a003acbd627b25ce87a187ef95c0
2010-11-30 15:49:48 -08:00
David Brown
b9c19be7c1 am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
* commit '91abcb624a6a873a2becbbf0f8186d6533daeb89':
  Fix bug 3121292: Contact photo not shown correctly for SIP calls
2010-11-30 15:24:42 -08:00
David Brown
91abcb624a Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread 2010-11-30 15:20:45 -08:00
Wink Saville
2ebb3a2d9b am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
* commit 'f316679971be356dbb01f991e95742bc5f2a8383':
  Fix GSM permanent failure handling, DO NOT MERGE.
2010-11-30 11:46:34 -08:00
Hung-ying Tyan
0e58a95298 am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread
* commit '0bba9535413f9ceefe03f1cef9ddaddccd05cae5':
  Throw proper exceptions in SipManager
2010-11-30 11:46:01 -08:00
Wink Saville
f316679971 Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread 2010-11-30 08:15:41 -08:00
Hung-ying Tyan
4189d99b6e Do not suppress error feedback during a SIP call.
Bug: 3124788
Change-Id: Ia0a06f72336d1795515428eba0c9f875c32d13d1
2010-11-30 17:00:45 +08:00
Hung-ying Tyan
0bba953541 Merge "Throw proper exceptions in SipManager" into gingerbread 2010-11-30 00:51:22 -08:00
Robert Greenwalt
d576483787 Make the internal data-disable mechanism internal
Break links to the outside world and limit its use.
A new public, persisted and separate mechanism will be coming soon.

Change-Id: Ia51a663125f7fe583e6d5d93bc2253f4e318847b
2010-11-29 10:54:34 -08:00
Wink Saville
26f5a384d8 Use apn types instead of host when sending notifications.
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
2010-11-24 16:44:29 -08:00
Wink Saville
dd97d83ff7 Promote ActiveApn and methods to DataConnectionTracker.
Also, add getActiveApnType.

Change-Id: If44d2c35617a1ad385a7e5b7c1028751ded3ead2
2010-11-24 11:28:58 -08:00