Narayan Kamath
6478469ae5
Merge "Move apache specific portions of android.net.http to external/apache-http."
2015-02-13 09:51:44 +00:00
Jeremy Joslin
b5ad62a8f5
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
2015-02-12 19:40:58 +00:00
Jeremy Joslin
a0b0e76b46
am 861103ca: am 1267462c: am f456d4dc: am 0fb710e4: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
...
* commit '861103ca17c192f8d2f93050ed77a197e4d87570':
Update Javadoc for EXTRA_NETWORK.
2015-02-12 19:40:48 +00:00
Jeremy Joslin
3dccd6654e
am 1267462c: am f456d4dc: am 0fb710e4: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
...
automerge: 861103c
2015-02-12 19:39:20 +00:00
Jeremy Joslin
861103ca17
am 1267462c: am f456d4dc: am 0fb710e4: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
...
* commit '1267462c0bf8ef5a0cfaca535847fc962b2cf32e':
Update Javadoc for EXTRA_NETWORK.
2015-02-12 18:56:35 +00:00
Jeremy Joslin
0fb710e494
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
2015-02-12 18:34:03 +00:00
Narayan Kamath
439fe7bfb0
Move apache specific portions of android.net.http to external/apache-http.
...
We continue to compile external/apache-http into ext.jar. This contains
a few changes apart fom the classes moving around :
- Makefile changes to build docs and api-stubs for now. A future change
will revert these changes and remove these classes from stubs and
docs.
- Hardcode event IDs in legacyerrorstrings to avoid a dependency between
the frameworks and apache. These strings are on their way out and will
never change anyway.
- Remove imports due to {@link} tags and use {@code} instead.
- Remove an accidental(?) dependency on apache commons code that's a
part of apache-http.
bug: 18027885
Change-Id: I51cd038d846ec7d02c283a4541b10a6a9cf62ecf
2015-02-12 11:15:49 +00:00
Lorenzo Colitti
2a6543b79a
am b0dfaad8: am f99551d8: am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
...
automerge: a71787a
2015-02-12 07:51:11 +00:00
Lorenzo Colitti
a71787a1eb
am b0dfaad8: am f99551d8: am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
...
* commit 'b0dfaad8c2a02c33885e6a278c7901da69d8ab49':
Make reportInetCondition revalidate if the report differs from our state
2015-02-12 03:09:57 +00:00
Jeremy Joslin
fe76e0e853
Update Javadoc for EXTRA_NETWORK.
...
Bug: 19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef
2015-02-11 18:28:57 -08:00
Lorenzo Colitti
3c4f6c2fbb
am 28707dd6: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b automerge: 00c8450
...
* commit '28707dd663af8772c3069b6b66b13b2d07b3f3c0':
Make getNetworkInfo() take into account VPN underlying networks.
2015-02-11 07:40:08 +00:00
Lorenzo Colitti
28707dd663
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b
...
automerge: 00c8450
* commit '00c8450d2711de57ee45f66cae1050dbca98d1f5':
Make getNetworkInfo() take into account VPN underlying networks.
2015-02-11 07:32:53 +00:00
Lorenzo Colitti
bdda6bf579
Make reportInetCondition revalidate if the report differs from our state
...
1. If reportInetCondition says the network is not working, and
the network is already marked not validated, don't revalidate
it. This was superfluous and should save battery.
2. If reportInetCondition says the network is working, and the
network is not marked as validated, revalidated. This will
allow us to get out of a validated state quickly based on app
input (e.g., allowing GCM's exponential backoff timer to drive
revalidation instead of our 10-minute timer).
Bug: 19258761
Bug: 19209043
Change-Id: Iaa4bac82d117ed1f4088dab106e6f6ce46b34bc3
2015-02-11 11:03:50 +09:00
Lorenzo Colitti
66d4ed04ca
Make getNetworkInfo() take into account VPN underlying networks.
...
If a user is subject to a VPN, getActiveNetworkInfo() will return
the VPN's underlying network (e.g., TYPE_WIFI), so that apps that
call getActiveNetworkInfo to answer questions like "is the device
connected to wifi?" will continue to work. Make getNetworkInfo
do this as well: if the query is for a network type that is
underlying the current user's VPN, then return that network.
Bug: 19196545
Change-Id: Ic5a651735b927c758594a26d26a03fbd704b52e6
2015-02-11 10:21:01 +09:00
Lorenzo Colitti
579c5cd0fc
am 2a93f1de: am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."
...
* commit '2a93f1de470cc6981bb4d55f1044ea1160817496':
Add a unit test for StaticIpConfiguration.
2015-02-05 02:41:31 +00:00
Lorenzo Colitti
2a93f1de47
am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."
...
* commit '12b26c12483633f7a75d1f1c9ead73eaf6056811':
Add a unit test for StaticIpConfiguration.
2015-02-05 02:31:40 +00:00
Lorenzo Colitti
e5c450b671
Add a unit test for StaticIpConfiguration.
...
Change-Id: I68c735def8a242da0c8f95b7c5ea680ed902dab7
2015-02-04 17:28:35 +09:00
Lorenzo Colitti
548851645c
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: 998c8f7 automerge: 5b392ee
...
automerge: e142cde
2015-01-30 15:59:49 +00:00
Lorenzo Colitti
94ef2da53c
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: 3937646 automerge: 786deba
...
automerge: c91a880
2015-01-30 15:58:39 +00:00
Lorenzo Colitti
e142cde1b3
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: 998c8f7
...
automerge: 5b392ee
* commit '5b392ee7584688d6929ca40760d0df2a12bd0b16':
Also include the domain when parceling StaticIpConfiguration.
2015-01-30 15:56:00 +00:00
Lorenzo Colitti
c91a880e01
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: 3937646
...
automerge: 786deba
* commit '786deba636618fcf530e42340b0e5d683c5af74c':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
2015-01-30 15:54:45 +00:00
Lorenzo Colitti
998c8f7372
Merge "Also include the domain when parceling StaticIpConfiguration."
2015-01-30 07:07:49 +00:00
Lorenzo Colitti
39376468a4
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"
2015-01-30 07:00:38 +00:00
Lorenzo Colitti
67635d5982
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
2015-01-29 12:20:55 +00:00
Lorenzo Colitti
efdb876a00
Merge "Support connecting to networks with misconfigured subnet masks." automerge: 6eaba37 automerge: fb69689
...
automerge: acb4bba
2015-01-29 08:46:07 +00:00
Lorenzo Colitti
acb4bbad2a
Merge "Support connecting to networks with misconfigured subnet masks." automerge: 6eaba37
...
automerge: fb69689
* commit 'fb696894ee24ffee3135f4bc460afa84f23efaeb':
Support connecting to networks with misconfigured subnet masks.
2015-01-29 08:42:18 +00:00
Lorenzo Colitti
6eaba37f45
Merge "Support connecting to networks with misconfigured subnet masks."
2015-01-29 08:35:36 +00:00
Paul Jensen
fe83f04c44
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
2015-01-29 17:12:35 +09:00
Lorenzo Colitti
d5824b5d2b
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
2015-01-28 20:36:37 +09:00
Lorenzo Colitti
22d4a6f870
am 50f9d93a: am 220f987b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
...
automerge: 2ee310c
2015-01-23 13:05:26 +00:00
Lorenzo Colitti
2ee310c9c1
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.
2015-01-23 13:01:42 +00:00
Lorenzo Colitti
220f987bde
Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
2015-01-23 12:50:32 +00:00
Lorenzo Colitti
d2a878d730
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
2015-01-23 21:10:34 +09:00
Erik Kline
ff4e44dde5
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 8640c5d automerge: 4f36150
...
automerge: 0a30fd7
2015-01-22 07:22:19 +00:00
Erik Kline
0a30fd758a
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.
2015-01-22 07:18:00 +00:00
Erik Kline
8640c5de6c
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev
2015-01-22 07:07:36 +00:00
Robert Greenwalt
29797098f9
am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev automerge: 9e7cb40
...
automerge: ef9f564
2015-01-22 00:10:54 +00:00
Robert Greenwalt
ef9f564407
am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev
...
automerge: 9e7cb40
* commit '9e7cb40ddf055ecf1033555bd9ed90922a3cfa9b':
Fix legacy request removal.
2015-01-22 00:00:43 +00:00
Erik Kline
a0c6e4539a
Log interface name and uid when filtering a blocked network.
...
Bug: 18707263
Change-Id: Ide9a1670a97eae787b785933de0c80750c2b5601
2015-01-21 12:02:11 +09:00
Neil Fuller
915c21e46d
am c526df98: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp
...
* commit 'c526df987d8c8e53e7de5480254c5f03eba06f49':
Changes associated with an OkHttp upgrade
2015-01-20 13:29:31 +00:00
Neil Fuller
c526df987d
resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp
...
Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0
2015-01-20 13:21:58 +00:00
Neil Fuller
61baa3a7ff
Changes associated with an OkHttp upgrade
...
Change-Id: I2a4db602aa7ffdef886e0f1a955715a2551a87a5
2015-01-20 11:59:24 +00:00
Robert Greenwalt
b0491bb5a8
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
2015-01-16 16:06:39 -08:00
Jorim Jaggi
e3de01130b
resolve merge conflicts of 87f5369 to master.
...
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
2015-01-15 00:12:18 +01:00
Paul Jensen
3897079ce9
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.
2015-01-14 19:24:09 +00:00
Paul Jensen
a76959f5f9
Merge "Don't blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev
2015-01-14 12:39:01 +00:00
Paul Jensen
203a744797
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
2015-01-13 09:05:38 -05:00
Paul Jensen
7fcc5b711a
am 904cf829: am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev automerge: 63e2b8e
...
* commit '904cf8295d8565c41189bb5fd3eb479d4ff8e083':
Remember to cancel lingering when a network again satsifies a NetworkRequest.
2015-01-10 02:15:17 +00:00
Paul Jensen
904cf8295d
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.
2015-01-10 02:08:59 +00:00
Paul Jensen
1e5c6ab3ec
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
2015-01-08 10:49:34 -05:00
