Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: 3937646 automerge: 786deba
...
automerge: c91a880c91a880e01
Lorenzo Colitti
authored and
android-build-merger
commited 2015-01-30 15:58:39 +00:00
94ef2da53c
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: 998c8f7
...
automerge: 5b392ee
* commit '5b392ee7584688d6929ca40760d0df2a12bd0b16':
Also include the domain when parceling StaticIpConfiguration.
Lorenzo Colitti
authored and
android-build-merger
commited 2015-01-30 15:56:00 +00:00
e142cde1b3
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: 3937646
...
automerge: 786deba
* commit '786deba636618fcf530e42340b0e5d683c5af74c':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Lorenzo Colitti
authored and
android-build-merger
commited 2015-01-30 15:54:45 +00:00
c91a880e01
Merge "Also include the domain when parceling StaticIpConfiguration."
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2015-01-30 07:07:49 +00:00
998c8f7372
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2015-01-30 07:00:38 +00:00
39376468a4
Also include the domain when parceling StaticIpConfiguration.
...
StaticIpConfiguration objects are parceled at least as part of the
IpConfiguration objects that are passed to IEthernetManager when an
application sets static IP configuration on Ethernet.
Change-Id: I49991e2f591cc6cf01b503c18eb343b5929efe29
Lorenzo Colitti
commited 2015-01-29 12:20:55 +00:00
67635d5982
Merge "Support connecting to networks with misconfigured subnet masks." automerge: 6eaba37 automerge: fb69689
...
automerge: acb4bbaacb4bbad2a
Lorenzo Colitti
authored and
android-build-merger
commited 2015-01-29 08:46:07 +00:00
efdb876a00
Merge "Support connecting to networks with misconfigured subnet masks." automerge: 6eaba37
...
automerge: fb69689
* commit 'fb696894ee24ffee3135f4bc460afa84f23efaeb':
Support connecting to networks with misconfigured subnet masks.
Lorenzo Colitti
authored and
android-build-merger
commited 2015-01-29 08:42:18 +00:00
acb4bbad2a
Merge "Support connecting to networks with misconfigured subnet masks."
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2015-01-29 08:35:36 +00:00
6eaba37f45
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
...
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.
(cherry picked from commit f084aea4d7
Paul Jensen
authored and
Lorenzo Colitti
commited 2015-01-29 17:12:35 +09:00
fe83f04c44
Support connecting to networks with misconfigured subnet masks.
...
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.
Bug: 19067207
(cherry picked from commit d2a878d730
Lorenzo Colitti
commited 2015-01-28 20:36:37 +09:00
d5824b5d2b
merge in master-release history after reset to master
The Android Automerger
commited 2015-01-24 05:52:50 -08:00
7928c3f404
am 50f9d93a: am 220f987b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
...
automerge: 2ee310c2ee310c9c1
Lorenzo Colitti
authored and
android-build-merger
commited 2015-01-23 13:05:26 +00:00
22d4a6f870
am 50f9d93a: am 220f987b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
...
* commit '50f9d93a1c6f3d9f28966dd61997b4b780f31fb2':
Support connecting to networks with misconfigured subnet masks.
Lorenzo Colitti
authored and
Android Git Automerger
commited 2015-01-23 13:01:42 +00:00
2ee310c9c1
Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
Lorenzo Colitti
authored and
Android (Google) Code Review
commited 2015-01-23 12:50:32 +00:00
220f987bde
Support connecting to networks with misconfigured subnet masks.
...
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.
Bug: 19067207
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b
Lorenzo Colitti
commited 2015-01-23 21:10:34 +09:00
d2a878d730
merge in master-release history after reset to master
The Android Automerger
commited 2015-01-22 05:52:22 -08:00
c0a3855b01
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 8640c5d automerge: 4f36150
...
automerge: 0a30fd70a30fd758a
Erik Kline
authored and
android-build-merger
commited 2015-01-22 07:22:19 +00:00
ff4e44dde5
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 8640c5d
...
automerge: 4f36150
* commit '4f3615036db441c4a099dc789ebcdf641ac5a987':
Log interface name and uid when filtering a blocked network.
Erik Kline
authored and
android-build-merger
commited 2015-01-22 07:18:00 +00:00
0a30fd758a
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev
Erik Kline
authored and
Android (Google) Code Review
commited 2015-01-22 07:07:36 +00:00
8640c5de6c
am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev automerge: 9e7cb40
...
automerge: ef9f564ef9f564407
Robert Greenwalt
authored and
android-build-merger
commited 2015-01-22 00:10:54 +00:00
29797098f9
am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev
...
automerge: 9e7cb40
* commit '9e7cb40ddf055ecf1033555bd9ed90922a3cfa9b':
Fix legacy request removal.
Robert Greenwalt
authored and
android-build-merger
commited 2015-01-22 00:00:43 +00:00
ef9f564407
merge in master-release history after reset to master
The Android Automerger
commited 2015-01-21 05:53:42 -08:00
aac124d07f
Log interface name and uid when filtering a blocked network.
...
Bug: 18707263
Change-Id: Ide9a1670a97eae787b785933de0c80750c2b5601
Erik Kline
commited 2015-01-21 12:02:11 +09:00
a0c6e4539a
am c526df98: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp
...
* commit 'c526df987d
Neil Fuller
authored and
Android Git Automerger
commited 2015-01-20 13:29:31 +00:00
915c21e46d
resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp
...
Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0
Neil Fuller
commited 2015-01-20 13:21:58 +00:00
c526df987d
Changes associated with an OkHttp upgrade
...
Change-Id: I2a4db602aa7ffdef886e0f1a955715a2551a87a5
Neil Fuller
commited 2015-01-20 11:59:24 +00:00
61baa3a7ff
Fix legacy request removal.
...
Don't say we're disconnected from a legacy type until there are no outstanding requests for it.
bug:18946574
Change-Id: I8e45c4a7558f7ced0840b71c50081989ba13c1c7
Robert Greenwalt
commited 2015-01-16 16:06:39 -08:00
b0491bb5a8
merge in master-release history after reset to master
The Android Automerger
commited 2015-01-15 05:52:34 -08:00
ce5ef9222f
resolve merge conflicts of 87f5369 to master.
...
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
Jorim Jaggi
commited 2015-01-15 00:12:18 +01:00
e3de01130b
am be61ffa4: am a76959f5: Merge "Don\'t blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev
...
* commit 'be61ffa4fe42b4e6fdb677c7b1aeefb43ad3ef9f':
Don't blindly teardown unvalidated networks when releasing NetworkRequests.
Paul Jensen
authored and
Android Git Automerger
commited 2015-01-14 19:24:09 +00:00
3897079ce9
Merge "Don't blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev
Paul Jensen
authored and
Android (Google) Code Review
commited 2015-01-14 12:39:01 +00:00
a76959f5f9
Don't blindly teardown unvalidated networks when releasing NetworkRequests.
...
These networks may be on their way to becoming validated at which point
they could satisfy the default NetworkRequest. This change unifies the
is-this-network-needed code into a single function.
bug:18652378
Change-Id: Ia511d5c66be79b47dd7c9348ec02784ab30b960c
Paul Jensen
commited 2015-01-13 09:05:38 -05:00
203a744797
merge in master-release history after reset to master
The Android Automerger
commited 2015-01-10 05:53:10 -08:00
6ffd0a8751
am 904cf829: am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev automerge: 63e2b8e
...
* commit '904cf8295d
Paul Jensen
authored and
Android Git Automerger
commited 2015-01-10 02:15:17 +00:00
7fcc5b711a
am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
...
automerge: 63e2b8e
* commit '63e2b8e058f379582d0325aa84b5de6bfa73e15b':
Remember to cancel lingering when a network again satsifies a NetworkRequest.
Paul Jensen
authored and
android-build-merger
commited 2015-01-10 02:08:59 +00:00
904cf8295d
Remember to cancel lingering when a network again satsifies a NetworkRequest.
...
When WiFi's score drops and then comes back up we would previously linger
WiFi but forget to cancel the linger timeout, so 30s later WiFi would
unexpectedly tear down. This was not completely fixed in 935ceef
Paul Jensen
commited 2015-01-08 10:49:34 -05:00
1e5c6ab3ec
merge in master-release history after reset to master
The Android Automerger
commited 2015-01-07 05:53:47 -08:00
fec62f7b29
am 69855a7b: am 6c93739f: am 034dea3a: Clear process DNS NetID binding when expiring or releaseing legacy requests.
...
* commit '69855a7b69
Paul Jensen
authored and
Android Git Automerger
commited 2015-01-06 20:09:18 +00:00
e257fc69fd
am 6c93739f: am 034dea3a: Clear process DNS NetID binding when expiring or releaseing legacy requests.
...
* commit '6c93739f2f25c8afb77997165fa86be537df67a9':
Clear process DNS NetID binding when expiring or releaseing legacy requests.
Paul Jensen
authored and
Android Git Automerger
commited 2015-01-06 14:57:44 +00:00
69855a7b69
Clear process DNS NetID binding when expiring or releaseing legacy requests.
...
When requests made by ConnectivityManager.startUsingNetworkFeature() are
expired or are canceled via ConnectivityManager.stopUsingNetworkFeature(),
we must remember to clear the binding of DNS requests from the calling
process to the Network satisfying the request.
bug:18778725
Change-Id: I800c808ac6486000241b5d263aa79a1192a9fe9e
Paul Jensen
commited 2015-01-06 09:43:04 -05:00
034dea3a1b
merge in master-release history after reset to master
The Android Automerger
commited 2014-12-31 05:51:42 -08:00
a0a7d2b8b6
am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."
...
automerge: 6ebb2c76ebb2c743a
Narayan Kamath
authored and
android-build-merger
commited 2014-12-31 10:21:39 +00:00
39b19ce1f6
am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."
...
* commit 'd3d95172c3645a1d7a12e540638207ae4fb69cae':
Remove hardcoded include paths.
Narayan Kamath
authored and
Android Git Automerger
commited 2014-12-31 10:19:00 +00:00
6ebb2c743a
Remove hardcoded include paths.
...
ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS.
The dependency on libc/dns/include was bogus and can be removed
trivially.
bug: 18581021
Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18
Narayan Kamath
commited 2014-12-31 10:06:51 +00:00
c247c36ea0
merge in master-release history after reset to master
The Android Automerger
commited 2014-12-27 05:50:54 -08:00
ef976bf41c
am 33868dab: am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev
...
automerge: 81c504281c5042ba0
Robert Greenwalt
authored and
android-build-merger
commited 2014-12-26 20:36:43 +00:00
2d9b23f20e
am 33868dab: am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev
...
* commit '33868dab9af09d61634f1f7ab3a8c704aacd0de0':
Fix timing between bcast and net setup.
Robert Greenwalt
authored and
Android Git Automerger
commited 2014-12-26 20:30:32 +00:00
81c5042ba0
merge in master-release history after reset to master
The Android Automerger
commited 2014-12-20 05:52:06 -08:00
ca88fcd193
Fix timing between bcast and net setup.
...
A legacy network type request would generate a bcast before the network
notification was sent - the legacy startUsingNetworkFeature API requires
the notification so it can bind your dns queries to the new network.
Fast-moving clients could try to use the network before it was ready.
bug:18792871
Change-Id: I24c46ef15c249c50bfc321f62756d1f66dc3a6a9
Robert Greenwalt
commited 2014-12-19 11:54:27 -08:00
01cf982f9d
Lorenzo Colitti
authored and
android-build-merger
commited 
Gerrit Code Review
commited 
Paul Jensen
authored and
The Android Automerger
commited 
Android Git Automerger
commited 
Android (Google) Code Review
commited 
Erik Kline
authored and
Robert Greenwalt
authored and
Neil Fuller
authored and
Jorim Jaggi
commited 
Narayan Kamath
authored and