1711 Commits

Author SHA1 Message Date
Wink Saville
051660d4d6 am deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
* commit 'deb62be2e87b19e9bbbc668f8d9327b12dba4a3b':
  Configure RAT dependent retry pattern in GSM DCT.
2011-07-24 09:13:26 -07:00
Kazuhiro Ondo
9820a9d299 am 4281817f: Allow suggestedRetryTime to indicate no retry is needed.
* commit '4281817f6b624cb51926eb24fa78c68cd9431dce':
  Allow suggestedRetryTime to indicate no retry is needed.
2011-07-24 09:11:42 -07:00
Wink Saville
deb62be2e8 Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE 2011-07-24 09:11:28 -07:00
Kazuhiro Ondo
4281817f6b Allow suggestedRetryTime to indicate no retry is needed.
If suggestedRetryTime is 0x7fffffff then no retry is needed
and the framework should not initiate a retry.

Bug: 4949208
Change-Id: I3756ef6a3e93beec4ee95863cbc111b9952e5e06
2011-07-24 08:10:53 -07:00
Kazuhiro Ondo
789df167fa Configure RAT dependent retry pattern in GSM DCT.
In case GSM DCT is used with EHRPD, retry pattern should follow
the ones for CDMA.

Bug: 5058426
Change-Id: Id9badc9ac14fb20ac62c1746061f056fa2f9ed1b
2011-07-23 13:48:12 -07:00
Kazuhiro Ondo
b7ad442c90 am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
* commit '1c82f56f2453a8a7c83090017ab2427a74829b9a':
  Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
2011-07-21 18:15:26 -07:00
Kazuhiro Ondo
1c82f56f24 Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
Fix to resolve conflicting ERI and CSIM SPN. CSIM SPN should be
only used when camping SID/NID is listed in CDMAHOME record.

Bug: 5057486
Change-Id: I6c5961bb53cc6257237fa5a93a0acd067b12d009
2011-07-21 17:04:58 -07:00
Kazuhiro Ondo
5abddc73a5 am bf361b59: Return IMEI SV if CDMA-LTE mode is used
* commit 'bf361b59e4e6c1c7c710e73260a77e9937f1fb59':
  Return IMEI SV if CDMA-LTE mode is used
2011-07-19 12:39:39 -07:00
Kazuhiro Ondo
bf361b59e4 Return IMEI SV if CDMA-LTE mode is used
IMEI and IMEI SV should be available in CDMA-LTE hybrid system.
IMS SV value is not yet returned.

Bug: 5042972
Change-Id: I733825e95f802605e06887951e226d26baea8ff2
2011-07-19 12:06:12 -07:00
Wink Saville
6e8c7dd212 am cd4636ec: Add LteOnCdmaDevice system property.
* commit 'cd4636ec08a50ab890acab0cf0c3c3f07f91896a':
  Add LteOnCdmaDevice system property.
2011-07-18 18:39:41 -07:00
Wink Saville
cd4636ec08 Add LteOnCdmaDevice system property.
Provide a system property which may be
optionally set at build time.

Change-Id: I253ff0df7c8f8c5627c775fb0cff2cb831157eed
2011-07-18 11:32:55 -07:00
Robert Greenwalt
8550f3b86a resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
2011-07-15 09:55:48 -07:00
Robert Greenwalt
0a46db5d88 Apply the dns and route diff which we get a change
bug:5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
2011-07-14 18:12:14 -07:00
Wink Saville
3810361e4a am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
  Remove STOPSHIP but allow seamless Handoff when possible.
2011-07-13 14:19:12 -07:00
Wink Saville
6d1d16c324 Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 2011-07-13 14:15:19 -07:00
Wink Saville
e822225f7a Remove STOPSHIP but allow seamless Handoff when possible.
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.


Bug: 4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9
2011-07-13 13:44:13 -07:00
John Wang
28d92afc0a am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
* commit '2ac78a2da52b29f6ac72294072d7ca87d991dab1':
  Add getImei() to Phone interface.
2011-07-13 10:21:38 -07:00
John Wang
2ea7e443b2 Add getImei() to Phone interface.
Need IMEI to be displayed in LTE Settings. Since getDeviceId() returns MEID for LTE device,
getImei() is added to return IMEI for all devices. getImei returns null if not set (as SipPhone).

