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
Wink Saville
c9e3608fa6
am 5faaaa5f: am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE
...
* commit '5faaaa5f5af3ef1b82178bc36933bede5ad0c5d7':
Handle ProvideLocalInfo stk command.
2011-05-24 19:53:59 -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
Wink Saville
fb9eebc427
am 9a8ea20d: am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE
...
* commit '9a8ea20d4b3975d3f771364fb9f2272c32f8cad1':
Map multiple apnType to one DataConnection fixes.
2011-05-24 08:42:10 -07:00
Wink Saville
9a4285474c
am b1817383: am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE
...
* commit 'b1817383050986413805fbbf2c1cc5c03417574d':
Data Connection: Use Alarm for all delayed data retries.
2011-05-24 08:42:05 -07:00
Kazuhiro Ondo
3dbc571e62
am 6056e326: am f96a6150: Data reconnection issue after airplane mode
...
* commit '6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e':
Data reconnection issue after airplane mode
2011-05-24 02:56:15 -07:00
Kazuhiro Ondo
eb1fbf7a45
am 8e1f6ece: am 4c88be65: GSM DCT: Update poll stats to support multi-links
...
* commit '8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e':
GSM DCT: Update poll stats to support multi-links
2011-05-24 02:56:08 -07:00
Wink Saville
cb3fad5cbe
am 7abbf93c: am 15cd6ec2: Tear down connection with unwanted linkproperty change
...
* commit '7abbf93c854cd7d272183b674373e989a05da6dd':
Tear down connection with unwanted linkproperty change
2011-05-24 02:38:17 -07:00
Wink Saville
2879343291
Fix build.
...
A merge accidentally included a line that was deleted.
Change-Id: Id383b1d8808f1c4b12d3ad1372270601f92f5989
2011-05-23 21:56:11 -07:00
Wink Saville
595881ee5e
am f8d70b14: am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE
...
* commit 'f8d70b14e4285d17d83cc4853f50b44d6a55fbc7':
Notify RIL that PDP reset is triggered due to data stall
2011-05-23 20:49:05 -07:00
John Wang
5ea7a29387
am b7a13791: am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE
...
* commit 'b7a13791a12eef57434b84a97609d98e03e17009':
Add UI to handle SIM swap.
2011-05-23 20:48:57 -07:00
Wink Saville
9ddcdd98d9
am 0ba62525: am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE
...
* commit '0ba625259e8c4af3df2c7823fc1d18b42d760a44':
Fix broken data retry
2011-05-23 18:25:52 -07:00
Wink Saville
ed5af6d93b
am 61a5ab57: am f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE
...
* commit '61a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0':
Change getLteOnCdmaModeStatic to dynamically determine its result.
2011-05-23 17:18:29 -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
Wink Saville
7abbf93c85
am 15cd6ec2: Tear down connection with unwanted linkproperty change
...
* commit '15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1':
Tear down connection with unwanted linkproperty change
2011-05-21 11:13:07 -07:00
Wink Saville
15cd6ec250
Tear down connection with unwanted linkproperty change
...
Make sure to disconnect the link when RIL reported link property change
which could cause connectivity issue. (i.e. IP address)
Change-Id: I6601ef53e4561bdc7d2760d00e134b8431512cb2
2011-05-21 10:05:26 -07:00
Wink Saville
f7bc0e28bf
am 16e8d22b: Fix build.
...
* commit '16e8d22b206fb0c8b8b5a243ea13e08597f60ebc':
Fix build.
2011-05-20 23:37:28 -07:00
Wink Saville
16e8d22b20
Fix build.
...
A merge accidentally included a line that was deleted.
Change-Id: I991488ace290e5eb8eef3ca73f49c07d391028f5
2011-05-20 23:31:29 -07:00
Wink Saville
f8d70b14e4
am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE
...
* commit '5f353de96beca0a400796887e737314a62e35b6a':
Notify RIL that PDP reset is triggered due to data stall
2011-05-20 17:26:58 -07:00
Wink Saville
5f353de96b
Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE
2011-05-20 17:23:45 -07:00
John Wang
b7a13791a1
am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE
...
* commit '393eb0d06b4536591584a8d4c5fb03c2962835a9':
Add UI to handle SIM swap.
2011-05-20 17:22:50 -07:00
John Wang
393eb0d06b
Merge "Add UI to handle SIM swap." into honeycomb-LTE
2011-05-20 17:18:56 -07:00
John Wang
10e9f668ee
Add UI to handle SIM swap.
...
bug:4364964
Change-Id: Iadf466401a24dfbd638353d689e6ae89506afc97
2011-05-20 16:52:51 -07:00
Kazuhiro Ondo
edbe2cc386
Notify RIL that PDP reset is triggered due to data stall
...
Additional deactivate cause so RIL could take intelligent action
on data stall occurrence if necessary.
Change-Id: Iae4accda879efb5679085c518117617fb16631c3
2011-05-20 16:52:46 -07:00
Wink Saville
0ba625259e
am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE
...
* commit '2b534e770dadc4b3180863a393fd89094d0f07a7':
Fix broken data retry
2011-05-20 16:51:29 -07:00
David Sobreira Marques
d778462836
Fixing concurrency issue on IccPhoneBookInterfaceManager.
...
All the reads/updates methods are synchronous calls that rely
on an unique lock object in order to wait for the asynchronous
simcard operations to complete and return appropriate results
Concurent calls to these methods will cause errors when one
completed operation will unlock all waiting calls generating
inconsistent results on some of the method calls.
Change-Id: I8b87004ac039bcb971b8369f7640281f1bf9eb35
Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com>
2011-05-20 20:14:56 -03:00
Wink Saville
61a5ab57b8
am f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE
...
* commit 'f89ea7a5ec3af366a825c2e2cfc4f4c1f05de4c4':
Change getLteOnCdmaModeStatic to dynamically determine its result.
2011-05-20 16:14:33 -07:00
Kazuhiro Ondo
5ce6268faa
Fix broken data retry
...
Change I2b737efa6092ad1254c8dc25840ec429f5c6e882 brought side
effect that retry count is reset at every setup.
Change-Id: I6f20d2e82110b2873ff5acbb60a747fd11c09c60
2011-05-20 15:31:33 -07:00
Wink Saville
fe071d3d37
Change getLteOnCdmaModeStatic to dynamically determine its result.
...
bug: 4202572
Change-Id: I956b61840e2043229df29054dd2a6daccd7a845f
2011-05-20 12:27:16 -07:00
Wink Saville
b568b51255
am 09ded82b: am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE
...
* commit '09ded82b784b9f6e01d4cd4298097fd2b459560b':
Reset connection while data state changed.
2011-05-19 11:32:27 -07:00
Wink Saville
09ded82b78
am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE
...
* commit 'ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736':
Reset connection while data state changed.
2011-05-19 11:28:36 -07:00
Kazuhiro Ondo
8904c3d814
am b22a9fd9: am 01758e81: Linkproperties update via unsol data call state change.
...
* commit 'b22a9fd9bb32133cbc7dc4fc7752dbf68e52dffe':
Linkproperties update via unsol data call state change.
2011-05-18 17:48:37 -07:00