Robin Lee
bb98793be5
Merge "Disable always-on VPN in factoryReset" am: 5765604627 am: 7960c6b8b5 am: 495418cd9c
...
am: d1b8497454
Change-Id: Iaccb7394994ccce66df0ab2f713fd890a8b999c8
2017-01-23 17:05:42 +00:00
Robin Lee
d1b8497454
Merge "Disable always-on VPN in factoryReset" am: 5765604627 am: 7960c6b8b5
...
am: 495418cd9c
Change-Id: I99207281321861a3e720b5c1e2e316e12b104677
2017-01-23 17:01:31 +00:00
Robin Lee
495418cd9c
Merge "Disable always-on VPN in factoryReset" am: 5765604627
...
am: 7960c6b8b5
Change-Id: I66b6721932ae8798cbb406cafa04ed0c92fe47f6
2017-01-23 16:54:59 +00:00
Robin Lee
7960c6b8b5
Merge "Disable always-on VPN in factoryReset"
...
am: 5765604627
Change-Id: I021b288e3db17ddefbea3645fd282e3ee123a6e8
2017-01-23 16:47:58 +00:00
Robin Lee
5765604627
Merge "Disable always-on VPN in factoryReset"
2017-01-23 16:40:07 +00:00
Erik Kline
b3ecedaedc
Merge "More concisely export whether we have a "tetherable configuration"" am: edea114308 am: 9d02ee9030 am: fa0b8e4cee
...
am: 52e97fcb8a
Change-Id: I290df5269739bc7fb5ebc8614a96c38bf7faf367
2017-01-23 07:30:22 +00:00
Erik Kline
52e97fcb8a
Merge "More concisely export whether we have a "tetherable configuration"" am: edea114308 am: 9d02ee9030
...
am: fa0b8e4cee
Change-Id: Iba07ae91906fa2f0763dae831f56b4841572e1f1
2017-01-23 07:26:28 +00:00
Erik Kline
fa0b8e4cee
Merge "More concisely export whether we have a "tetherable configuration"" am: edea114308
...
am: 9d02ee9030
Change-Id: Ic67b2d4589f586c67109216330f68cb1fc08c55a
2017-01-23 07:20:32 +00:00
Erik Kline
9d02ee9030
Merge "More concisely export whether we have a "tetherable configuration""
...
am: edea114308
Change-Id: I5f9717c9dab6b39f1fbf2186107b2a1f3f2d4f8f
2017-01-23 07:13:56 +00:00
Treehugger Robot
edea114308
Merge "More concisely export whether we have a "tetherable configuration""
2017-01-23 07:04:22 +00:00
Erik Kline
cf917febba
More concisely export whether we have a "tetherable configuration"
...
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- vanilla WiFi-to-mobile tethering works
Bug: 32163131
Change-Id: I20dd36b5bf7fc55a639c76ea4bdb55b650654881
2017-01-23 13:04:28 +09:00
Jeff Sharkey
49211a88ba
Merge "StrictMode to detect untagged network traffic."
2017-01-20 17:31:59 +00:00
TreeHugger Robot
baf50ab932
Merge "ConnectivityServiceTest: some fixes in CallbackInfo"
2017-01-20 09:43:19 +00:00
Hugo Benichi
c523652329
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655 -s ours am: 6d8bca8c99 -s ours am: 2c197f713b
...
am: 7df0f40566 -s ours
Change-Id: I65b787f2752eb7b17ec175336a7f25ba23529781
2017-01-20 08:31:57 +00:00
Hugo Benichi
7df0f40566
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655 -s ours am: 6d8bca8c99 -s ours
...
am: 2c197f713b
Change-Id: I78a3f6ffb4e1906906bf218dd11c8f65c5d3c96b
2017-01-20 07:59:43 +00:00
Hugo Benichi
5e494ca4cd
ConnectivityServiceTest: some fixes in CallbackInfo
...
- CallbackInfo becomes a static class so that it can be instantiated
and looked at more easily than before.
- CallbackInfo gains hashCode() because it has equals().
- effectively final field are qualified final
- fixes bug when polling the next callback: poll() on a LinkedBlockingQueue
returns null when timing out, which was not failing the test cleanly.
Test: ConnectivityServiceTest passes
Bug: 32561414
(cherry picked from commit 90755df180 )
Change-Id: Ica5f1609975e4b256f4e2f3dc2ac84362e762da2
2017-01-20 16:56:41 +09:00
Hugo Benichi
2c197f713b
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655 -s ours
...
am: 6d8bca8c99 -s ours
Change-Id: I847fe5f04ebf8b5634c3ae0974e69d50cef9df76
2017-01-20 07:55:35 +00:00
Hugo Benichi
6d8bca8c99
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager"
...
am: 216a4e7655 -s ours
Change-Id: I05fe9095395df00b96df3cbe3a6e4f31a160e0b5
2017-01-20 07:51:31 +00:00
Hugo Benichi
ad903ab032
DO NOT MERGE Unit tests for NetworkNotificationManager
...
Test: new unit test, no functional changes.
Bug: 32198726
(cherry picked from commit 20904677af )
Change-Id: I123de68de9ae353b95edce89eb570cfbb5f8d9a3
2017-01-20 15:08:38 +09:00
Jeff Sharkey
9c21ac6438
StrictMode to detect untagged network traffic.
...
Network usage is tracked by the kernel at the UID level, which is
granular enough for normal apps, but large components (such as the
system server) are impossible to debug without adding additional
socket tagging to help identify subsystems within a UID.
To help ensure that system components tag all their network traffic,
this change offers a new StrictMode option to detect and report
untagged sockets.
Test: builds, boots, all common traffic tagged
Bug: 30943431, 30414041
Change-Id: I825c7941076054732264690247de2863342638e2
2017-01-19 20:52:05 -07:00
Tamas Berghammer
a70865aa79
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp am: c82c85ddad
...
am: a4c0930a58 -s ours
Change-Id: Ie697d5efaea39e1522e947ac1a8f38f1443a1964
2017-01-18 22:38:09 +00:00
Tamas Berghammer
53791d7013
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am: b04cd1691c -s ours
...
am: a6a7154098 -s ours
Change-Id: I17090081cb6721124d3ba513f8d59f1982764cb8
2017-01-18 22:12:04 +00:00
Tamas Berghammer
a4c0930a58
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
...
am: c82c85ddad
Change-Id: I9d5789a9c4f12c12c5cc13eb8f92d3084a818440
2017-01-18 20:32:44 +00:00
Tamas Berghammer
a6a7154098
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
...
am: b04cd1691c -s ours
Change-Id: I09a58385e10e135af06dff346624dcbc9eb76a4f
2017-01-18 20:22:57 +00:00
Tamas Berghammer
9a5ec937be
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp am: f7ee59ced0
...
am: b298682b02
Change-Id: I229a5c77a0dc5d75afc43669eb1d58d16f492844
2017-01-18 20:02:42 +00:00
Tamas Berghammer
c82c85ddad
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
2017-01-18 19:59:59 +00:00
Tamas Berghammer
756ca53401
Update package names to work with the proto3 compiler am: 671998abdb -s ours
...
am: 3e1868bdcb
Change-Id: I092a61abba417a71fe1a8eb9d29016e74808feb2
2017-01-18 19:55:14 +00:00
Tamas Berghammer
b04cd1691c
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
...
This reverts commit 671998abdb .
Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
2017-01-18 19:33:22 +00:00
Tamas Berghammer
b298682b02
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
...
am: f7ee59ced0
Change-Id: Ia944e535f7329c32bf34770fb0d99019cc1091f9
2017-01-18 18:06:43 +00:00
Tamas Berghammer
3e1868bdcb
Update package names to work with the proto3 compiler
...
am: 671998abdb -s ours
Change-Id: I8c957a9ad00cb393dbaaa05bec9730cc3a84a94e
2017-01-18 17:44:23 +00:00
Tamas Berghammer
f7ee59ced0
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
2017-01-18 12:58:01 +00:00
Tony Mak
4a50842e4d
DO NOT MERGE: Show notification for always-on app VPN
...
am: 7bce27af36 -s ours
Change-Id: I8af0a0746154d5774b0fb841616b57ce65a36707
2017-01-18 10:49:08 +00:00
Stephen Chen
9b5830847f
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
...
am: 64ee16a8dc -s ours
Change-Id: I970aed286a5bcc69d2ee69ea23b53af36dc2bbea
2017-01-18 10:48:16 +00:00
Hugo Benichi
34a3b1a312
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
...
am: ec41a56b55 -s ours
Change-Id: Ifdac8feb994342d18a0795a676da558445867b1f
2017-01-18 10:47:07 +00:00
Hugo Benichi
4a111a86d9
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
...
am: 9fb6ca3be3 -s ours
Change-Id: Iccb849a88e017c3189b2c374a98c44dc58085861
2017-01-18 10:46:07 +00:00
Felipe Leme
8f19946d88
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
...
am: 90a9ae5a11 -s ours
Change-Id: I4c92c8bfe7cd19839a86a63e5afb3b3868a63825
2017-01-18 10:43:14 +00:00
Felipe Leme
88b8d99ed5
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
...
am: 23ea62316f -s ours
Change-Id: I6e6fea2d375c40e53fee1877abeb06a9e6d2e218
2017-01-18 10:42:03 +00:00
Felipe Leme
f5692b584e
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
...
am: 50d0a665a9 -s ours
Change-Id: I72964aed5f8f27120300948d57e4083bb81f06ec
2017-01-18 10:41:08 +00:00
Hugo Benichi
8605cc593c
DO NOT MERGE: ConnectivityThread: use lazy holder idiom
...
am: b72e95b724 -s ours
Change-Id: I8af8bbe0b13b73d4c394c182d299a57c7d8b5736
2017-01-18 10:40:14 +00:00
Hugo Benichi
7ca7688868
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
...
am: 0d51adaf98 -s ours
Change-Id: I12d27fd45f1182719df8c538e734419b640977e8
2017-01-18 10:38:59 +00:00
Hugo Benichi
eb689794d3
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
...
am: f8198e48fd -s ours
Change-Id: Ie2413170190809b0a95749f6788fb54b0a9bafd7
2017-01-18 10:37:50 +00:00
Jeremy Klein
cc04cb21b5
DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
...
am: 23143b98af -s ours
Change-Id: I62e8648a232f8c9ec1fe97270b654078a59e3cb9
2017-01-18 10:37:31 +00:00
Etan Cohen
dcef2ac5fc
DO NOT MERGE: [CS] Remove timeout event after first available
...
am: dcdf130646 -s ours
Change-Id: I84244312fb5314ac1d177571ff1a3fdd070480ef
2017-01-18 10:37:25 +00:00
Lorenzo Colitti
1c82b37a64
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
...
am: 1747a76e9d -s ours
Change-Id: I255b736255c6f165f1600fe064e86bbd33bfe810
2017-01-18 10:37:05 +00:00
Lorenzo Colitti
9e8ed8cc10
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
...
am: 44d51c7147 -s ours
Change-Id: If776d54cd1138a9266268f43833f6c329cd6285d
2017-01-18 10:37:00 +00:00
Lorenzo Colitti
4914da7685
DO NOT MERGE: Move FakeSettingsProvider to a common location.
...
am: d32212f182 -s ours
Change-Id: I896ce2cf8abf50e5189f609a4f810296817695c9
2017-01-18 10:36:56 +00:00
Hugo Benichi
ff41de306f
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such
...
am: 67e09ac87a -s ours
Change-Id: Ifd485f77ada20a0773e791816e811fdf22442a92
2017-01-18 10:36:52 +00:00
Erik Kline
ca97beb317
DO NOT MERGE: Support timeouts for requestNetwork() invocations.
...
am: 1a1fea2d24 -s ours
Change-Id: Ife31e9372728e888ccf175f0a38577e17c3fc468
2017-01-18 10:36:44 +00:00
Pierre Imai
f3b25e71a6
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network.
...
am: 93d4c23fac -s ours
Change-Id: I3fa3801e54b06ea4e51f1e0d3577a309f1b970ab
2017-01-18 10:36:39 +00:00
Tony Mak
7bce27af36
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 81f2dff176 )
(cherry picked from commit 7b6200aa9f )
Change-Id: I42b4b24e25175bb7628b46a79431d2592644803c
2017-01-18 19:08:44 +09:00