Robert Greenwalt
df6da5c96b
am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
...
* commit 'aae781f32bc769f6275d3cfc200cbbadf3f820f6':
Add auto-restore timeout for secondary networks.
2011-05-04 10:02:16 -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
90faa5de18
am 5afb4666: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
...
* commit '5afb46660c3f6e622302bbd77c25f9e1275f2c2f':
Add RouteInfo objects for tracking routes.
2011-05-02 13:29:22 -07:00
Robert Greenwalt
5afb46660c
Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
2011-05-02 13:26:52 -07:00
Irfan Sheriff
78204ba57c
am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
...
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
Add DhcpStateMachine for interation with dhcpcd
2011-05-02 12: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
8177aee2dc
am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
...
* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
Make new networkAttribute parameter non-optional.
2011-04-26 00:23:03 -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
d27954e05a
am c40de32e: resolved conflicts for merge of 6cec7f35 to honeycomb-LTE
...
* commit 'c40de32ef747fc206d3ec2980b8f7a7aff0f1967':
Add support for USB Ethernet adapters
2011-04-11 18:53:57 -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
75b5e9967f
am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
...
* commit '9e7a5a1e567a0e696d9a7b68fffd00b7408e6ac1':
ConnectivityService needs to use the new names for the NetConfig vars.
2011-04-07 14:29:17 -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
1a087f0f01
resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp
...
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
2011-04-07 14:13:52 -07:00
Robert Greenwalt
2879f7352b
Merge "Add external dependency API." into honeycomb-LTE
2011-04-07 13:02:28 -07:00
John Wang
f2cc9d1c7a
am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
...
* commit '5d6f1167039e22889545212ce18192460f9b503e':
Make LinkProperties comparable.
2011-04-07 12:46:18 -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
Simon Wilson
2e4b442d54
am 02497176: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
...
* commit '0249717644b0f4f1f3f0316e2de2930a16b019bc':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
2011-04-04 17:44:38 -07:00
Robert Greenwalt
1851011379
resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp
...
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
2011-04-04 16:26:42 -07:00
Simon Wilson
0249717644
am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
...
* commit 'ec94472835787b66e1799110411d5077d0ef37cd':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
2011-04-04 12:25:25 -07:00
Robert Greenwalt
e00e35a54c
am 9991017b: Only leave one default network up at a time.
...
* commit '9991017bbd026080695fc33198609be7bfd4f9be':
Only leave one default network up at a time.
2011-04-04 12:18:58 -07:00
Robert Greenwalt
f7dae30b20
Fix the build.
...
Fix a bad merge.
Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee
2011-03-31 10:44:47 -07:00
Robert Greenwalt
3a378b9f2d
resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp
...
Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1
2011-03-30 15:03:13 -07:00
TK MUN
dc9a535917
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
...
When user uncheck "Data Enabled" check box, WiMAX goes
into "disconnected" state.
Change-Id: I3b9bdbc16cc4ddbf7a1aac0c984cad8994c4e9f2
Signed-off-by: TK MUN <tk.mun@samsung.com >
2011-03-30 13:18:23 -07:00
Robert Greenwalt
b2f5deca7d
am 568845a7: Merge "Fix some alt-network issues." into gingerbread
...
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
Fix some alt-network issues.
2011-03-30 09:30:15 -07:00
Robert Greenwalt
9991017bbd
Only leave one default network up at a time.
...
If original refuses to tear down, tear down new one. It's better
to have none (which will try to launch them all again) than two.
Really people shouldn't refuse the teardown request.
bug:4183397
Change-Id: I54ea1bf0d2cd2ef16fcf2eafc69895ad2fe33ffd
2011-03-29 11:36:28 -07:00
Robert Greenwalt
a71471ba9a
Fix some alt-network issues.
...
Two issues.
1) remove default routes for non-default networks.
2) don't report mobile is the active default network just because
it is active.
bug:4157610
Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f
2011-03-25 08:59:08 -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