1538 Commits

Author SHA1 Message Date
Ramesh Sudini
910e80478d Disconnect ApnContexts in INITING state when error.
When DCT tears down a link due to error, the ApnContexts which are in INITING state are
not torndown. Due to this the DC refCount does not hit 0, and the Data Link is not torndown.

Bug: 4973894
Change-Id: If1263f360d55f6874220235fede294909db4837e
2011-07-07 16:35:52 -07:00
Kazuhiro Ondo
378a4380f2 Reset FAILED ApnContext state to IDLE on data setup triggers
Make sure FAILED ApnContext state is reset to IDLE regarless of
existence of the reconnect alarm. This is to let FW re-evaluate
call setup conditions properly on data setup triggers.

Bug: 4989604
Change-Id: Ia9ec439db1df03bbd2e56803d3558542ba5f5400
2011-07-06 18:45:06 -07:00
Kazuhiro Ondo
c8e2916d0b Bring back ERI into CDMA-LTE mode
Use ERI mechanism for roaming determination in CDMA-LTE mode.
Also display SPN name from CSIM card as "SPN" field in the status bar.
PLMN field will be derived from ERI text as done in original CDMA phone.

Bug: 4970448
Change-Id: I21382b15e148a8451f4c3fcbbb5d1ed296e41b5a
2011-07-06 17:30:52 -07:00
Kazuhiro Ondo
012b86d429 DataConnection was cleaned up too early if it's already disconnecting
Fix one logic failure introduced in patch for bug 4901019.

Bug: 4970726
Change-Id: Ifc4071b1cbf0c19fbd8356d7dcc16f9df39d4b54
2011-06-30 17:26:54 -07:00
Robert Greenwalt
a2267451dd Don't ever report a null ServiceState
Report out of service if we don't know any better.  Sometimes when switching radios
we were finding nulls reported - it crashed some code and highlighted this problem.
If we don't have a service state we're certainly out of service, so this isn't a lie.

bug:4553701
Change-Id: I094798a5f9f39f45c0ba30179aaa8f88f9b3e405
2011-06-30 12:42:57 -07:00
Kazuhiro Ondo
f3f9967e22 Make sure to update data availability in call setup capable triggers.
As "startUsingNetworkFeature()" now can trigger the initial data
connection instead of default data, FW needs to make sure each
MobileDataStateTracker is updated with the data availability
on each "data-setup capable" trigger.

Bug: 4970825
Change-Id: I6a7e479ecc1534cd723a2e8beece6b8bcd398ea7
2011-06-29 15:37:26 -07:00
Robert Greenwalt
dbcc57c6f1 Fix dependencyMet issues regarding hipri APN.
If the system says a dependency isn't met for accessing the default APN,
apps should not be able to turn on the hipri APN either.  This change
prevents apps from adjusting the dependencyMet setting on hipri and
internally ties its dependencyMet to that of the default APN.

bug:4643411
Change-Id: I7e609ff9bb1b85a3a6a41095052f0194d03be979
2011-06-29 14:28:53 -07:00
Kazuhiro Ondo
1e5c72c704 Data connection retry pattern could be broken by PDP sharing
If a DataConnection is pending re-connect alarm, the new request
from another ApnContext sharing the same DC could disrupt
the re-connection pattern currently engaged.

This patch is to ensure the new request for PDP sharing
scenario will not trigger another SETUP_DATA request if
reconnection alarm is set in AlarmManager.

Bug: 4901019
Change-Id: I98b0d9af8b58fb880efdbc0246009de5cb116a54
2011-06-27 15:12:21 -07:00
Wink Saville
4d9261fad3 Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE 2011-06-21 19:32:36 -07:00
Wink Saville
64a09341d8 Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE 2011-06-21 19:32:25 -07:00
Wink Saville
aef70d3f73 Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE 2011-06-21 19:32:16 -07:00
Kazuhiro Ondo
7c2d6fd60d Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
Bug: 4764057
Change-Id: I0c7d6e2af6a597d70d2024205d358e8b9c56b57b
2011-06-21 18:02:51 -07:00
Wink Saville
d1ec23c206 Use dataConnectionNotInUse to decide if a DC is free.
Change-Id: I89cb2f46dca59d5738dd16eb657104c3158ebcd2
2011-06-21 17:58:45 -07:00
Kazuhiro Ondo
e0acd0842f Special retry back-off timer in call setup failure.
RIL might specify a special retry back-off timer only used for
temporary in a certain error scenario. This patch will be adding
new handling of "retry" override so RIL specified retry timer
can be used instead of the pre-configured one.

