Commit Graph

2839 Commits

Author SHA1 Message Date
Hugo Benichi
4f03ac8b93 Merge \\"ConnectivityManager: no double callback remove\\" into nyc-mr1-dev am: cde023a3ea
am: e7b50f9ed8

Change-Id: I8fb5bac2bb6b7665192c8c788d7818d637500935
2016-07-07 09:45:36 +00:00
Hugo Benichi
e7b50f9ed8 Merge \"ConnectivityManager: no double callback remove\" into nyc-mr1-dev
am: cde023a3ea

Change-Id: Ib7b10c59c1f7c84ec78c7527fba8a6c9aa5b0c05
2016-07-07 09:38:29 +00:00
TreeHugger Robot
cde023a3ea Merge "ConnectivityManager: no double callback remove" into nyc-mr1-dev 2016-07-07 09:33:35 +00:00
Lorenzo Colitti
bfb539e90a Merge \\"Prepare to delete useless loop in handleReleaseNetworkRequest.\\" into nyc-mr1-dev am: 540ee120e5
am: bebd1cf7fe

Change-Id: I68c75cd5980075bdb2586ba5967fcb6ce20dc158
2016-07-07 07:49:13 +00:00
Lorenzo Colitti
bebd1cf7fe Merge \"Prepare to delete useless loop in handleReleaseNetworkRequest.\" into nyc-mr1-dev
am: 540ee120e5

Change-Id: I8cd95575e7758ee94417ec15e407f396434f4c04
2016-07-07 07:40:46 +00:00
TreeHugger Robot
540ee120e5 Merge "Prepare to delete useless loop in handleReleaseNetworkRequest." into nyc-mr1-dev 2016-07-07 07:33:07 +00:00
Lorenzo Colitti
daeb6109e1 Prepare to delete useless loop in handleReleaseNetworkRequest.
As explained in the TODO, the loop serves no purpose since only
one network can be satisfying a given request at a time.

Instead of looping, look up the nai in the mNetworkForRequestId
array that exists for this purpose.

Keep the loop around with an Slog.wtf statement on it so we can
see if we ever hit it, and add a TODO to delete it if we don't.

Bug: 23113288
Change-Id: I173de4bd45c5a4169b7a062a981f2ecccaa44143
2016-07-07 14:50:12 +09:00
Lorenzo Colitti
52fd5de631 Merge \"Merge \\"Merge \\\"Make registerDefaultNetwork work on metered networks.\\\" into nyc-dev am: 33cdc4d136 -s ours\\" into nyc-mr1-dev am: 6f93a6c2c3\" into nyc-mr1-dev-plus-aosp
am: c2681c499e

Change-Id: I173678ab505e60158335258459c68eddeae124ec
2016-07-07 01:47:42 +00:00
Lorenzo Colitti
c5877d5645 Merge \\\"Make registerDefaultNetwork work on metered networks.\\\" into nyc-dev am: 33cdc4d136 am: a3dfda9f45 -s ours
am: 6832194059

Change-Id: Id4761d4e1a64a20f597286890a95b1c375a0ba05
2016-07-07 01:37:46 +00:00
Android Build Merger (Role)
c2681c499e Merge "Merge \"Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am: 33cdc4d136 -s ours\" into nyc-mr1-dev am: 6f93a6c2c3" into nyc-mr1-dev-plus-aosp 2016-07-07 01:33:11 +00:00
Pankaj Kanwar
6832194059 Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am: 33cdc4d136
am: a3dfda9f45  -s ours

Change-Id: I71fcfb810a477f5bcc3d7642375c6ef56b747517
2016-07-07 01:32:00 +00:00
Lorenzo Colitti
851b195d93 Merge \"Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am: 33cdc4d136 -s ours\" into nyc-mr1-dev
am: 6f93a6c2c3

Change-Id: I160e1a702a5e879da775ddf9e360ef5c3d206973
2016-07-07 01:31:50 +00:00
Lorenzo Colitti
ad42377f7b Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev
am: 33cdc4d136  -s ours

Change-Id: Iacee53c01e7de163e677ab57bc2d7044f8aff952
2016-07-07 01:24:58 +00:00
Hugo Benichi
1c17c30063 ConnectivityManager: no double callback remove
This patch partially undoes ag/869831 (Change-Id:
Ia42ed7aefaebd8caf3eada8e42b6cb7a940d7647) so that ConnectivityManager
does not remove callbacks from its internal request-to-callback map at
unregistration, but instead let the singleton CallbackHandler do it when
receiving a CALLBACK_RELEASED from ConnectivityService.

ag/869831 was thought to fix b/26749700 that reported a callback leak
from sNetworkCallback, but a finer analysis of the code shows that
callbacks were correctly removed by the CallbackHandler before
ag/869831. There was therefore no callback leak.

Bug: 26749700
Bug: 28537383
Change-Id: I421d889d0e225c0e3d1eebea664f44a1cc0f3191
2016-07-07 09:44:02 +09:00
Lorenzo Colitti
a3dfda9f45 Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev
am: 33cdc4d136

Change-Id: I0ad7b79f1af992dd556de5e17a6a1aae9c46e423
2016-07-06 20:45:09 +00:00
Lorenzo Colitti
6b30f55b56 Merge \\"Add test coverage for a bug in the lingering code.\\" into nyc-mr1-dev am: b129ee9c68
am: a07fd12db4

Change-Id: I19439c95167bf215edc67068fb5a6859ab845814
2016-07-05 03:54:35 +00:00
Lorenzo Colitti
a07fd12db4 Merge \"Add test coverage for a bug in the lingering code.\" into nyc-mr1-dev
am: b129ee9c68

