Erik Kline
ff4e44dde5
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 8640c5d automerge: 4f36150
...
automerge: 0a30fd7
* commit '0a30fd758aae14a64f6bf31e826698dd57115351':
Log interface name and uid when filtering a blocked network.
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
* commit 'ef9f5644077b097d300331fcde7ca7875e4cd9ee':
Fix legacy request removal.
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 .
bug:18826162
Change-Id: I7bb4b99ec969099e9815f46d4c09253be71a29be
2015-01-08 10:49:34 -05:00
Paul Jensen
e257fc69fd
am 69855a7b: am 6c93739f: am 034dea3a: Clear process DNS NetID binding when expiring or releaseing legacy requests.
...
* commit '69855a7b698e80829fe60711b2a9b8c6e52b8e9e':
Clear process DNS NetID binding when expiring or releaseing legacy requests.
2015-01-06 20:09:18 +00:00
Paul Jensen
69855a7b69
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.
2015-01-06 14:57:44 +00:00
Paul Jensen
034dea3a1b
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
2015-01-06 09:43:04 -05:00
Narayan Kamath
39b19ce1f6
am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."
...
automerge: 6ebb2c7
* commit '6ebb2c743a8a03d26664996b93a4792ca44580b8':
Remove hardcoded include paths.
2014-12-31 10:21:39 +00:00
Narayan Kamath
6ebb2c743a
am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."
...
* commit 'd3d95172c3645a1d7a12e540638207ae4fb69cae':
Remove hardcoded include paths.
2014-12-31 10:19:00 +00:00
Narayan Kamath
c247c36ea0
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
2014-12-31 10:06:51 +00:00
Robert Greenwalt
2d9b23f20e
am 33868dab: am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev
...
automerge: 81c5042
* commit '81c5042ba0f0d58ec04ac1f07869dda782bf3dbe':
Fix timing between bcast and net setup.
2014-12-26 20:36:43 +00:00
Robert Greenwalt
81c5042ba0
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.
2014-12-26 20:30:32 +00:00
Robert Greenwalt
01cf982f9d
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
2014-12-19 11:54:27 -08:00
Lorenzo Colitti
5933735259
am 7e81cdef: am af3f8553: Add a lastValidated bit and use it when reporting capabilities.
...
automerge: 95c793a2
* commit '95c793a23d16ef3f4ea0ee87ea1c126b92bde288':
Add a lastValidated bit and use it when reporting capabilities.
2014-12-19 10:51:18 +00:00
Lorenzo Colitti
aaf03c3b12
am b069e434: am 80a0b535: Rename validated to everValidated.
...
automerge: db09781
* commit 'db0978147a3a9716db2cddf3d6f3e6fe5aa70f0b':
Rename validated to everValidated.
2014-12-19 10:49:24 +00:00
Lorenzo Colitti
95c793a23d
am 7e81cdef: am af3f8553: Add a lastValidated bit and use it when reporting capabilities.
...
* commit '7e81cdef3625b52642969dd226a1446745e633e8':
Add a lastValidated bit and use it when reporting capabilities.
2014-12-19 10:47:26 +00:00
Lorenzo Colitti
db0978147a
am b069e434: am 80a0b535: Rename validated to everValidated.
...
* commit 'b069e434cba6dd8f949c3ebe44507da32aef3496':
Rename validated to everValidated.
2014-12-19 10:47:20 +00:00
Lorenzo Colitti
af3f855333
Add a lastValidated bit and use it when reporting capabilities.
...
When we switched the way the status bar determines if a
connection is validated from using INET_CONDITION_ACTION
broadcasts to calling getDefaultNetworkCapabilitiesForUser(),
the statusbar stopped displaying ! when a network stopped having
working Internet connectivity. This is because the validated bit
is never set to false once a network is validated.
Fix this, hopefully temporarily, by introducing a new validated
bit that does go back to being false when a network no longer
has working connectivity, and use that bit in
getDefaultNetworkCapabilitiesForUser().
Bug: 18777225
Change-Id: I991c068be50252391d0e64c647fcf2e053dc82f9
2014-12-19 19:10:42 +09:00
Lorenzo Colitti
80a0b535a8
Rename validated to everValidated.
...
This is a straight rename and thus a complete no-op from a
functionality perspective.
Bug: 18777225
Change-Id: I140d7640f1460c869a311294873772819a7a7059
2014-12-19 19:10:42 +09:00
Paul Jensen
fdd3384f9f
am eeea8725: am 24594794: am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev
...
* commit 'eeea8725dd4ec720971ff5c36721bb4d67d8af05':
Fix race between CONNECTIVITY_ACTION and setting default network.
2014-12-17 13:11:21 +00:00
Paul Jensen
eeea8725dd
am 24594794: am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev
...
* commit '24594794cbb9bf6bb9c8b57e4427c88efee82304':
Fix race between CONNECTIVITY_ACTION and setting default network.
2014-12-17 13:05:39 +00:00
Paul Jensen
314f51e80d
Fix race between CONNECTIVITY_ACTION and setting default network.
...
Now that the delay between connectivity changes and CONNECTIVITY_ACTION
has been removed (ag/599650) races between CONNECTIVITY_ACTION and
the setting of the default network become more evident.
In http://crbug.com/441818 Chrome is calling getaddrinfo()
immediately after a device goes from no connectivity to cellular
connectivity, and Chrome is erroneously getting back EAI_NODATA
because netd hasn't yet set the default network for DNS resolutions.
bug:18757162
Change-Id: Ib607dcb3697403272a8c838713a9cb602e9c6820
2014-12-15 15:20:30 -05:00
Paul Jensen
025b336325
am 269d28ea: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev automerge: d9d48cc
...
automerge: 51d8af7
* commit '51d8af74a542a78682d37e4cd1e3541d45a858f0':
Fix several HTTP proxy issues with multinetworking.
2014-12-11 10:25:47 +00:00
Paul Jensen
51d8af74a5
am 269d28ea: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
...
automerge: d9d48cc
* commit 'd9d48cc9c7ab0d1590918e199917968eafc48288':
Fix several HTTP proxy issues with multinetworking.
2014-12-11 05:49:18 +00:00
Paul Jensen
269d28ea09
Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
2014-12-11 04:51:16 +00:00
Erik Kline
a841f3a6b4
am cb34622b: am b6992b4e: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev automerge: 56d2e8f
...
* commit 'cb34622bc7547fc9ee612eea4ffe780da4383ab6':
Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
2014-12-10 21:58:42 +00:00
Paul Jensen
1213135858
Fix several HTTP proxy issues with multinetworking.
...
1. Send PROXY_CHANGE_ACTION broadcast when any network's proxy changes,
not just the default network.
2. When a process is bound to a particular Network, update the proxy
system properties to those for the bound Network, and keep them
updated when PROXY_CHANGE_ACTION broadcasts are received.
3. Make Network.openConnection() use the proxy for the Network.
bug:17905627
bug:17420465
bug:18144582
(cherry-pick of https://android-review.googlesource.com/#/c/115170 )
Change-Id: Ia2819985e6108a8c121e74c683a5646becfd0a97
2014-12-10 15:22:12 -05:00
Erik Kline
cb34622bc7
am b6992b4e: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
...
automerge: 56d2e8f
* commit '56d2e8fb7b2ab6e32efea59604eb0cd72745df1b':
Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
2014-12-10 19:06:50 +00:00
Erik Kline
b6992b4ea8
Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
2014-12-10 07:29:47 +00:00
Wink Saville
62b358f9fd
am 421a8451: am 2f5cb843: am e6ec511d: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
...
* commit '421a8451e85ce781c0800a70f29cd74a8a98452c':
Add subId as parameter for get/setDataEnabled.
2014-12-09 23:47:19 +00:00
Jeff Sharkey
87ad83ed10
am 2f94bf63: am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
...
* commit '2f94bf63a749204e6472cd423fd9bb830161590b':
Direct notification of network interface changes.
2014-12-09 23:20:26 +00:00
Jeff Sharkey
7da4003ef1
am 843d49ab: am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
...
* commit '843d49abeaa843e87bf18e75e240ced4915dc893':
Offer to "merge" subscribers for data usage.
2014-12-09 22:23:19 +00:00
Wink Saville
421a8451e8
am 2f5cb843: am e6ec511d: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
...
* commit '2f5cb843553a596d314596c2bb776541db864d63':
Add subId as parameter for get/setDataEnabled.
2014-12-09 18:06:03 +00:00
Wink Saville
e6ec511d92
Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
2014-12-09 17:52:27 +00:00
Jeremy Joslin
730455234b
am a20d7aa6: am c4b2ec1a: am 7032a8b9: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev
...
* commit 'a20d7aa65daf1c374bc4dba2cfc957fa52092adf':
Don't send the same PendingIntent more than once.
2014-12-09 01:00:09 +00:00
Paul Jensen
5c2d8224ab
am 5eba470d: am a4afe13a: am e19ed284: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev
...
* commit '5eba470dd732509ce4922c46cd37dfd5e11ed557':
Reap unvalidated networks that have no chance of becoming highest scoring.
2014-12-09 01:00:00 +00:00
Dianne Hackborn
38e1f92aa7
am 28fa1299: am e52a2ea0: am ebd504dc: Merge "Fix issue #17323751 : Additional items in aggregated battery stats" into lmp-mr1-dev
...
* commit '28fa1299fa764106eff33e4feacafc54ed153cad':
Fix issue #17323751 : Additional items in aggregated battery stats
2014-12-09 00:59:01 +00:00