Robert Greenwalt
e1544bb9ea
Simplfy getActive* calls in ConnectivityService
...
One had been simplified on GB, but somehow it didn't make it here.
bug: 4463770
Change-Id: Ica51e836b1a7a489526a223168910b8e06c99c2b
2011-05-20 12:23:41 -07:00
Wink Saville
049694bfa2
Merge "Reset connection while data state changed." into honeycomb-LTE
2011-05-19 11:25:45 -07:00
Wink Saville
f23fb20d13
Reset connection while data state changed.
...
Check data call states and reset connection if any link properties changed.
Change-Id: I008aea969378648192852161959fdf4aad6211a1
2011-05-18 15:59:04 -07:00
Robert Greenwalt
355205c0cd
Switch to use netd to add/remove routes.
...
Also adds support for v6 routes and for removing single routes.
Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
2011-05-18 15:25:43 -07:00
Kazuhiro Ondo
3a34041f80
Linkproperties update via unsol data call state change.
...
Handles the scenario of radio technology handover with IP continuity.
Once RIL/Modem finished a handover operation, an unsol data call state
change will be send up to FW notifying all link propertes changes.
FW will then re-configure the device with new link properties
including iptable used by Tethering.
Change-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12
2011-05-17 20:53:40 -07:00
Irfan Sheriff
891bdee2ba
Merge commit '01ea7f01' into manualmerge1
2011-05-12 17:19:56 -07:00
Irfan Sheriff
9cfe6197fb
DO NOT MERGE Add DhcpStateMachine
...
Add DhcpStateMachine for interation with dhcpcd
- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
simultaneously
- Optionally, a controller can request a notification prior
to DHCP request/renewal being sent
Change-Id: I5324814b19ff19863aa6fa89f1e3f0a202930c98
2011-05-12 14:10:11 -07:00
Kazuhiro Ondo
efa66d9fe9
Fix initialization of RouteInfo
...
IPv6 gateway is not correctly set in RouteInfo
Change-Id: I24b1ab71a64e3097c9ba641899240fc27847b86c
2011-05-11 16:02:00 -07:00
Robert Greenwalt
bd49221570
Fix the adding of host routes.
...
We used to just add
Change-Id: I991e4cc976cc2932887dd3242fd50e013d521b0a
2011-05-10 11:27:46 -07:00
Robert Greenwalt
aae781f32b
Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
2011-05-04 09:59:30 -07:00
Robert Greenwalt
20f819c64b
Add auto-restore timeout for secondary networks.
...
Settable per network so you can have not timeout for some and some for others.
If you set the old NETWORK_RESTORE_DELAY_PROP_NAME system property
(android.telephony.apn-restore) it will override this value.
Change-Id: Icca706fdc74245dce679209116660e5dc4b05d23
2011-05-03 19:10:26 -07:00
Robert Greenwalt
5afb46660c
Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
2011-05-02 13:26:52 -07:00
Robert Greenwalt
5a901298ed
Add RouteInfo objects for tracking routes.
...
Used to have list of gateways for default routes, but general static routes
should be supported.
Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
2011-05-02 11:17:30 -07:00
Irfan Sheriff
204cec7dd5
Add DhcpStateMachine for interation with dhcpcd
...
- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
simultaneously
- Optionally, a controller can request a notification prior
to DHCP request/renewal being sent
Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
2011-04-30 12:58:51 -07:00
Robert Greenwalt
2240524be9
Make new networkAttribute parameter non-optional.
...
Dependencymet sets the default dep-met value for the network. Should
be set to true unless you know what you're doing.
Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129
2011-04-25 16:04:45 -07:00
Benoit Goby
c40de32ef7
resolved conflicts for merge of 6cec7f35 to honeycomb-LTE
...
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
2011-04-11 18:41:23 -07:00
Benoit Goby
6cec7f3535
Add support for USB Ethernet adapters
...
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
2011-04-11 16:33:43 -07:00
Wink Saville
f2a6283da9
ConnectivityService needs to use the new names for the NetConfig vars.
...
Change-Id: I809a624057462871cd1849051286c2bffd5099e9
2011-04-07 14:23:45 -07:00
Robert Greenwalt
2879f7352b
Merge "Add external dependency API." into honeycomb-LTE
2011-04-07 13:02:28 -07:00
John Wang
3e567d5c3a
Make LinkProperties comparable.
...
Add equals() and hashcode() to LinkProperties and related fields.
Bug:3501569
Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
2011-04-07 12:36:56 -07:00
Robert Greenwalt
34848c0192
Add external dependency API.
...
An APN will not be connected to if some external dependency is not met.
bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
2011-04-07 12:28:37 -07:00
Robert Greenwalt
23a9f02497
am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
...
* commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516':
Fix adding of default route.
2011-03-22 21:37:48 -07:00
Robert Greenwalt
03d53da1f5
Fix adding of default route.
...
If you deleted the host routes (started a secondary network like mms, supl
of hipri and then ended it) you would lose the host route to the default
gateway. Then if you needed to re-add the default gateway route (lost
the connection and removed the default route and then re-established)
you couldn't - can't add a gateway that isn't routable apparently.
This happens if you are in a video chat and lose your connection without
losing the interface (PPP keeps it up for a bit).
Fixed it by having addDefaultRoute first add a hsot route for the gateway
before adding the default route. This allows the default add to succeed.
bug:3490353
Change-Id: I415e7319832e6456f8757b14c4f79f098a08839b
2011-03-22 18:47:42 -07:00
Wink Saville
64cd47c239
Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
2011-03-14 13:41:26 -07:00
Wink Saville
7df32e6a39
Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE
2011-03-14 13:40:58 -07:00
Robert Greenwalt
dab2c6223e
Do not merge: Add some input checking to prevent problems
...
Adding nulls can cause unhappiness. It's suspected as a cause of 3495045.
bug:3495045
Change-Id: I925c965ef64032fc57849bf15fe9b11f4bc99351
2011-03-14 12:25:09 -07:00
Wink Saville
b7c92c720f
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
...
This reverts commit bbba216fe3
and is the first of the LTE commits in master being back ported
to the LTE branch.
Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
2011-03-14 12:25:04 -07:00
Robert Greenwalt
5625a40c22
am 102b5464: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
...
* commit '102b5464b7d18fb36f58a3638ee72e8d6b54bd09':
DO NOT MERGE Backport of I1f55df8a from master.
2011-03-14 10:53:38 -07:00
Robert Greenwalt
102b5464b7
am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
...
* commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
DO NOT MERGE Backport of I1f55df8a from master.
2011-03-11 11:52:31 -08:00
Robert Greenwalt
9e081592aa
DO NOT MERGE Backport of I1f55df8a from master.
...
Fixes false reporting of NO_CONNECTION.
bug:4057115
Change-Id: Ie11e81180276ac3aa486607ec3a8eb1088b2ece6
2011-03-10 17:04:21 -08:00
TK MUN
423572b4e2
am 8cca8f4c: (-s ours) am 141623d4: DO NOT MERGE WiMAX support
...
* commit '8cca8f4c4fbb4ffe2e5e83b91d17eba6ba28f950':
DO NOT MERGE WiMAX support
2011-03-09 22:58:12 -08:00
TK MUN
8cca8f4c4f
am 141623d4: DO NOT MERGE WiMAX support
...
* commit '141623d480fe0a6944e5bfea04a2dd4f78b52f20':
DO NOT MERGE WiMAX support
2011-03-09 22:54:44 -08:00
TK MUN
141623d480
DO NOT MERGE WiMAX support
...
- In Connectivity service, start WiMAX service
- 4G icon display in StatusBarPolicy
- Add DHCP renew
- Add radio for WiMAX
Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd
Signed-off-by: TK MUN <tk.mun@samsung.com >
2011-03-09 22:37:08 -08:00
Wink Saville
bbba216fe3
DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
...
This reverts commit f6b7669493 .
Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636
2011-03-03 09:53:52 -08:00
Robert Greenwalt
95c300a353
Merge "Start using NetworkUtils.numericToInetAddress."
2011-03-02 12:10:51 -08:00
Robert Greenwalt
35e34d1276
Start using NetworkUtils.numericToInetAddress.
...
Generates InetAddresses without risking an accidental dns lookup. For use with supposedly
numeric-only ip address strings.
Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a
2011-03-02 11:37:32 -08:00
Wink Saville
732db29f81
am 9160b66c: (-s ours) am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb
...
* commit '9160b66c714d9a90d36c235540180cd4c65fed82':
Fixing the write of BackgroundData setting, DO NOT MERGE.
2011-03-01 10:58:05 -08:00
Wink Saville
9160b66c71
am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb
...
* commit '0eb6af892948ba23bf9de5c5a6172c6ec50f8f71':
Fixing the write of BackgroundData setting, DO NOT MERGE.
2011-02-28 16:00:22 -08:00
Wink Saville
28b7b21694
Fixing the write of BackgroundData setting, DO NOT MERGE.
...
I outsmarted myself trying to minimize writes and caused no writes to occur.
bug:3485934
Change-Id: I43b6ebbed3f13277edfb2e28f09cf7b98ea66776
2011-02-28 15:32:41 -08:00
Robert Greenwalt
af83ea6e1f
Merge "Fixing the write of BackgroundData setting."
2011-02-25 15:20:30 -08:00
Robert Greenwalt
0ffdef120a
Fixing the write of BackgroundData setting.
...
I outsmarted myself trying to minimize writes and caused no writes to occur.
bug:3485934
Change-Id: I292e6837d29903a21abb6e001d25d96a4cdc18ec
2011-02-25 13:44:09 -08:00
Wink Saville
f6b7669493
LTE Changes for Telephony including Multiple PDN support and IPV6 support
...
Added init for CDMAPhone.java
Change-Id: I2392b5ad3382ee1993537b8477ef00dd036c6fe9
2011-02-24 18:23:36 -08:00
Robert Greenwalt
8606b3e4a0
am 439a015b: (-s ours) am 730126bf: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
...
* commit '439a015baa65c68ff52c7ac92dd522488c16f0d1':
DO NOT MERGE - backport of l92a02b31 from master
2011-02-16 10:58:34 -08:00
Robert Greenwalt
439a015baa
am 730126bf: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
...
* commit '730126bf5a087bd9bc9e84b79a35433cd466d992':
DO NOT MERGE - backport of l92a02b31 from master
2011-02-16 10:55:54 -08:00
Robert Greenwalt
730126bf5a
am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
...
* commit '3259d8853760a72b811757e1711119d041962a1c':
DO NOT MERGE - backport of l92a02b31 from master
2011-02-16 10:51:04 -08:00
Elliott Hughes
3064b9e18e
Use InetAddress.parseNumericAddress.
...
Bug: 3300307
Change-Id: I4ebfe533056e67931db1117e934596ba7b5c8b75
2011-02-15 17:11:29 -08:00
Robert Greenwalt
7fae12cc19
Remove more use of netmask
...
bug:2542681
Change-Id: Ifd75672739ee8262d4df22afd8173e4f3f67260d
2011-02-14 14:32:33 -08:00
Robert Greenwalt
084e4774f2
DO NOT MERGE - backport of l92a02b31 from master
...
Fix handling of multiple possible default networks.
bug:3328196
Change-Id: I994f1621ff82de454192945a9cae961e1710d537
2011-02-11 17:32:58 -08:00
Robert Greenwalt
5c733977a4
Update LinkProperties treatment of gateways
...
A link can have multiple gateways (think ipv4/ipv6 for a trivial example).
.
bug:3438810
Change-Id: I28c90a6947cd50b82e5ca9a0113148f98b3f4dd8
2011-02-11 11:06:23 -08:00
The Android Open Source Project
20bbfe73dd
am 44d258d5: Reconcile gingerbread-plus-aosp and honeycomb
...
* commit '44d258d5be10ff68e0eae700b6439ec4b94f5a31':
resolved conflicts for merge of a314f32b to honeycomb-merge
2011-01-30 12:54:18 -08:00