bug:4983512
Change-Id: Idfe2ec8de514f330248db7a9de7e241f9a38cb96
2011-07-11 17:00:16 -07:00
Wink Saville
0ddd996006 am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
* commit '12b91edc81763b69090bf5815bc8d59ab8d8f342':
  Add a property so that CSIM provision check can be bypassed
2011-07-10 19:35:14 -07:00
Wink Saville
12b91edc81 Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE 2011-07-10 19:33:54 -07:00
Kazuhiro Ondo
e5d891e84e Add a property so that CSIM provision check can be bypassed
To support test environment where a call box is used with
non-provisioned SIM.

Bug: 5010622
Change-Id: I0dd2d3c2d199f600e5979c865f97b41e2fbb706d
2011-07-10 19:18:21 -07:00
Kazuhiro Ondo
a9e00a4ac8 am 89799e72: Fix incorrect ERI banner format
* commit '89799e72eee54935ec5830f89dfd0a7d32983917':
  Fix incorrect ERI banner format
2011-07-10 17:21:52 -07:00
Kazuhiro Ondo
89799e72ee Fix incorrect ERI banner format
Fix conflicting display issue with ERI and CSIM SPN test.
Do not display them together but only override ERI text with CSIM
SPN in home area.

Bug: 5008969
Change-Id: I88383acd1c7f4c5bfb1f66349ff2f37b2edbbc9c
2011-07-10 16:26:42 -07:00
Wink Saville
3ef341cda5 am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
* commit '7283bb9323c83621a818c387bb80fe1bc9d6aa7c':
  Disconnect ApnContexts in INITING state when error.
2011-07-08 09:40:11 -07:00
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
Wink Saville
19065008b8 am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
* commit '48b6d5afae76bec08c5e1194758e6db3e0f8b07c':
  Reset FAILED ApnContext state to IDLE on data setup triggers
2011-07-06 19:05:40 -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
6716ac5342 am c8e2916d: Bring back ERI into CDMA-LTE mode
* commit 'c8e2916d0bdbbda5fb6faf61d6f24100641d19f5':
  Bring back ERI into CDMA-LTE mode
2011-07-06 18:04:30 -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
c0c07d4ff6 am 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting
* commit '012b86d4294182497c4c72a318e0f4cbe5075a44':
  DataConnection was cleaned up too early if it's already disconnecting
2011-06-30 18:00:06 -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
672c468c45 am a2267451: Don\'t ever report a null ServiceState
* commit 'a2267451ddf91cc330f4c283e86811e38328915b':
  Don't ever report a null ServiceState
2011-06-30 14:50:32 -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
0562efd1ea am f3f9967e: Make sure to update data availability in call setup capable triggers.
* commit 'f3f9967e22201276d65f4be6006aca1cecc2a604':
  Make sure to update data availability in call setup capable triggers.
2011-06-29 17:24:56 -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
8745caaf25 am dbcc57c6: Fix dependencyMet issues regarding hipri APN.
* commit 'dbcc57c6f1602da324609ddbaf76f836504733ae':
  Fix dependencyMet issues regarding hipri APN.
2011-06-29 15:22:50 -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
Wink Saville
cf2980ffef am 29d1dde9: Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE
* commit '29d1dde972acaaf3685b60de3da00c1809c510f9':
  Data connection retry pattern could be broken by PDP sharing
2011-06-27 19:57:20 -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
446a436cf3 am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE
* commit '4d9261fad3e3bdfa056f377c10f2af0a6db62542':
  Use dataConnectionNotInUse to decide if a DC is free.
2011-06-21 19:37:46 -07:00
Wink Saville
66c37f5df2 am 64a09341: Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE
* commit '64a09341d8a16212855b7cdd16fe079e25d45838':
  Fix handling of unsol_data_state_change with PDP sharing scenario
2011-06-21 19:35:22 -07:00
Wink Saville
47e319247e am aef70d3f: Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE
* commit 'aef70d3f73eec5b28e1255027f947d95a74b6ab9':
  Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
2011-06-21 19:35:09 -07:00
Wink Saville
1773120c1e am ac4ff895: Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE
* commit 'ac4ff8958eced1c56a2e9571dd754c98eaa43108':
  Special retry back-off timer in call setup failure.
2011-06-21 19:34:54 -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