Erik Kline
|
ef5d06d04c
|
Merge "Stop setting net.dns{1234} system properties." am: 269d35f870 am: cc122a0d6c am: 43d5129fe5
am: f559069d8b
Change-Id: I63216568d2ec5606fdfe108d0263714238dc1886
|
2016-12-12 08:48:21 +00:00 |
|
Erik Kline
|
f559069d8b
|
Merge "Stop setting net.dns{1234} system properties." am: 269d35f870 am: cc122a0d6c
am: 43d5129fe5
Change-Id: I38d6608f64076ffa3300255eb66c51c32e590b0f
|
2016-12-12 08:41:47 +00:00 |
|
Erik Kline
|
43d5129fe5
|
Merge "Stop setting net.dns{1234} system properties." am: 269d35f870
am: cc122a0d6c
Change-Id: I7d400352de4bc11204cd1ec8c9aeda5381cd4931
|
2016-12-12 08:35:20 +00:00 |
|
Erik Kline
|
cc122a0d6c
|
Merge "Stop setting net.dns{1234} system properties."
am: 269d35f870
Change-Id: I9b31b281896995943ce8217c3230867db380a841
|
2016-12-12 08:29:14 +00:00 |
|
Treehugger Robot
|
269d35f870
|
Merge "Stop setting net.dns{1234} system properties."
|
2016-12-12 08:16:35 +00:00 |
|
Lorenzo Colitti
|
92849e4838
|
Merge changes from topic 'framework-net-aosp' am: 5ad2853426 am: 1a2fa0f372 am: 7fbb7d397d
am: c568d45d23
Change-Id: Ic6ee235cfbe3eea990f729de36119f8ce12a6a17
|
2016-12-09 11:25:03 +00:00 |
|
Hugo Benichi
|
9a6f9d224e
|
DO NOT MERGE: frameworks-test: adding missing @SmallTest am: 787d3da986 -s ours am: 9f65f04157 -s ours am: 6bca82763d
am: c88e0b2ab3 -s ours
Change-Id: I349be4850debbdb6403ebf31d4478e800391bec5
|
2016-12-09 11:14:43 +00:00 |
|
Hugo Benichi
|
b2937ad61d
|
DO NOT MERGE: Netd events: record connect() success/errno am: 74e67ae938 -s ours am: d84f932680 -s ours am: 3a00c6b08e
am: 5f35a1cd5c -s ours
Change-Id: I04204d67dc2fb5b58d4769e69e905733e4e81f1e
|
2016-12-09 11:13:19 +00:00 |
|
Tony Mak
|
be557cb16b
|
DO NOT MERGE: Show notification for always-on app VPN am: c777123d5c -s ours am: 118071a481 -s ours am: 22f0d5b47d
am: 2296ffa69d -s ours
Change-Id: I785b6a367ceb5b032243659c80c08e43d8302671
|
2016-12-09 11:11:35 +00:00 |
|
Stephen Chen
|
88298cc8e1
|
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries. am: 757658193d -s ours am: 3f5785260e -s ours am: 179fbd9c84
am: 4006015842 -s ours
Change-Id: I8d502d83e00fdc1cb295b32c557ab253f4b5c091
|
2016-12-09 11:10:40 +00:00 |
|
Hugo Benichi
|
b4f05acf17
|
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings am: b1bddc92c5 -s ours am: a30ae5542b -s ours am: 858eef0c7d
am: 5b186cc142 -s ours
Change-Id: I13b634eaa559a2296c102d60c11e817b0af4ee5a
|
2016-12-09 11:06:30 +00:00 |
|
Hugo Benichi
|
ec08b52870
|
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark am: 8436dae4c3 -s ours am: 0bef352535 -s ours am: 11051ef7f8
am: dfc0ec7c84 -s ours
Change-Id: I7bc91eaae2261bd152f3e9bb41c7ee70917a5d48
|
2016-12-09 11:05:31 +00:00 |
|
Felipe Leme
|
9f69ae3ba6
|
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock. am: 6670ab4480 -s ours am: fbbaf25665 -s ours am: 2672fd0196
am: 94a8f25fc6 -s ours
Change-Id: Ic3005458ec91655ce105c70569877cf5dd8a920b
|
2016-12-09 11:02:22 +00:00 |
|
Felipe Leme
|
c039eb6818
|
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method. am: b8a440f538 -s ours am: b296948b3b -s ours am: 38dd9dec90
am: 26ca4d4d4b -s ours
Change-Id: I39e12c63872d13d0b8581d7385ee4c971283da9a
|
2016-12-09 11:01:32 +00:00 |
|
Felipe Leme
|
b504546bb4
|
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. am: 00a6e6c111 -s ours am: 82393f7b98 -s ours am: 0866b93abf
am: 2418431e4a -s ours
Change-Id: I9979e5411c032f500995efe7c83df31d40fda0f5
|
2016-12-09 11:00:02 +00:00 |
|
Jeremy Joslin
|
40af2d67f5
|
DO NOT MERGE: VPN network stat accounting changes. am: 8c7be6114c -s ours am: 12bb3f057b -s ours am: 652c3e59e9
am: 826d4ea141 -s ours
Change-Id: I356877d99b1304777d3d9103e9e0d421b1bb112b
|
2016-12-09 10:59:11 +00:00 |
|
Hugo Benichi
|
7cf79c1b99
|
DO NOT MERGE: ConnectivityThread: use lazy holder idiom am: 8f201294fe -s ours am: f6cb43ae32 -s ours am: fde28b4f2b
am: 8e2798c72d -s ours
Change-Id: Iafa9ac6e49566a7165c2c586128c8e663e6a1b9a
|
2016-12-09 10:58:23 +00:00 |
|
Hugo Benichi
|
9614021975
|
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper am: 301b09738a -s ours am: 7337239702 -s ours am: 8358a5fbdf
am: 4a9ef15314 -s ours
Change-Id: I649b6bcd026ad86055fa6cbe59cb85e0141d22b8
|
2016-12-09 10:57:34 +00:00 |
|
Hugo Benichi
|
a093394482
|
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler am: 56260ed9cb -s ours am: ef148edaa2 -s ours am: 7135d5e6f2
am: d886103e29 -s ours
Change-Id: I07908e3f1734503e58bbf62586dbfc3a6c1f887a
|
2016-12-09 10:56:27 +00:00 |
|
Jeremy Klein
|
f78d3f1804
|
DO NOT MERGE: Add a null check for the OnStartTetheringCallback. am: fb63d5a4ef -s ours am: 3cd1ae2261 -s ours am: aa7506310c
am: 14667351d8 -s ours
Change-Id: I9d5983d4f197d7cedb841081f48291288359988a
|
2016-12-09 10:53:51 +00:00 |
|
Lorenzo Colitti
|
c568d45d23
|
Merge changes from topic 'framework-net-aosp' am: 5ad2853426 am: 1a2fa0f372
am: 7fbb7d397d
Change-Id: Idb0e86655f5d4f835796f5ebe31da99e419d66bf
|
2016-12-09 10:53:48 +00:00 |
|
Hugo Benichi
|
c88e0b2ab3
|
DO NOT MERGE: frameworks-test: adding missing @SmallTest am: 787d3da986 -s ours am: 9f65f04157 -s ours
am: 6bca82763d
Change-Id: Ib6a8f4b7ca365ab5cb42b9e57311228be273075a
|
2016-12-09 10:40:12 +00:00 |
|
Hugo Benichi
|
5f35a1cd5c
|
DO NOT MERGE: Netd events: record connect() success/errno am: 74e67ae938 -s ours am: d84f932680 -s ours
am: 3a00c6b08e
Change-Id: Ic83b2d46bc4d25878c70c0a02d39f14ecbeab84f
|
2016-12-09 10:39:20 +00:00 |
|
Tony Mak
|
2296ffa69d
|
DO NOT MERGE: Show notification for always-on app VPN am: c777123d5c -s ours am: 118071a481 -s ours
am: 22f0d5b47d
Change-Id: I871444d296f0c49f587e98d1e0b760846da37c13
|
2016-12-09 10:37:38 +00:00 |
|
Stephen Chen
|
4006015842
|
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries. am: 757658193d -s ours am: 3f5785260e -s ours
am: 179fbd9c84
Change-Id: Ic0f11bdb50d43c0dd9c449ae3c784b0214b865e3
|
2016-12-09 10:36:45 +00:00 |
|
Hugo Benichi
|
5b186cc142
|
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings am: b1bddc92c5 -s ours am: a30ae5542b -s ours
am: 858eef0c7d
Change-Id: Iebd06f7c03b2068314c24a14a2b38d2413b88536
|
2016-12-09 10:32:40 +00:00 |
|
Hugo Benichi
|
dfc0ec7c84
|
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark am: 8436dae4c3 -s ours am: 0bef352535 -s ours
am: 11051ef7f8
Change-Id: I7379d8223778d3f2df97d88c0d6f291df219c579
|
2016-12-09 10:31:27 +00:00 |
|
Felipe Leme
|
94a8f25fc6
|
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock. am: 6670ab4480 -s ours am: fbbaf25665 -s ours
am: 2672fd0196
Change-Id: I4aa888c55824eba58b7e0af78b510a144608e704
|
2016-12-09 10:28:28 +00:00 |
|
Felipe Leme
|
26ca4d4d4b
|
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method. am: b8a440f538 -s ours am: b296948b3b -s ours
am: 38dd9dec90
Change-Id: Icaa4e18775b6e810738fb9d180ea20f7ce5c4506
|
2016-12-09 10:27:35 +00:00 |
|
Felipe Leme
|
2418431e4a
|
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. am: 00a6e6c111 -s ours am: 82393f7b98 -s ours
am: 0866b93abf
Change-Id: I4acc3df60493e5ac388772f8c0e22ac92bc3ce4c
|
2016-12-09 10:26:08 +00:00 |
|
Jeremy Joslin
|
826d4ea141
|
DO NOT MERGE: VPN network stat accounting changes. am: 8c7be6114c -s ours am: 12bb3f057b -s ours
am: 652c3e59e9
Change-Id: Ie33371e7e4e47071aa9f74fef93ddf2cff2ec57a
|
2016-12-09 10:25:17 +00:00 |
|
Hugo Benichi
|
8e2798c72d
|
DO NOT MERGE: ConnectivityThread: use lazy holder idiom am: 8f201294fe -s ours am: f6cb43ae32 -s ours
am: fde28b4f2b
Change-Id: I121ad24bed0fa12b80110b1058ad4279ec9c0107
|
2016-12-09 10:24:20 +00:00 |
|
Hugo Benichi
|
4a9ef15314
|
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper am: 301b09738a -s ours am: 7337239702 -s ours
am: 8358a5fbdf
Change-Id: If52ab02bd501d4b071f24ddf8abdfe344e7358eb
|
2016-12-09 10:23:28 +00:00 |
|
Hugo Benichi
|
d886103e29
|
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler am: 56260ed9cb -s ours am: ef148edaa2 -s ours
am: 7135d5e6f2
Change-Id: I7c177123057676622e1aa43c68676ee06ed60ee6
|
2016-12-09 10:22:25 +00:00 |
|
Jeremy Klein
|
14667351d8
|
DO NOT MERGE: Add a null check for the OnStartTetheringCallback. am: fb63d5a4ef -s ours am: 3cd1ae2261 -s ours
am: aa7506310c
Change-Id: I897f28d2b002e1a2aa6be8ec423a1c9b1d5b761b
|
2016-12-09 10:20:04 +00:00 |
|
Lorenzo Colitti
|
7fbb7d397d
|
Merge changes from topic 'framework-net-aosp' am: 5ad2853426
am: 1a2fa0f372
Change-Id: I746ee7fd37946df2ba31ca8aee928fa3ef04591c
|
2016-12-09 10:18:11 +00:00 |
|
Hugo Benichi
|
6bca82763d
|
DO NOT MERGE: frameworks-test: adding missing @SmallTest am: 787d3da986 -s ours
am: 9f65f04157 -s ours
Change-Id: I717dbbd4d3ed657fec9ed9f45a5ae6f3e2a04b3e
|
2016-12-09 10:08:43 +00:00 |
|
Hugo Benichi
|
3a00c6b08e
|
DO NOT MERGE: Netd events: record connect() success/errno am: 74e67ae938 -s ours
am: d84f932680 -s ours
Change-Id: I2e11ad15c3327a1d57453295ebc904dcf68ec3e0
|
2016-12-09 10:07:51 +00:00 |
|
Tony Mak
|
22f0d5b47d
|
DO NOT MERGE: Show notification for always-on app VPN am: c777123d5c -s ours
am: 118071a481 -s ours
Change-Id: I35f5107f9984284379136fd86c57432317066e68
|
2016-12-09 10:05:30 +00:00 |
|
Stephen Chen
|
179fbd9c84
|
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries. am: 757658193d -s ours
am: 3f5785260e -s ours
Change-Id: Ib6f4a4af04c3f4e26028604c66f6cc4f1720a801
|
2016-12-09 10:04:41 +00:00 |
|
Hugo Benichi
|
858eef0c7d
|
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings am: b1bddc92c5 -s ours
am: a30ae5542b -s ours
Change-Id: If1fe794f87060443d721f0f269f519046a9ee321
|
2016-12-09 10:00:41 +00:00 |
|
Hugo Benichi
|
11051ef7f8
|
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark am: 8436dae4c3 -s ours
am: 0bef352535 -s ours
Change-Id: I92e3730002c11f3c2d5ea9c324f61237190f44bc
|
2016-12-09 09:59:49 +00:00 |
|
Felipe Leme
|
2672fd0196
|
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock. am: 6670ab4480 -s ours
am: fbbaf25665 -s ours
Change-Id: I66000b3cd40a8494ad144610436f6ee953821a06
|
2016-12-09 09:57:16 +00:00 |
|
Felipe Leme
|
38dd9dec90
|
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method. am: b8a440f538 -s ours
am: b296948b3b -s ours
Change-Id: I43b77614b0ccdd573cf8b29b08ef518bad617aff
|
2016-12-09 09:55:47 +00:00 |
|
Felipe Leme
|
0866b93abf
|
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. am: 00a6e6c111 -s ours
am: 82393f7b98 -s ours
Change-Id: I175601094ae486700c8a6886470abb3147b6ef4e
|
2016-12-09 09:54:55 +00:00 |
|
Jeremy Joslin
|
652c3e59e9
|
DO NOT MERGE: VPN network stat accounting changes. am: 8c7be6114c -s ours
am: 12bb3f057b -s ours
Change-Id: Id9d26bf1b9512a85cd9b6a3253b86b77a6f62e77
|
2016-12-09 09:54:07 +00:00 |
|
Hugo Benichi
|
fde28b4f2b
|
DO NOT MERGE: ConnectivityThread: use lazy holder idiom am: 8f201294fe -s ours
am: f6cb43ae32 -s ours
Change-Id: I08a03dd249d30bc474a5d16472883737d12fec37
|
2016-12-09 09:53:16 +00:00 |
|
Hugo Benichi
|
8358a5fbdf
|
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper am: 301b09738a -s ours
am: 7337239702 -s ours
Change-Id: Ida0d76b540e800db215569717a1c5d26e0f583b0
|
2016-12-09 09:52:26 +00:00 |
|
Hugo Benichi
|
7135d5e6f2
|
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler am: 56260ed9cb -s ours
am: ef148edaa2 -s ours
Change-Id: Ie8ebf41835e62b64ceb22e552208c77482d96c73
|
2016-12-09 09:50:57 +00:00 |
|
Jeremy Klein
|
aa7506310c
|
DO NOT MERGE: Add a null check for the OnStartTetheringCallback. am: fb63d5a4ef -s ours
am: 3cd1ae2261 -s ours
Change-Id: I3c471a8971c21cdbf1ebf7e1302524b038b20375
|
2016-12-09 09:48:50 +00:00 |
|