Wink Saville
5d47d203fb
am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
...
* commit 'fbef26eb55cf8a5b5a25a2b748bf16b54d398abc':
Enforce provision check for CSIM record only.
2011-06-14 14:48:51 -07:00
Wink Saville
aad3c3cbb8
am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE
...
* commit 'c2d17d3bea02991df378237ea7058ccedb7c6a14':
Make APN re-connect delay configuable
2011-06-14 14:47:07 -07:00
Wink Saville
46cd4a4bfe
am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
...
* commit '82c1a5dea305d56eb77efa7d9a730307ff6af28a':
Revert "CDMALTE: Get roaming status based on SID/NID"
2011-06-14 14:47:04 -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
cc44bea040
am 2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE
...
* commit '2addaf97b319e257677ac3e5bbb772ba40cfa78a':
Add toString for IccCard Status and App.
2011-06-10 17:28:11 -07:00
John Wang
2addaf97b3
Merge "Add toString for IccCard Status and App." into honeycomb-LTE
2011-06-10 17:19:42 -07:00
Robert Greenwalt
75612e9c3f
am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
...
* commit '1ea549e8990d2d73ccd9e92db1e7312423ee423e':
CDMALTE: Get roaming status based on SID/NID
2011-06-10 14:13:25 -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
Robert Greenwalt
5a8455c3c6
am 75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE
...
* commit '75749ab1a03f5b4a9f1aaee64dd1c6f36e22dc22':
Set locale based on SIM preferred language.
2011-06-09 15:54:45 -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
2d8500d21a
am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE
...
* commit '799f04c09cc7284e0660d419bcb24af57b86f08e':
Report data status from ApnContext even if data is detached
2011-06-08 15:03:43 -07:00
Wink Saville
a384ff3282
am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE
...
* commit '33e1424b2e924e9b0162aa648137e8254f729161':
Use CSIM to get provision information
2011-06-08 15:03:35 -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
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
Wink Saville
0da86d4fef
am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE
...
* commit 'a558fdf156601a477964139fee57da29de7f31b3':
Fix default preferred network.
2011-06-08 12:59:37 -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
Jake Hamby
22165bb54a
am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
...
* commit 'ae62b7b0bca9c46dea30ee81a7aada3e7576638b':
Fixes for SMS Cell Broadcast support.
2011-06-07 16:32:10 -07:00
Jake Hamby
ae62b7b0bc
resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
...
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
2011-06-07 16:24:15 -07:00
John Wang
229d3a0cbc
am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
...
* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
Make getDeviceId return null for Non-phone device.
2011-06-07 15:56:19 -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
Jake Hamby
7d259626d0
resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp
...
Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2
2011-06-07 15:01:50 -07:00
Robert Greenwalt
e139167c91
am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE
...
* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
Reveal some network constants.
2011-06-07 13:12:29 -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
7f13d0ed40
am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
...
* commit 'c368831d62ce68d6c9c83d7e49e5db11c47ebd85':
Preferred network discrepancy after rild is restarted.
2011-06-07 11:03:25 -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
Jake Hamby
66040bbb08
Fixes for SMS Cell Broadcast support.
...
Add support for ETWS primary notification messages.
Add method for easy concatenation of GSM multi-part broadcasts.
Add test cases for SmsCbHeader, SmsCbMessage and IntRangeManager.
Change-Id: Ifc646a011e79ad6c7eace9afcf84b1216eb42b7a
2011-06-06 18:56:20 -07:00
Jake Hamby
0cb17a52ee
resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp
...
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
2011-06-06 15:33:37 -07:00
Jean-Baptiste Queru
59242cf65e
am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
...
* commit '54ab72e1c389905adb074bd7c799a33b4f513679':
Adding support for parsing of SMS-CB pdus in UMTS format.
2011-06-06 11:33:52 -07:00
Robert Greenwalt
89c1eb8edc
am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE
...
* commit '80a19e67d1cd3710dbbfa52767a994512d20f694':
Promote Telephony's isDataPossible.
2011-06-03 15:46:08 -07:00
Robert Greenwalt
80a19e67d1
Merge "Promote Telephony's isDataPossible." into honeycomb-LTE
2011-06-03 15:42:48 -07:00
John Wang
0b1923ce51
am 3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
...
* commit '3b71239aca01fb029d9acd2c606b7be9b8f32d66':
Add supplyPuk to do SIM puk unlock.
2011-06-03 14:09:13 -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
76273dd16d
am 77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting"
...
* commit '77c9411306b6b3d210d22214d596272c9728cf5e':
Data recovery failure due to apn/dc state stuck in "disconnecting"
2011-06-03 12:19:23 -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
Wink Saville
3699c3d7c8
am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
...
* commit '5b4e24400a4f1a6c67efd08ab2cda3389f78144e':
Refactor ServiceStateTracker handling of radio technology.
2011-06-03 10:21:07 -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
147510145f
am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
...
* commit '2e543dc188c3c2e8f8a785e403c95b7e22fa6262':
CdmaLte: Use SPN from SIM card if SIM card is presend
2011-06-02 18:24:28 -07:00
Wink Saville
ade2a5467c
am 1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE
...
* commit '1076f5ff27d35a5a807043bdea49aa40404d9c6b':
Read CSIM records in LTE on CDMA mode
2011-06-02 18:24:20 -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