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
Kazuhiro Ondo
c91c7f92c9
CdmaLte: Use SPN from SIM card if SIM card is presend
...
Change-Id: Ib766216ed5ec2522942e87d548d0af27c0553cec
2011-06-02 13:58:11 -07:00
Robert Greenwalt
903cd57f67
am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
...
* commit 'ddae89368129397c8df55bcdef9fcf36e4ff5fa5':
Remove redundent getCurrentCdmaDataConnectionState
2011-06-01 09:12:07 -07:00
Robert Greenwalt
a4e82851e9
Remove redundent getCurrentCdmaDataConnectionState
...
replace with existing and generic getCurrentDataConnectionState.
bug:3487138
Change-Id: I8a5e85afd316252eedeacb2a042450124702defd
2011-05-31 16:25:58 -07:00
Conley Owens
1bbcc6953a
am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
...
* commit '10b364b4bea8537f955bbbb8b9b40061264b29c9':
Fixing concurrency issue on IccPhoneBookInterfaceManager.
2011-05-29 09:00:21 -07:00
Ed Heyl
39ddeae0b6
Merge "resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-05-29 08:21:53 -07:00
Kazuhiro Ondo
a36c8f693d
am 57675037: Further fix for SIM detection.
...
* commit '57675037aa279e715a966e2888a31c97381a5fe4':
Further fix for SIM detection.
2011-05-27 19:32:04 -07:00
Kazuhiro Ondo
57675037aa
Further fix for SIM detection.
...
Refining SIM ready condition on UICC w/ multiple apps.
Also migration for RIL to use SIM_READY indication in case of UICC
presence instead of current NV_READY message.
Change-Id: I3445a628e2d32a24292e6a69785fe72422481221
2011-05-27 18:36:05 -07:00
Wink Saville
205a2c3a3e
am 178b0660: Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE
...
* commit '178b066096d94f078fdb32bf9f66755bae34819d':
DataConnection FailCause should use errorCode rather than ordinal.
2011-05-27 09:15:19 -07:00
Wink Saville
178b066096
Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE
2011-05-27 09:03:48 -07:00
Ramesh Sudini
98288aa3de
DataConnection FailCause should use errorCode rather than ordinal.
...
Change-Id: I45c5bca73b04f74eee7ab4858c8e28350e0ffb89
2011-05-27 08:59:20 -07:00
Wink Saville
08c00205a7
am 885f8cd7: Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE
...
* commit '885f8cd75f27ec6dc8ca75233bbcdc86ed041c8c':
DataConnection : Have a separate alarm for each APN type.
2011-05-26 18:23:17 -07:00
Wink Saville
37a4069ff9
am e55e5e7c: Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE
...
* commit 'e55e5e7c406bdedc67c6e536c981146e2b335b43':
Derive ICC status from multiple application status for UICC
2011-05-26 18:21:29 -07:00
Wink Saville
885f8cd75f
Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE
2011-05-26 18:19:08 -07:00
Kazuhiro Ondo
e14a59e96c
Derive ICC status from multiple application status for UICC
...
If UICC with multiple applications are used, delive the status
based on both status instead of just looking at one.
Change-Id: I98cf689327e5302bb4174985935511aff02939f6
2011-05-26 17:09:25 -07:00
Ramesh Sudini
69d0855ed2
DataConnection : Have a separate alarm for each APN type.
...
Change-Id: I0769f3e2a7c60bd833af7c24eb661d368bac2598
2011-05-26 17:09:07 -07:00
Simon Wilson
62388cfc1f
resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp
...
Conflicts:
telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416
2011-05-26 12:53:15 -07:00
Wink Saville
7f9d3210cb
am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE
...
* commit 'f55e0346a5a40714be8a7e1571ff65e6ef1a9949':
Remove or disable some verbose debugging.
2011-05-26 11:07:18 -07:00
Wink Saville
3b13b2c9d1
Remove or disable some verbose debugging.
...
Change-Id: I930689502f2a76bf72e315331d66a9259135c6b8
2011-05-26 06:36:08 -07:00
Jean-Baptiste Queru
54ab72e1c3
am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
...
* commit '038e8f99845e171c0d9d606f5697e36b1b684d01':
Adding support for parsing of SMS-CB pdus in UMTS format.
2011-05-25 09:04:40 -07:00
Jean-Baptiste Queru
038e8f9984
Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
2011-05-25 08:06:17 -07:00
Conley Owens
10b364b4be
am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
...
* commit '4cf0eee755046734568959ac01f207b108e449c0':
Fixing concurrency issue on IccPhoneBookInterfaceManager.
2011-05-24 15:01:18 -07:00
Conley Owens
4cf0eee755
Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
2011-05-24 14:05:05 -07:00
Wink Saville
5faaaa5f5a
am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE
...
* commit '543c3146cb011380e4328e049abf97bc797db95a':
Handle ProvideLocalInfo stk command.
2011-05-24 10:10:13 -07:00
Kazuhiro Ondo
38b6999d9e
Handle ProvideLocalInfo stk command.
...
Change-Id: I4cb685f7d8e7442185e927fa0d49531b96eeab08
2011-05-24 10:04:09 -07:00
Soojung Shin
a38fad37c2
am 4e4ad341: SmsMessage: convert + to international dialing prefix
...
* commit '4e4ad34159dc1c720a3e6145bb9f14c60fb1a3f7':
SmsMessage: convert + to international dialing prefix
2011-05-23 15:11:04 -07:00
Soojung Shin
4e4ad34159
SmsMessage: convert + to international dialing prefix
...
When sending an SMS to an international number in the format
+401234567890, the "+" should be converted to the International
Dialing Prefix (in the US, 011). However, the device drops this
"+" altogether in the outbound data burst message causing the message
to fail or be sent to the wrong address.
Change-Id: If25c092d283f1703b49cf52d0379efa54639f093
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
2011-05-23 15:02:32 -07:00
Wink Saville
9a8ea20d4b
am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE
...
* commit '070eecef394175d7344cdadde675e8977a1609f0':
Map multiple apnType to one DataConnection fixes.
2011-05-23 13:42:14 -07:00
Wink Saville
b181738305
am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE
...
* commit 'd3924fe9f6c99bc92ed86195e07ba82d39043812':
Data Connection: Use Alarm for all delayed data retries.
2011-05-23 13:42:11 -07:00
Wink Saville
070eecef39
Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE
2011-05-23 13:39:03 -07:00
Ramesh Sudini
a95bce0b29
Map multiple apnType to one DataConnection fixes.
...
With current design the code maps to the same DC, but no indications go out.
With this, making it more async in nature that the request goes all the way
to DC and all the data indications would be triggered by parallel paths through DCT.
Change-Id: I4c6e64912dafe19154d910bbd0441b10ada36cff
2011-05-23 12:01:40 -07:00
Ramesh Sudini
a88d76b772
Data Connection: Use Alarm for all delayed data retries.
...
Change-Id: I5045c3a10808b75f1ca3174bd1c16f332d5f7fa8
2011-05-23 12:01:31 -07:00
Kazuhiro Ondo
6056e3268a
am f96a6150: Data reconnection issue after airplane mode
...
* commit 'f96a6150e4e6c37f8952456bf9f84714f622713d':
Data reconnection issue after airplane mode
2011-05-21 13:02:17 -07:00
Kazuhiro Ondo
8e1f6eceb3
am 4c88be65: GSM DCT: Update poll stats to support multi-links
...
* commit '4c88be655e387011c6d57c6d68b5deb94f6ce601':
GSM DCT: Update poll stats to support multi-links
2011-05-21 12:50:18 -07:00
Kazuhiro Ondo
f96a6150e4
Data reconnection issue after airplane mode
...
ApnContext and DC were not disassociated when force
"cleanUpConnection" was called. Causing the setup
request was not happening if applyNewStatus() was
the trigger.
Change-Id: I6d73a53edb72bb9ab4ebb92fffd06e6fe1f0c4aa
2011-05-21 12:49:41 -07:00
Kazuhiro Ondo
4c88be655e
GSM DCT: Update poll stats to support multi-links
...
Change-Id: I654e38e71f9576ed2c4da59af563be04bc87045c
2011-05-21 11:57:41 -07:00