am f490d721: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
...
* commit 'f490d72195
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-05-11 13:07:38 -07:00
b5c62b6230
am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
...
* commit 'e6848faceff58f84f671dbc73be08ef7890fea09':
Fix the adding of host routes.
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-05-10 11:53:57 -07:00
f490d72195
Fix the adding of host routes.
...
We used to just add
Change-Id: I991e4cc976cc2932887dd3242fd50e013d521b0a
Robert Greenwalt
commited 2011-05-10 11:27:46 -07:00
bd49221570
am df6da5c9: am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
...
* commit 'df6da5c96b
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-05-04 12:47:30 -07:00
e7dcc1362f
am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
...
* commit 'aae781f32b
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-05-04 10:02:16 -07:00
df6da5c96b
Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
Robert Greenwalt
authored and
Android (Google) Code Review
commited 2011-05-04 09:59:30 -07:00
aae781f32b
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
Robert Greenwalt
commited 2011-05-03 19:10:26 -07:00
20f819c64b
resolved conflicts for merge of 90faa5de to master
...
Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6
Robert Greenwalt
commited 2011-05-02 14:41:57 -07:00
b0d1452d58
am 78204ba5: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
...
* commit '78204ba57c
Irfan Sheriff
authored and
Android Git Automerger
commited 2011-05-02 13:29:36 -07:00
52b5163b83
am 5afb4666: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
...
* commit '5afb46660c
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-05-02 13:29:22 -07:00
90faa5de18
Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
Robert Greenwalt
authored and
Android (Google) Code Review
commited 2011-05-02 13:26:52 -07:00
5afb46660c
am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
...
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
Add DhcpStateMachine for interation with dhcpcd
Irfan Sheriff
authored and
Android Git Automerger
commited 2011-05-02 12:26:52 -07:00
78204ba57c
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
Robert Greenwalt
commited 2011-05-02 11:17:30 -07:00
5a901298ed
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
Irfan Sheriff
commited 2011-04-30 12:58:51 -07:00
204cec7dd5
am 8177aee2: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
...
* commit '8177aee2dc
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-04-26 01:35:39 -07:00
ef903acab4
am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
...
* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
Make new networkAttribute parameter non-optional.
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-04-26 00:23:03 -07:00
8177aee2dc
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
Robert Greenwalt
commited 2011-04-25 16:04:45 -07:00
2240524be9
Expose more net types to the public.
...
Ethernet and bluetooth.
Change-Id: Ic499709ffa151c0f27aef497373a8de7289e3e7f
Robert Greenwalt
commited 2011-04-22 18:09:03 -07:00
f76c55d289
More native code cleanup.
...
Don't keep unused global references to classes, don't throw exceptions
when an exception is already pending, and fix a (harmless) misunderstanding
about how GetStringChars works.
Change-Id: Ie445036f057daa8a1c76aceb7bad2a84fb81d820
Elliott Hughes
commited 2011-04-12 11:28:59 -07:00
c944a7dedc
resolved conflicts for merge of d27954e0 to master
...
Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9
Benoit Goby
commited 2011-04-11 19:07:11 -07:00
ef54af248b
am c40de32e: resolved conflicts for merge of 6cec7f35 to honeycomb-LTE
...
* commit 'c40de32ef7
Benoit Goby
authored and
Android Git Automerger
commited 2011-04-11 18:53:57 -07:00
d27954e05a
resolved conflicts for merge of 6cec7f35 to honeycomb-LTE
...
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
Benoit Goby
commited 2011-04-11 18:41:23 -07:00
c40de32ef7
Add support for USB Ethernet adapters
...
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
Benoit Goby
commited 2011-04-11 16:33:43 -07:00
6cec7f3535
am 75b5e996: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
...
* commit '75b5e9967f
Wink Saville
authored and
Android Git Automerger
commited 2011-04-07 14:31:20 -07:00
75d9e1cd13
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.
Wink Saville
authored and
Android Git Automerger
commited 2011-04-07 14:29:17 -07:00
75b5e9967f
ConnectivityService needs to use the new names for the NetConfig vars.
...
Change-Id: I809a624057462871cd1849051286c2bffd5099e9
Wink Saville
commited 2011-04-07 14:23:45 -07:00
f2a6283da9
am 1a087f0f: resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp
...
* commit '1a087f0f01
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-04-07 14:22:03 -07:00
f7ca6f7ddf
resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp
...
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
Robert Greenwalt
commited 2011-04-07 14:13:52 -07:00
1a087f0f01
Merge "Add external dependency API." into honeycomb-LTE
Robert Greenwalt
authored and
Android (Google) Code Review
commited 2011-04-07 13:02:28 -07:00
2879f7352b
am f2cc9d1c: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
...
* commit 'f2cc9d1c7a
John Wang
authored and
Android Git Automerger
commited 2011-04-07 12:48:17 -07:00
a8191da467
am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
...
* commit '5d6f1167039e22889545212ce18192460f9b503e':
Make LinkProperties comparable.
John Wang
authored and
Android Git Automerger
commited 2011-04-07 12:46:18 -07:00
f2cc9d1c7a
Make LinkProperties comparable.
...
Add equals() and hashcode() to LinkProperties and related fields.
Bug:3501569
Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
John Wang
commited 2011-04-07 12:36:56 -07:00
3e567d5c3a
Add external dependency API.
...
An APN will not be connected to if some external dependency is not met.
bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
Robert Greenwalt
commited 2011-04-07 12:28:37 -07:00
34848c0192
Don't use local ref for cached jclass reference in JNI code
...
Change-Id: Id45b2acb358a819f2fd332e99f3a095f6fc7299b
related-to-bug: 4241138
Brian Carlstrom
commited 2011-04-06 10:04:20 -07:00
587274ea3a
am 2e4b442d: (-s ours) am 02497176: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
...
* commit '2e4b442d54
Simon Wilson
authored and
Android Git Automerger
commited 2011-04-05 10:26:54 -07:00
d2dc2511ec
am 02497176: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
...
* commit '0249717644
Simon Wilson
authored and
Android Git Automerger
commited 2011-04-04 17:44:38 -07:00
2e4b442d54
am 18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp
...
* commit '1851011379
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-04-04 16:44:25 -07:00
198b24d59a
resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp
...
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
Robert Greenwalt
commited 2011-04-04 16:26:42 -07:00
1851011379
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
Simon Wilson
authored and
Android Git Automerger
commited 2011-04-04 12:25:25 -07:00
0249717644
am 9991017b: Only leave one default network up at a time.
...
* commit '9991017bbd
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-04-04 12:18:58 -07:00
e00e35a54c
Fix a bad merge.
...
Re-add change 103769 (Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f) from gingerbread
after the bad merge was reverted by master change 104487
(Change-Id: I8fad7ee11f4b26630f3cc4b31cc9cafbe66b3bf4).
bug:4157610
Change-Id: I96a75d71220cc7886a5b186b415d8dacf6951ca6
Robert Greenwalt
commited 2011-04-01 10:51:22 -07:00
1e2f286a27
am 026ba931: (-s ours) Merge "Fix the build." into honeycomb-plus-aosp
...
* commit '026ba931d448919ffc515f7e66fe96950f89d22e':
Fix the build.
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-03-31 10:53:58 -07:00
e698829381
Fix the build.
...
Fix a bad merge.
Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee
Robert Greenwalt
commited 2011-03-31 10:44:47 -07:00
f7dae30b20
Fix the build
...
Revert "am 047f9d12: Merge "resolved conflicts for merge of b2f5decafbba87d35f
Michael Jurka
commited 2011-03-30 19:57:12 -07:00
837e36441b
merge in gingerbread-release history after reset to gingerbread
The Android Automerger
commited 2011-03-30 18:33:05 -07:00
358c8e7cdc
am 047f9d12: Merge "resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit '047f9d12976d90d0931a64a256bb4843d77f5e20':
Fix some alt-network issues.
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-03-30 16:40:23 -07:00
fbba87d35f
resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp
...
Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1
Robert Greenwalt
commited 2011-03-30 15:03:13 -07:00
3a378b9f2d
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>
TK MUN
authored and
Simon Wilson
commited 2011-03-30 13:18:23 -07:00
dc9a535917
am 568845a7: Merge "Fix some alt-network issues." into gingerbread
...
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
Fix some alt-network issues.
Robert Greenwalt
authored and
Android Git Automerger
commited 2011-03-30 09:30:15 -07:00
b2f5deca7d
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
Robert Greenwalt
commited 2011-03-29 11:36:28 -07:00
9991017bbd
Robert Greenwalt
authored and
Android Git Automerger
commited 
Android (Google) Code Review
commited 
Irfan Sheriff
authored and
Elliott Hughes
commited 
Benoit Goby
commited 
Wink Saville
authored and
John Wang
authored and
Brian Carlstrom
commited 
Simon Wilson
authored and
Michael Jurka
commited 
The Android Automerger
commited 
TK MUN
authored and