Bug: 4723641
Change-Id: Ia4784f022a029c79b35c4c4c01ad7e49efd56a3c
2011-06-21 16:17:03 -07:00
Kazuhiro Ondo
e303d7b318 Fix handling of unsol_data_state_change with PDP sharing scenario
The original logic was to go through each ApnContext to find
changes on the DataConnection if applicable. This was causing
an issue when an DC is shared by multiple ApnContexts. Only
the first ApnContext associated with the updated DC was detecting
the link properties change.

The change in this patch is to go through the changes by DC instead
of ApnContext. And make sure the update on a DC is propagated to
all associated ApnContexts.

Bug: 4744006
Change-Id: Ie52d62d1d5671005f9e74b1ddc24822c9013e3e4
2011-06-21 16:14:03 -07:00
Robert Greenwalt
4906376f58 Just a random fix.
Don't re-lookup something - use the local holding the early lookup.

Change-Id: I6d9fac89651c99a84060238c8a6f6a936b1167ea
2011-06-20 14:15:56 -07:00
John Wang
c6b32054c6 am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
  Revert "Do not merge. Return null id for Non-phone device."
2011-06-16 16:50:05 -07:00
John Wang
fe9aa2706f Revert "Do not merge. Return null id for Non-phone device."
This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42
2011-06-16 16:30:02 -07:00
John Wang
ff42c04d15 Merge "Support SIM permanently disabled state." into honeycomb-LTE 2011-06-16 11:22:53 -07:00
Wink Saville
1146bddf92 Merge "Always clear settings when entering Inactive state." into honeycomb-LTE 2011-06-15 14:31:16 -07:00
Wink Saville
eddc3a579c Clean up some debug statements.
Change-Id: Id60020f09dd858f2d2c83bdd8f8d4384e5bfc934
2011-06-15 13:45:29 -07:00
Wink Saville
0e765f8b73 Always clear settings when entering Inactive state.
Change-Id: I500b60a8122b790d60dbff5960b8c32500704b40
2011-06-15 06:41:21 -07:00
John Wang
b0b24b3df5 Support SIM permanently disabled state.
SIM card can get permanently disabled due to too many
PUK retries. The PERM_BLOCKED pin state of SIM application
represents this state.

This change decodes permanent disabled state and broadcasts it
via ICC_ABSENT intent with PERM_DISABLED reason. It also update
the lockscreen to show the prompt message.

bug:4392059
Change-Id: I5e60dd65f48f42aa2e54db4cdebf803d6e666b99
2011-06-14 16:50:03 -07:00
Wink Saville
fbef26eb55 Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 2011-06-14 14:44:31 -07:00
Wink Saville
c2d17d3bea Merge "Make APN re-connect delay configuable" into honeycomb-LTE 2011-06-14 14:44:23 -07:00
Kazuhiro Ondo
98e1e28f30 Enforce provision check for CSIM record only.
Change-Id: I94bb6dd9191b24b0bd8c0e7d6267de5cd4b82be8
2011-06-14 13:55:24 -07:00
Kazuhiro Ondo
c65d52b148 Make APN re-connect delay configuable
Add configurability on hard coded timer.

Change-Id: Ic9a6ee43d9da3bd45f862aa3a21f05d836b402e3
2011-06-14 13:54:33 -07:00
Kazuhiro Ondo
23f646367d Revert "CDMALTE: Get roaming status based on SID/NID"
This reverts commit 3fc9055c7f3bc25948f17bc29582abae72fe7de1.
2011-06-14 13:53:39 -07:00
John Wang
2addaf97b3 Merge "Add toString for IccCard Status and App." into honeycomb-LTE 2011-06-10 17:19:42 -07:00
John Wang
c7a58b4de0 Add toString for IccCard Status and App.
Enhance the debug info for GET_SIM_STATUS. Print out the
Card status and App status instead of Object id. It helps
to debug PUK lock and other SIM related issues.

Change-Id: I489f3933529a9719827a8799c41de8e999db6b40
2011-06-09 19:10:12 -07:00
Kazuhiro Ondo
3fc9055c7f CDMALTE: Get roaming status based on SID/NID
Change-Id: Iec70f2036c1c698331696ff9869bfb057604c637
2011-06-09 16:42:18 -07:00
Kazuhiro Ondo
e9b46c3ac5 Set locale based on SIM preferred language.
Unless user had selected a desired locale, EFli or EFpl will be
used to decide the locale to be used.

