Lorenzo Colitti
92849e4838
Merge changes from topic 'framework-net-aosp' am: 5ad2853426 am: 1a2fa0f372 am: 7fbb7d397d
...
am: c568d45d23
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
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
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
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
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
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
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
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
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
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
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
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
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
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
2016-12-09 10:53:51 +00:00
Lorenzo Colitti
c568d45d23
Merge changes from topic 'framework-net-aosp' am: 5ad2853426 am: 1a2fa0f372
...
am: 7fbb7d397d
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Lorenzo Colitti
5ad2853426
Merge changes from topic 'framework-net-aosp'
...
* changes:
DO NOT MERGE: frameworks-test: adding missing @SmallTest
DO NOT MERGE: Netd events: record connect() success/errno
DO NOT MERGE: Add missing dependency.
DO NOT MERGE: Show notification for always-on app VPN
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe
DO NOT MERGE: NetworkMonitor metrics: add first validation information
DO NOT MERGE: APF: also drop any ICMPv6 RSs
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
DO NOT MERGE: Define API for metering network stats buckets.
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
DO NOT MERGE: VPN network stat accounting changes.
DO NOT MERGE: ConnectivityThread: use lazy holder idiom
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
2016-12-09 09:11:22 +00:00
Hugo Benichi
47230f539a
DO NOT MERGE Captive portal systel log improvements
...
This patch improves system logging around captive portal detection to
make inspection of bug reports sligthly easier:
- NetworkMonitor now logs by default CMD_CAPTIVE_PORTAL_RECHECK and
CMD_CAPTIVE_PORTAL_APP_FINISHED. Other system logs are kept off with
a new VDBG boolean contant,
- NetworkNotificationManager now prints the notification id at
notification time. This allows to easily correlate show and clear.
- errors in NetworkNotificationManager are logged as Throwable instead
of through their implicit toString() method.
Test: $ runtest frameworks-net
Bug: 32198726
(cherry picked from commit 8b025bf108c729156b40159038befa0e6c5bebce)
Change-Id: I7780c389a94c4b9fa226f53b02fe5960d1c08618
2016-12-09 16:14:32 +09:00
Hugo Benichi
787d3da986
DO NOT MERGE: frameworks-test: adding missing @SmallTest
...
This activates all frameworks-test tests in runs of the continuous
platform tests.
Test: $ runtest frameworks-net passes (expect Tether
Bug: 32561414
(cherry picked from commit 3664598601
2016-12-09 14:35:05 +09:00
Hugo Benichi
74e67ae938
DO NOT MERGE: Netd events: record connect() success/errno
...
Test: $ runtest frameworks-net pass
Bug: 32198976
(cherry picked from commit 8b06bcdfd24100302818ae0e11ee751dd813d5cf)
2016-12-09 14:34:39 +09:00
Tony Mak
c777123d5c
DO NOT MERGE: Show notification for always-on app VPN
...
This is the same notification as the one shown during legacy lockdown
mode, sans the 'reset' button.
The notification is only shown during times when VPN has not yet
established or has failed, for example during boot or after a crash.
Bug: 29123115
(cherry picked from commit 9ca892f698
2016-12-09 14:23:10 +09:00