Change-Id: Ia09ba1e0a6e3ba9543a92ccf7f03f7a898f26fb1
2016-07-05 03:44:29 +00:00
TreeHugger Robot
b129ee9c68 Merge "Add test coverage for a bug in the lingering code." into nyc-mr1-dev 2016-07-05 03:35:40 +00:00
Lorenzo Colitti
6718ec8b5f Merge \\"Unbreak unregisterNetworkCallback.\\" into nyc-mr1-dev am: 04401f0e0f
am: 3e1d024327

Change-Id: I7861e8ff7b8528d8468f8217e13398f78be50de5
2016-07-05 02:28:07 +00:00
Lorenzo Colitti
3e1d024327 Merge \"Unbreak unregisterNetworkCallback.\" into nyc-mr1-dev
am: 04401f0e0f

Change-Id: I35ee16554e17c503b1f5628629c2c0a48d85d399
2016-07-05 02:19:18 +00:00
Lorenzo Colitti
04401f0e0f Merge "Unbreak unregisterNetworkCallback." into nyc-mr1-dev 2016-07-05 02:07:06 +00:00
Lorenzo Colitti
cef9c490ad Unbreak unregisterNetworkCallback.
http://ag/1194313 broke unregisterNetworkCallback because the
system does not parcel the type of the request back to the app.
So when the app calls unregisterNetworkCallback, the
NetworkRequest that's passed in does not have a type and thus
doesn't match the request in mNetworkRequests.

Fix this by parceling over the type as well.

This was not caught by the unit test because the unit test all
runs in the same process with no parceling.

Bug: 23113288
Change-Id: I58b2ed651b9bf5cbdcca5b25c3ca24db53cffdf1
2016-07-05 01:59:49 +09:00
Lorenzo Colitti
5189468c48 Merge \\"Annotate public methods in ConnectivityService.\\" into nyc-mr1-dev am: ad7755209c
am: aa9dd65e57

Change-Id: I8b0c9ece0d9bfdf8d93628214485c0e059731a6a
2016-07-04 16:30:21 +00:00
Lorenzo Colitti
aa9dd65e57 Merge \"Annotate public methods in ConnectivityService.\" into nyc-mr1-dev
am: ad7755209c

Change-Id: I065e2ceb351ea8af4310f6ef11f1af232fa2fc79
2016-07-04 16:21:10 +00:00
Lorenzo Colitti
4a2a5b0b54 Make registerDefaultNetwork work on metered networks. am: 34eda2aa6f
am: 005ce5a697

Change-Id: Ief2f4c0073f87f7a7e7f33c322365dc4e8eefdeb
2016-07-04 16:16:36 +00:00
TreeHugger Robot
ad7755209c Merge "Annotate public methods in ConnectivityService." into nyc-mr1-dev 2016-07-04 16:07:33 +00:00
Lorenzo Colitti
005ce5a697 Make registerDefaultNetwork work on metered networks.
am: 34eda2aa6f

Change-Id: I2d5edc273df22e5c787f227820c1ce956adfe42c
2016-07-04 16:06:51 +00:00
Lorenzo Colitti
34eda2aa6f Make registerDefaultNetwork work on metered networks.
Bug: 29927488
Change-Id: I3b705c2ab0d1493546ffa5185bb5b07d5e25c897
2016-07-04 23:18:12 +09:00
Lorenzo Colitti
2937ac9eae Add test coverage for a bug in the lingering code.
Bug: 23113288
Change-Id: I573ee5908b9d973931234eb7d2db8ea0aaa4b31e
2016-07-04 17:00:27 +09:00
Lorenzo Colitti
10e796c35d Annotate public methods in ConnectivityService.
Ensure every public method is annotated with why it's public.
This can be either an @Override or @VisibleForTesting annotation
or a comment explaining why it's public.

Bug: 29927488
Change-Id: I3582aef7997dc0d723718ca5e3dd115647d22979
2016-07-04 12:58:29 +09:00
Lorenzo Colitti
ef767c8ea8 Merge changes from topic \\'networkrequest_private\\' into nyc-mr1-dev am: 0317e03dc3
am: 6c9dbf4d48

Change-Id: I09231f4f4f3bd13f6b51fe8117eff7d002cf10dd
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
446e67a633 Make registerDefaultNetwork work on metered networks.
Bug: 29927488
Change-Id: I3b705c2ab0d1493546ffa5185bb5b07d5e25c897
2016-07-01 04:42:58 +00:00
Lorenzo Colitti
9748a4ffb4 Merge changes I65784f35,Ib6937335 into nyc-mr1-dev am: 74f7f2ec0d
am: 3c6e0af2c2

Change-Id: I5cdfe7e952ceb9da89f775f4cd451cc26ed52401
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

Change-Id: I02fe28e773df3b328be8c7ea26b0df065014188a
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

Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280
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

Change-Id: I70ac910d67a1e4a7c4f9f3d24f983dce99957151
2016-06-29 07:23:22 +00:00
Hugo Benichi
973cc38494 Refactor IP connectivity event logging am: 3bdc8357fe
am: 2229b20b34

Change-Id: If8775031f2a293e94e564dde502d0775d5808fe6
2016-06-29 07:23:19 +00:00
Hugo Benichi
16e1a3a679 Adding tests for DnsEventListenerService
am: c1aead00e7

Change-Id: I498ad1303ff3c0fbc4517203ff8e6b931814562b
2016-06-29 07:18:32 +00:00
Hugo Benichi
2229b20b34 Refactor IP connectivity event logging
am: 3bdc8357fe

Change-Id: I8de880edc4a8c7f12527218788cb44f263acb56f
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