Przemyslaw Szczepaniak
|
300ac5eab2
|
Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d" am: 4ee94a6a9b am: 104e268a14 am: b2d7fe1f22
am: 92151fec1d
Change-Id: I4bfe4e388a7276779240b7886fa3e46b78f1297e
|
2016-12-09 11:26:08 +00:00 |
|
Lorenzo Colitti
|
e4e4b906c6
|
Merge changes from topic 'framework-net-aosp' am: ab4c79bd96 am: 1a2fa0f372 am: 4925138b8a
am: 20b77883fa
Change-Id: Ic6ee235cfbe3eea990f729de36119f8ce12a6a17
|
2016-12-09 11:25:03 +00:00 |
|
Hugo Benichi
|
85ffaf1665
|
DO NOT MERGE: frameworks-test: adding missing @SmallTest am: cfcc1cb7bf -s ours am: 9f65f04157 -s ours am: 1ef8d5cdd8
am: 58d1d2da68 -s ours
Change-Id: I349be4850debbdb6403ebf31d4478e800391bec5
|
2016-12-09 11:14:43 +00:00 |
|
Hugo Benichi
|
47340f533c
|
DO NOT MERGE: Netd events: record connect() success/errno am: 5d0f28c7fd -s ours am: d84f932680 -s ours am: 3499968748
am: e885834ed5 -s ours
Change-Id: I04204d67dc2fb5b58d4769e69e905733e4e81f1e
|
2016-12-09 11:13:19 +00:00 |
|
Lorenzo Colitti
|
ce5115c63b
|
DO NOT MERGE: Add missing dependency. am: 744b02069d -s ours am: 50c77cb9c0 -s ours am: 2fc1b42116
am: 82dcddecea -s ours
Change-Id: I0c3ea9cfb777fcf4e4917427e37541180b42b6d9
|
2016-12-09 11:12:25 +00:00 |
|
Tony Mak
|
57ba8d742a
|
DO NOT MERGE: Show notification for always-on app VPN am: de7f7d195e -s ours am: 118071a481 -s ours am: d2561167e1
am: c98b0adaa6 -s ours
Change-Id: I785b6a367ceb5b032243659c80c08e43d8302671
|
2016-12-09 11:11:35 +00:00 |
|
Stephen Chen
|
b4946b04ec
|
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries. am: 963e8ddf6d -s ours am: 3f5785260e -s ours am: aa75afd589
am: 9b8712a3a0 -s ours
Change-Id: I8d502d83e00fdc1cb295b32c557ab253f4b5c091
|
2016-12-09 11:10:40 +00:00 |
|
Hugo Benichi
|
6ba5e7b6ba
|
DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe am: 2a43b208cc -s ours am: a452f24e30 -s ours am: 7092831185
am: 610ef4609d -s ours
Change-Id: I0c923dd3415055d214cc75caaf83de0e9e6583a3
|
2016-12-09 11:09:21 +00:00 |
|
Hugo Benichi
|
101405d71b
|
DO NOT MERGE: NetworkMonitor metrics: add first validation information am: 21680fd25d -s ours am: 9908c161ca -s ours am: 31e3ab399f
am: 27cafad7f3 -s ours
Change-Id: I2a685958144fa4c13668db34fa3c5c1ec8db6aae
|
2016-12-09 11:08:17 +00:00 |
|
Hugo Benichi
|
c9b654f844
|
DO NOT MERGE: APF: also drop any ICMPv6 RSs am: 02428988ad -s ours am: 0d95fc9552 -s ours am: 5fb6beae02
am: 78e9df3c03 -s ours
Change-Id: I64d9eaa932374b1c2ba1bbdb12c6683f70b73f2d
|
2016-12-09 11:07:25 +00:00 |
|
Hugo Benichi
|
fefd5dee79
|
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings am: 53d83d5142 -s ours am: a30ae5542b -s ours am: 05236e77fe
am: 3e3ece174f -s ours
Change-Id: I13b634eaa559a2296c102d60c11e817b0af4ee5a
|
2016-12-09 11:06:30 +00:00 |
|
Hugo Benichi
|
09cecfe4f2
|
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark am: cbf8ff83a8 -s ours am: 0bef352535 -s ours am: 6d756fa472
am: a45626b879 -s ours
Change-Id: I7bc91eaae2261bd152f3e9bb41c7ee70917a5d48
|
2016-12-09 11:05:31 +00:00 |
|
Jeff Sharkey
|
053a3a265c
|
DO NOT MERGE: Switch over to new "time.android.com" NTP pool. am: dda938a698 -s ours am: 7c670da7ac -s ours am: 2d72c165af
am: 322a5101b5 -s ours
Change-Id: I55fa400b15e3be149450e49498f2f95afd21d347
|
2016-12-09 11:04:07 +00:00 |
|
Przemyslaw Szczepaniak
|
92151fec1d
|
Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d" am: 4ee94a6a9b am: 104e268a14
am: b2d7fe1f22
Change-Id: Ia9cb57d270dfb9ae634fbe72f7b9c8591ade89a3
|
2016-12-09 11:03:43 +00:00 |
|
Stephen Chen
|
c8f0339cb2
|
DO NOT MERGE: Define API for metering network stats buckets. am: dadf6caf9f -s ours am: 419a061017 -s ours am: 320111113f
am: c13d7998dc -s ours
Change-Id: Ia147a494bf908d64d938355bd357d570ac783b76
|
2016-12-09 11:03:13 +00:00 |
|
Felipe Leme
|
35d193e306
|
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock. am: e4c029918f -s ours am: fbbaf25665 -s ours am: a20ccdb0ab
am: a2c40b19c6 -s ours
Change-Id: Ic3005458ec91655ce105c70569877cf5dd8a920b
|
2016-12-09 11:02:22 +00:00 |
|
Felipe Leme
|
a85c2a5f91
|
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method. am: 2026ca147b -s ours am: b296948b3b -s ours am: 153604cd9a
am: 6173d88dce -s ours
Change-Id: I39e12c63872d13d0b8581d7385ee4c971283da9a
|
2016-12-09 11:01:32 +00:00 |
|
Felipe Leme
|
ee65117384
|
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. am: 77cba4bdf6 -s ours am: 82393f7b98 -s ours am: 854038fcd8
am: 05b9f210af -s ours
Change-Id: I9979e5411c032f500995efe7c83df31d40fda0f5
|
2016-12-09 11:00:02 +00:00 |
|
Przemyslaw Szczepaniak
|
b2d7fe1f22
|
Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d" am: 4ee94a6a9b
am: 104e268a14
Change-Id: I68a128d0e2efc1e960be2ffd08ac381db0640339
|
2016-12-09 10:59:16 +00:00 |
|
Jeremy Joslin
|
e495347f27
|
DO NOT MERGE: VPN network stat accounting changes. am: ffe5a46b3e -s ours am: 12bb3f057b -s ours am: 4d145b01ee
am: 483611214d -s ours
Change-Id: I356877d99b1304777d3d9103e9e0d421b1bb112b
|
2016-12-09 10:59:11 +00:00 |
|
Hugo Benichi
|
4c1b7e8c09
|
DO NOT MERGE: ConnectivityThread: use lazy holder idiom am: ce765b7a51 -s ours am: f6cb43ae32 -s ours am: de53b117b5
am: a9bbff0d2b -s ours
Change-Id: Iafa9ac6e49566a7165c2c586128c8e663e6a1b9a
|
2016-12-09 10:58:23 +00:00 |
|
Hugo Benichi
|
4ca3bb90c7
|
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper am: 1853f78d76 -s ours am: 7337239702 -s ours am: 57b372d6da
am: 274806b011 -s ours
Change-Id: I649b6bcd026ad86055fa6cbe59cb85e0141d22b8
|
2016-12-09 10:57:34 +00:00 |
|
Hugo Benichi
|
4f0ffdd4d2
|
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler am: 4983e55853 -s ours am: ef148edaa2 -s ours am: c869826359
am: d51cb6eb83 -s ours
Change-Id: I07908e3f1734503e58bbf62586dbfc3a6c1f887a
|
2016-12-09 10:56:27 +00:00 |
|
Philip P. Moltmann
|
4ec899d7c3
|
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service. am: 29154b000f -s ours am: 6e8a33a583 -s ours am: 6771c6abe1
am: 6c6a790ddc -s ours
Change-Id: Ie5b45503c2917340397abdbd6df5ecc407d90c26
|
2016-12-09 10:55:07 +00:00 |
|
Przemyslaw Szczepaniak
|
104e268a14
|
Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d"
am: 4ee94a6a9b
Change-Id: I93e4dc42695a35934748e4242bb36e4260cbd3ca
|
2016-12-09 10:54:03 +00:00 |
|
Jeremy Klein
|
400e787585
|
DO NOT MERGE: Add a null check for the OnStartTetheringCallback. am: c8e4cc8e99 -s ours am: 3cd1ae2261 -s ours am: a5373c3eeb
am: 4d96cee757 -s ours
Change-Id: I9d5983d4f197d7cedb841081f48291288359988a
|
2016-12-09 10:53:51 +00:00 |
|
Lorenzo Colitti
|
20b77883fa
|
Merge changes from topic 'framework-net-aosp' am: ab4c79bd96 am: 1a2fa0f372
am: 4925138b8a
Change-Id: Idb0e86655f5d4f835796f5ebe31da99e419d66bf
|
2016-12-09 10:53:48 +00:00 |
|
Przemyslaw Szczepaniak
|
4ee94a6a9b
|
Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d"
|
2016-12-09 10:46:19 +00:00 |
|
Hugo Benichi
|
58d1d2da68
|
DO NOT MERGE: frameworks-test: adding missing @SmallTest am: cfcc1cb7bf -s ours am: 9f65f04157 -s ours
am: 1ef8d5cdd8
Change-Id: Ib6a8f4b7ca365ab5cb42b9e57311228be273075a
|
2016-12-09 10:40:12 +00:00 |
|
Hugo Benichi
|
e885834ed5
|
DO NOT MERGE: Netd events: record connect() success/errno am: 5d0f28c7fd -s ours am: d84f932680 -s ours
am: 3499968748
Change-Id: Ic83b2d46bc4d25878c70c0a02d39f14ecbeab84f
|
2016-12-09 10:39:20 +00:00 |
|
Lorenzo Colitti
|
82dcddecea
|
DO NOT MERGE: Add missing dependency. am: 744b02069d -s ours am: 50c77cb9c0 -s ours
am: 2fc1b42116
Change-Id: I4b01f3a52e858e495e9bf08e167bedd5115dd432
|
2016-12-09 10:38:30 +00:00 |
|
Tony Mak
|
c98b0adaa6
|
DO NOT MERGE: Show notification for always-on app VPN am: de7f7d195e -s ours am: 118071a481 -s ours
am: d2561167e1
Change-Id: I871444d296f0c49f587e98d1e0b760846da37c13
|
2016-12-09 10:37:38 +00:00 |
|
Stephen Chen
|
9b8712a3a0
|
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries. am: 963e8ddf6d -s ours am: 3f5785260e -s ours
am: aa75afd589
Change-Id: Ic0f11bdb50d43c0dd9c449ae3c784b0214b865e3
|
2016-12-09 10:36:45 +00:00 |
|
Hugo Benichi
|
610ef4609d
|
DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe am: 2a43b208cc -s ours am: a452f24e30 -s ours
am: 7092831185
Change-Id: I7a277e4f3b84b658891f81aa055d6a9f7126f2cc
|
2016-12-09 10:35:18 +00:00 |
|
Hugo Benichi
|
27cafad7f3
|
DO NOT MERGE: NetworkMonitor metrics: add first validation information am: 21680fd25d -s ours am: 9908c161ca -s ours
am: 31e3ab399f
Change-Id: Ie2d4a47694be6430416594d3ea67c9363f0739cd
|
2016-12-09 10:34:26 +00:00 |
|
Hugo Benichi
|
78e9df3c03
|
DO NOT MERGE: APF: also drop any ICMPv6 RSs am: 02428988ad -s ours am: 0d95fc9552 -s ours
am: 5fb6beae02
Change-Id: I6c4e0f827785f5ef84e0871ed4e6b3abbae1f825
|
2016-12-09 10:33:35 +00:00 |
|
Hugo Benichi
|
3e3ece174f
|
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings am: 53d83d5142 -s ours am: a30ae5542b -s ours
am: 05236e77fe
Change-Id: Iebd06f7c03b2068314c24a14a2b38d2413b88536
|
2016-12-09 10:32:40 +00:00 |
|
Hugo Benichi
|
a45626b879
|
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark am: cbf8ff83a8 -s ours am: 0bef352535 -s ours
am: 6d756fa472
Change-Id: I7379d8223778d3f2df97d88c0d6f291df219c579
|
2016-12-09 10:31:27 +00:00 |
|
Jeff Sharkey
|
322a5101b5
|
DO NOT MERGE: Switch over to new "time.android.com" NTP pool. am: dda938a698 -s ours am: 7c670da7ac -s ours
am: 2d72c165af
Change-Id: I77c4de88c69aa3801d3580f01f6b6901fceb2ef9
|
2016-12-09 10:30:15 +00:00 |
|
Stephen Chen
|
c13d7998dc
|
DO NOT MERGE: Define API for metering network stats buckets. am: dadf6caf9f -s ours am: 419a061017 -s ours
am: 320111113f
Change-Id: I080ca3f54fbd28af8f3b41ca8dd07d65a3161e71
|
2016-12-09 10:29:23 +00:00 |
|
Felipe Leme
|
a2c40b19c6
|
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock. am: e4c029918f -s ours am: fbbaf25665 -s ours
am: a20ccdb0ab
Change-Id: I4aa888c55824eba58b7e0af78b510a144608e704
|
2016-12-09 10:28:28 +00:00 |
|
Felipe Leme
|
6173d88dce
|
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method. am: 2026ca147b -s ours am: b296948b3b -s ours
am: 153604cd9a
Change-Id: Icaa4e18775b6e810738fb9d180ea20f7ce5c4506
|
2016-12-09 10:27:35 +00:00 |
|
Felipe Leme
|
05b9f210af
|
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. am: 77cba4bdf6 -s ours am: 82393f7b98 -s ours
am: 854038fcd8
Change-Id: I4acc3df60493e5ac388772f8c0e22ac92bc3ce4c
|
2016-12-09 10:26:08 +00:00 |
|
Jeremy Joslin
|
483611214d
|
DO NOT MERGE: VPN network stat accounting changes. am: ffe5a46b3e -s ours am: 12bb3f057b -s ours
am: 4d145b01ee
Change-Id: Ie33371e7e4e47071aa9f74fef93ddf2cff2ec57a
|
2016-12-09 10:25:17 +00:00 |
|
Hugo Benichi
|
a9bbff0d2b
|
DO NOT MERGE: ConnectivityThread: use lazy holder idiom am: ce765b7a51 -s ours am: f6cb43ae32 -s ours
am: de53b117b5
Change-Id: I121ad24bed0fa12b80110b1058ad4279ec9c0107
|
2016-12-09 10:24:20 +00:00 |
|
Hugo Benichi
|
274806b011
|
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper am: 1853f78d76 -s ours am: 7337239702 -s ours
am: 57b372d6da
Change-Id: If52ab02bd501d4b071f24ddf8abdfe344e7358eb
|
2016-12-09 10:23:28 +00:00 |
|
Hugo Benichi
|
d51cb6eb83
|
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler am: 4983e55853 -s ours am: ef148edaa2 -s ours
am: c869826359
Change-Id: I7c177123057676622e1aa43c68676ee06ed60ee6
|
2016-12-09 10:22:25 +00:00 |
|
Philip P. Moltmann
|
6c6a790ddc
|
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service. am: 29154b000f -s ours am: 6e8a33a583 -s ours
am: 6771c6abe1
Change-Id: Id16463e4621b4012cc6c7c2bf5d7b2cc07de1b0d
|
2016-12-09 10:20:59 +00:00 |
|
Jeremy Klein
|
4d96cee757
|
DO NOT MERGE: Add a null check for the OnStartTetheringCallback. am: c8e4cc8e99 -s ours am: 3cd1ae2261 -s ours
am: a5373c3eeb
Change-Id: I897f28d2b002e1a2aa6be8ec423a1c9b1d5b761b
|
2016-12-09 10:20:04 +00:00 |
|
Lorenzo Colitti
|
4925138b8a
|
Merge changes from topic 'framework-net-aosp' am: ab4c79bd96
am: 1a2fa0f372
Change-Id: I746ee7fd37946df2ba31ca8aee928fa3ef04591c
|
2016-12-09 10:18:11 +00:00 |
|