Lorenzo Colitti
ef767c8ea8
Merge changes from topic \\'networkrequest_private\\' into nyc-mr1-dev am: 0317e03dc3
...
am: 6c9dbf4d48
2016-07-01 15:27:07 +00:00
Lorenzo Colitti
6c9dbf4d48
Merge changes from topic \'networkrequest_private\' into nyc-mr1-dev
...
am: 0317e03dc3
Change-Id: Ia063c378bd32fdb056c0ecdc0f721d32e9fa49af
2016-07-01 15:20:21 +00:00
Lorenzo Colitti
e0d1a03d4e
Make the NetworkRequest list private to NetworkAgentInfo.
...
This allows us to keep track of how many live requests a network
is satisfying without having to count them every time.
Bug: 23113288
Change-Id: Ic4756676491e09071dbf80b7c48da3be028d68eb
2016-07-01 21:14:26 +09:00
Lorenzo Colitti
a4505cafab
Move the request type from NetworkRequestInfo to NetworkRequest.
...
This will allow us to simplify code that deals with
NetworkRequests outside ConnectivityService.
Bug: 23113288
Change-Id: I9b3a859d0c68cad73d7f6baa4b584d13ffd2ae36
2016-07-01 20:15:19 +09:00
Lorenzo Colitti
9748a4ffb4
Merge changes I65784f35,Ib6937335 into nyc-mr1-dev am: 74f7f2ec0d
...
am: 3c6e0af2c2
2016-06-30 14:43:30 +00:00
Lorenzo Colitti
3c6e0af2c2
Merge changes I65784f35,Ib6937335 into nyc-mr1-dev
...
am: 74f7f2ec0d
Change-Id: Iba950e7837d91f83a9c2bcd7fc8e7b1193038400
2016-06-30 14:33:25 +00:00
Tobias Thierer
12af1b2ee7
Merge \\\\"Changes for upgrade to OkHttp 2.7.5\\\\" am: 9ca932b06e am: 776136f77c am: 6b473f7b67
...
am: 17f75b01ef
2016-06-30 13:12:46 +00:00
Tobias Thierer
17f75b01ef
Merge \\\"Changes for upgrade to OkHttp 2.7.5\\\" am: 9ca932b06e am: 776136f77c
...
am: 6b473f7b67
Change-Id: I3a0dc1da2ee96d71c38cab727141efcb686627e1
2016-06-30 13:04:52 +00:00
Tobias Thierer
776136f77c
Merge \"Changes for upgrade to OkHttp 2.7.5\"
...
am: 9ca932b06e
2016-06-30 12:49:47 +00:00
Lorenzo Colitti
45d7358303
Add detailed test coverage for lingering.
...
Bug: 23113288
Change-Id: I65784f3589378d97f3c824e600f21f361be8741e
2016-06-30 21:42:17 +09:00
Tobias Thierer
9ca932b06e
Merge "Changes for upgrade to OkHttp 2.7.5"
2016-06-30 12:35:03 +00:00
Lorenzo Colitti
1bc034cb87
Add more test coverage for requests and callbacks.
...
1. Support multiple callbacks in TestNetworkCallback. This is
necessary to test situations where multiple callbacks are
generated by the same event (e.g., CALLBACK_LOSING on cell
with CALLBACK_AVAILABLE on wifi when wifi connects), which is
necessary to test callback order. So far this has not been
covered because all callback testing was using per-network
callbacks.
2. Add a benchmark test for registering NetworkRequests and for
sending onAvailable and onLosing callbacks.
Bug: 23113288
Change-Id: Ib69373358ad766ab1bd989e864a5a51ef762c73c
2016-06-30 13:18:12 +09:00
Tobias Thierer
852f2e2ec0
Changes for upgrade to OkHttp 2.7.5
...
- Use com.android.okhttp.Dns in place of com.android.okhttp.internal.Network
- Specify TimeUnit.MILLISECONDS for timeouts which 2.7.5 allows and
brings us closer to 3+
Change-Id: I95b5d72a94ebe1389f7c2e8d95903aa1aadd944b
2016-06-29 17:41:32 +01:00
Hugo Benichi
1ce90f1b8c
Adding tests for DnsEventListenerService am: c1aead00e7
...
am: 16e1a3a679
2016-06-29 07:23:22 +00:00
Hugo Benichi
973cc38494
Refactor IP connectivity event logging am: 3bdc8357fe
...
am: 2229b20b34
2016-06-29 07:23:19 +00:00
Hugo Benichi
16e1a3a679
Adding tests for DnsEventListenerService
...
am: c1aead00e7
2016-06-29 07:18:32 +00:00
Hugo Benichi
2229b20b34
Refactor IP connectivity event logging
...
am: 3bdc8357fe
2016-06-29 07:18:28 +00:00
Hugo Benichi
c1aead00e7
Adding tests for DnsEventListenerService
...
Bug: 29035129
Change-Id: Iaf0d9ec781da7a473b6f7d8623060ecde44b9cbd
2016-06-29 14:28:51 +09:00
Hugo Benichi
3bdc8357fe
Refactor IP connectivity event logging
...
This patch removes static methods for logging IP connectivity events
defined in android.net.metrics and replaces them with a single log()
instance method defined on IpConnectivityLog. Event constructors are
now public also. Every classes logging such events now create an
instance of IpConnectivityLog for logging event objects directly
instantiated with new.
Removing static dependencies allow straightforward testing of logging.
This patch also removes the base IpConnectivityEvent class which is not
needed any more.
Bug: 29035129
Change-Id: I3de700f93f46deaa48a759f938f7d00e1d8bff98
2016-06-29 14:28:51 +09:00
Hugo Benichi
bb1c4b96c4
Merge \\"Fix unsafe concurrent access in LegacyTypeTracker\\" into nyc-mr1-dev am: 90b2c781ff
...
am: dd0d4300e5
2016-06-27 08:06:58 +00:00
Hugo Benichi
dd0d4300e5
Merge \"Fix unsafe concurrent access in LegacyTypeTracker\" into nyc-mr1-dev
...
am: 90b2c781ff
Change-Id: I6af8e185a165009f2b7b6efef764c883488bd7bf
2016-06-27 08:02:44 +00:00
Hugo Benichi
9c807fdcd4
Fix unsafe concurrent access in LegacyTypeTracker
...
This patch adds synchronization inside LegacyTypeTracker so that
getNetworkForType() can safely run concurrently with remove().
Without synchronization if remove() removes the last network for a
given type while getNetworkForType() runs for the same type, it is
possible that getNetworkForType tries to access the head of an empty
list, resulting in a runtime exception.
This issue was found by zoran.jovanovic@sonymobile.com who proposed a
fix in AOSP (Change-Id: Ia963662edb9d643790e8d9439e4dbdcac4c2187b).
This patch differs from the fix proposed by the bug reporter and tries
instead to do the minimum amount of locking to make getNetworkForType
safe.
Bug: 29030387
Change-Id: I915aac527fc8828b32bf35fee870add2dfb11d8d
2016-06-27 15:04:27 +09:00
Felipe Leme
1658fa81a7
Merge \"Merge \\"resolve merge conflicts of fa2715e to nyc-mr1-dev\\" into nyc-mr1-dev am: 10973455bc\" into nyc-mr1-dev-plus-aosp
...
am: 2ee4519a26
Change-Id: I8f54f9f8d3faee5a1ee3c77f04486869d5936610
2016-06-22 00:55:00 +00:00
Felipe Leme
f4813e82e3
Merge \"resolve merge conflicts of fa2715e to nyc-mr1-dev\" into nyc-mr1-dev
...
am: 10973455bc
Change-Id: I45cac1ca8a06196b61379cd86d6ac248bfa5d6b4
2016-06-21 23:49:22 +00:00
Felipe Leme
be93c8292a
resolve merge conflicts of c65d475 to nyc-mr1-dev-plus-aosp
...
am: 632e3ab174
2016-06-21 21:35:16 +00:00
Felipe Leme
632e3ab174
resolve merge conflicts of c65d475 to nyc-mr1-dev-plus-aosp
...
Change-Id: Ic75a6926e4bd2b8199e4feb7af315e84659d03a2
2016-06-21 13:41:22 -07:00
Felipe Leme
7d0177d5d7
resolve merge conflicts of fa2715e to nyc-mr1-dev
...
Change-Id: If0a1e7e70aa33e99f05694a37c2a54c567449507
2016-06-21 13:12:53 -07:00
Felipe Leme
c65d475906
Merge \"Ignore system apps on enforceMeteredApnPolicy().\" into nyc-dev
...
am: fa2715e03b
Change-Id: I98440b2ae3371661ed8b1b2f29b0ba18e1b6e6c3
2016-06-21 19:59:53 +00:00
Felipe Leme
ff76014fe8
Ignore system apps on enforceMeteredApnPolicy().
...
BUG: 29514913
Fixes: 29448383
Change-Id: I19eb004c937e1c872bbf82caa7a919e43d48a259
2016-06-20 17:15:46 -07:00
Robin Lee
c45962a9c5
Merge \\\"Move \\\'is already always-on\\\' check into Vpn.java\\\" into nyc-dev am: 6a58c98cef am: f062d0b193
...
am: 7b8d82484a
2016-06-16 10:26:41 +00:00
Robin Lee
7b8d82484a
Merge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am: 6a58c98cef
...
am: f062d0b193
2016-06-16 10:21:39 +00:00
Robin Lee
b392fc54f5
Merge \\\"Move \\\'is already always-on\\\' check into Vpn.java\\\" into nyc-dev am: 6a58c98cef am: b4f3bf969d
...
am: f99a160ca1
2016-06-16 10:18:43 +00:00
Robin Lee
f99a160ca1
Merge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am: 6a58c98cef
...
am: b4f3bf969d
2016-06-16 10:14:06 +00:00
Robin Lee
f062d0b193
Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
...
am: 6a58c98cef
2016-06-16 10:10:23 +00:00
Robin Lee
b4f3bf969d
Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
...
am: 6a58c98cef
2016-06-16 10:10:23 +00:00
Robin Lee
6a58c98cef
Merge "Move 'is already always-on' check into Vpn.java" into nyc-dev
2016-06-16 10:06:11 +00:00
Robin Lee
a4325d282c
Move 'is already always-on' check into Vpn.java
...
It's with the rest of the logic now and allows checking whether the
lockdown state matches, too, which led to a lot of misunderstandings.
Fix: 29199431
Change-Id: I94a2c38c4837f9c33b5b9c2becb52eeb7e2a2534
2016-06-14 13:24:17 +00:00
Paul Jensen
71fd4d1126
Merge \\\"Show sign-in to network notification to all users, not just owner.\\\" into nyc-dev am: 634bd0eb4e am: 601f877903
...
am: 7bf7ae573c
2016-06-14 11:30:35 +00:00
Paul Jensen
68646c4676
Merge \\\"Show sign-in to network notification to all users, not just owner.\\\" into nyc-dev am: 634bd0eb4e am: 6715499061
...
am: 7a68a26148
2016-06-14 11:25:41 +00:00
Paul Jensen
7bf7ae573c
Merge \\"Show sign-in to network notification to all users, not just owner.\\" into nyc-dev am: 634bd0eb4e
...
am: 601f877903
2016-06-14 11:24:57 +00:00
Paul Jensen
7a68a26148
Merge \\"Show sign-in to network notification to all users, not just owner.\\" into nyc-dev am: 634bd0eb4e
...
am: 6715499061
2016-06-14 11:21:12 +00:00
Paul Jensen
601f877903
Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev
...
am: 634bd0eb4e
2016-06-14 11:16:15 +00:00
Paul Jensen
6715499061
Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev
...
am: 634bd0eb4e
2016-06-14 11:16:12 +00:00
Paul Jensen
634bd0eb4e
Merge "Show sign-in to network notification to all users, not just owner." into nyc-dev
2016-06-14 11:05:32 +00:00
Paul Jensen
efffb79661
Show sign-in to network notification to all users, not just owner.
...
All users should be made aware a captive portal is in place and be
given the opportunity to sign into the network. Without this fix
other users are not notified and given a chance to sign-in.
Change-Id: I1bf823d5f6a36f391dca4be5f6a584e8562a72a7
Fixes: 23079964
2016-06-13 09:39:28 -04:00
Robin Lee
89c239acf1
Merge \\\"Package changed/removed listeners for always-on VPN\\\" into nyc-dev am: ee5e4cc836 am: f187518b18
...
am: 352ca4e0ef
2016-06-08 11:06:41 +00:00
Robin Lee
114c6d7a71
Merge \\\"Package changed/removed listeners for always-on VPN\\\" into nyc-dev am: ee5e4cc836 am: 198d78012d
...
am: 0e79a48a5f
2016-06-08 11:00:30 +00:00
Robin Lee
352ca4e0ef
Merge \\"Package changed/removed listeners for always-on VPN\\" into nyc-dev am: ee5e4cc836
...
am: f187518b18
2016-06-08 10:57:22 +00:00
Robin Lee
0e79a48a5f
Merge \\"Package changed/removed listeners for always-on VPN\\" into nyc-dev am: ee5e4cc836
...
am: 198d78012d
2016-06-08 10:54:52 +00:00
Robin Lee
f187518b18
Merge \"Package changed/removed listeners for always-on VPN\" into nyc-dev
...
am: ee5e4cc836
Change-Id: Idd2e019feb73bd580aa7d8baba03c27083e26b02
2016-06-08 10:50:43 +00:00