Note this locale setting is not persistent - only valid while
SIM card is present.

Change-Id: I1f3945f7bc02624dff94b90e7f1a658a136033e8
2011-06-09 12:05:26 -07:00
Wink Saville
799f04c09c Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE 2011-06-08 15:00:46 -07:00
John Wang
cea03df201 Do not merge. Return null id for Non-phone device.
For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
2011-06-08 13:10:22 -07:00
Kazuhiro Ondo
2e994586ed Report data status from ApnContext even if data is detached
While in HO, data connection type may temporary become "unknown".
This triggers TelephonyRegistry picks up the wrong data connection
state, ending up notifying bogus state to ConnectivityService.

The patch is just to pick up the status from ApnContext which
should be maintaining the right state. Also cleaned up unnecessary
lines which was added earlier phase.

Change-Id: I07e74ce55f09ad31f2d8d09e2a144dc0b600eb0c
2011-06-08 13:05:32 -07:00
Kazuhiro Ondo
53f67f7e9d Use CSIM to get provision information
In case of LTE & CDMA hybrid system, provision information will be
read from CSIM records.

Also CSIM records can be updated over the air. No data connection
attempt should be made until CSIM provisioning is notified
via SIM_REFRESH event.

Change-Id: I001db48d07d90af22104cb958df638e15e0d494a
2011-06-08 12:59:22 -07:00
Wink Saville
a558fdf156 Merge "Fix default preferred network." into honeycomb-LTE 2011-06-08 12:56:27 -07:00
Wink Saville
d6bcfd1cd0 Fix default preferred network.
Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp
returns OTASP_NOT_NEEDED.

Some cleanup.


Bug: 4531115
Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a
2011-06-08 12:18:07 -07:00
John Wang
fc94d45fc2 Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 2011-06-07 15:49:34 -07:00
John Wang
e19736f052 Make getDeviceId return null for Non-phone device.
For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
2011-06-07 15:37:09 -07:00
Robert Greenwalt
5df69fad6e resolved conflicts for merge of 8de47a2f to honeycomb-LTE
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
2011-06-07 12:45:41 -07:00
Wink Saville
05d69edc0b Preferred network discrepancy after rild is restarted.
If the preferred network had updated before rild restarts,
the new setting value is ignored on RIL_CONNECT event.

bug: IKXEVERESTLTE-1494
Change-Id: Iec6395187c0d749208904db857b80e28f7d92c21
2011-06-07 10:44:43 -07:00
Robert Greenwalt
80a19e67d1 Merge "Promote Telephony's isDataPossible." into honeycomb-LTE 2011-06-03 15:42:48 -07:00
John Wang
3b71239aca Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE 2011-06-03 14:01:59 -07:00
Kazuhiro Ondo
77c9411306 Data recovery failure due to apn/dc state stuck in "disconnecting"
If rild is reset while RIL_DEACTIVATE_DATA_CALL is pending
response, the ApnContext is not force cleaned up since
link to DCAC is cleared in the begining of release.

This patch fixes:
1) Hold DCAC reference until the DC is disconnected. This is
   to ensure DC won't be stuck in DcDisconnectingState so force
   reset can kick in.
2) In "clearCleanUpConnection", make sure the status of ApnContext
   can be reset to IDLE even if no reference to DCAC.

Change-Id: Ic69271da7c6bc9dcb2c38ec53a9bd2e8ce785adc
2011-06-03 11:42:48 -07:00
Robert Greenwalt
352dbc44a4 Promote Telephony's isDataPossible.
bug:3481357
Change-Id: I83cb40cd5bb86d98abbb7152190b2277470fa160
2011-06-03 09:51:03 -07:00
Wink Saville
db09b5db60 Refactor ServiceStateTracker handling of radio technology.
Also add a little more debugging.

Change-Id: I832872c876b290a3e83a79068059a21894472a1d
2011-06-03 09:06:28 -07:00
Wink Saville
2e543dc188 Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE 2011-06-02 18:21:50 -07:00
John Wang
98c7781ca8 Add supplyPuk to do SIM puk unlock.
Change-Id: I48654091ac3133a0c405448871b0a2f1ed3ded4b
2011-06-02 17:49:49 -07:00
Kazuhiro Ondo
c46a085eed Read CSIM records in LTE on CDMA mode
In case of CDMA and LTE hybrid system, UICC card contains
both USIM and CSIM data. FW needs to read out from both
to aqcuire information required for the service.

Change-Id: I4a714252bc97c037fa419352f23d8f38f6206406
2011-06-02 14:04:24 -07:00