Benedict Wong
5fa21a5ce0
Merge "Remove point-to-point assertion in IpSecManagerTunnelTest" am: 774ee87692
...
am: 339a7d3b85
Change-Id: Ic64fbe8847b61eb6bc50736d42bdd3f4f9a4ff26
2019-03-05 19:46:21 -08:00
Benedict Wong
339a7d3b85
Merge "Remove point-to-point assertion in IpSecManagerTunnelTest"
...
am: 774ee87692
Change-Id: I668f175378fb44bf3c23fb95227c2781df38cc44
2019-03-05 19:25:29 -08:00
Benedict Wong
774ee87692
Merge "Remove point-to-point assertion in IpSecManagerTunnelTest"
2019-03-06 02:55:20 +00:00
Benedict Wong
7513ebc64f
Remove point-to-point assertion in IpSecManagerTunnelTest
...
This change removes the requirement for IPsec interfaces to be
point-to-point. The two implementations (VTI vs XFRMI) have different
point-to-point values, and as such, this assertion is no longer valid.
Bug: 126578549
Test: Ran tests against XFRM-I kernels
Change-Id: I0597e0aa86ccea2cd28d7c5e02063c788ddb08b8
2019-03-04 11:57:19 -08:00
Brett Chabot
596fd9d7f9
Merge "Migrate remaining cts to androidx.test." am: 40fadc421c
...
am: 59492a091e
Change-Id: Ie359e9c809c8c9ebda26351d4377fe936f567f3d
2019-03-03 22:39:24 -08:00
Brett Chabot
59492a091e
Merge "Migrate remaining cts to androidx.test."
...
am: 40fadc421c
Change-Id: I32a8d50322c5a09458a0ed93270c67d3c85b68ab
2019-03-03 22:30:48 -08:00
Brett Chabot
40fadc421c
Merge "Migrate remaining cts to androidx.test."
2019-03-04 06:17:48 +00:00
Brett Chabot
44a06a7fbd
Migrate remaining cts to androidx.test.
...
See go/jetpack-test-android-migration
Exempt-From-Owner-Approval: automated package name refactoring; already
reviewed+merged internally
Test: m cts
Change-Id: I6877435bf0436b8ef1dd252b225eac2908e78b71
Merged-In: I092c369229f8cb4c13827cbad4fd162622ac7849
2019-03-03 18:22:22 -08:00
Brett Chabot
debeff9d12
Merge "Migrate cts/tests/tests/net to androidx.test" am: c4c0bb37cf
...
am: 928821e657
Change-Id: I011952772f9b50b25e07fcc765be691b974c9076
2019-03-01 17:29:54 -08:00
Brett Chabot
928821e657
Merge "Migrate cts/tests/tests/net to androidx.test"
...
am: c4c0bb37cf
Change-Id: Ib5232e086acbf6ffbcb5c0e7cb4b1e73cd778a85
2019-03-01 17:09:05 -08:00
Treehugger Robot
c4c0bb37cf
Merge "Migrate cts/tests/tests/net to androidx.test"
2019-03-02 00:45:26 +00:00
Brett Chabot
420804ce3e
Migrate cts/tests/tests/net to androidx.test
...
See go/jetpack-test-android-migration
Test: m -j CtsNetTestCases
Change-Id: I4a76e9b9410f94e297bca4287f450fe3b72fb409
Merged-In: If102677e4cdc4361b5d93283c4d6140dc477a94a
2019-03-01 21:09:26 +00:00
Dongwon Kang
13a1199fdf
Merge "Add rtsp uri test cases for Uri.toSafeString()" am: 743aa5ddd4
...
am: ca6e4c8e5e
Change-Id: Id9f2f75693c995a3bea9a269648dfa7d3e3a8b0c
2019-03-01 09:37:02 -08:00
Dongwon Kang
ca6e4c8e5e
Merge "Add rtsp uri test cases for Uri.toSafeString()"
...
am: 743aa5ddd4
Change-Id: I31dcbc7bde122b1432265b81002ca20e944d7811
2019-03-01 09:24:18 -08:00
Dongwon Kang
77dbefc0f8
Add rtsp uri test cases for Uri.toSafeString()
...
Test: atest CtsNetTestCases:android.net.cts.UriTest
Bug: 123669012
Change-Id: I6dac4028fd9eb6b9240a87d9e41f9dafc34bbabe
2019-02-28 16:50:03 -08:00
jungyee.yoo
8ad4796184
Merge "Merge "Add sleep to avoid calling stopLocalOnlyHotspot before TetherController initialization." into pie-cts-dev am: 4d452396c9" am: 8e2826d056
...
am: dd95f6d284
Change-Id: Icbc6f0340ea623dae9416c6699f79981d77ae2ea
2019-02-27 15:58:08 -08:00
jungyee.yoo
dd95f6d284
Merge "Merge "Add sleep to avoid calling stopLocalOnlyHotspot before TetherController initialization." into pie-cts-dev am: 4d452396c9"
...
am: 8e2826d056
Change-Id: Id5a74c783ce62e5ce68369606ad19de8b8d45287
2019-02-27 15:48:10 -08:00
jungyee.yoo
f1fd229576
Merge "Add sleep to avoid calling stopLocalOnlyHotspot before TetherController initialization." into pie-cts-dev am: 4d452396c9
...
am: 7a1ba7cace
Change-Id: Iebd363448d1b05f1c4b8b4b35a3a56cc466e1991
2019-02-27 15:45:25 -08:00
jungyee.yoo
7a1ba7cace
Merge "Add sleep to avoid calling stopLocalOnlyHotspot before TetherController initialization." into pie-cts-dev
...
am: 4d452396c9
Change-Id: I8e53f1b42ad21330e607827e1b6eedbb0837696d
2019-02-27 15:37:20 -08:00
Android Merger
8e2826d056
Merge "Merge "Add sleep to avoid calling stopLocalOnlyHotspot before TetherController initialization." into pie-cts-dev am: 4d452396c9"
2019-02-27 23:30:27 +00:00
jungyee.yoo
23be65bee9
Merge "Add sleep to avoid calling stopLocalOnlyHotspot before TetherController initialization." into pie-cts-dev
...
am: 4d452396c9
Change-Id: Ie10d523bf836e96b246c771cf481e323ed24a3ed
2019-02-27 15:30:14 -08:00
Chenbo Feng
e220c30df0
Merge "Add checks for detailed uid stats" am: 8d9b120318
...
am: f9f0f582cd
Change-Id: Ibc328396660c263efdcbfc35a3abe1278d5501a8
2019-02-27 14:02:59 -08:00
Chenbo Feng
f9f0f582cd
Merge "Add checks for detailed uid stats"
...
am: 8d9b120318
Change-Id: I530d78765b24edcb3260ed4647eb785c089aa2ed
2019-02-27 13:58:15 -08:00
Treehugger Robot
8d9b120318
Merge "Add checks for detailed uid stats"
2019-02-27 21:41:30 +00:00
Luke Huang
c417fde69d
Merge changes from topic "NDK DNS API CTS" am: 0e45542141
...
am: 33e10a1a85
Change-Id: Icd14da21de70e2b01c8e39de85bcc60b2948a999
2019-02-27 04:32:48 -08:00
Luke Huang
33e10a1a85
Merge changes from topic "NDK DNS API CTS"
...
am: 0e45542141
Change-Id: Ia144ae98953f56dcbfcd2be953e82fa3aeaa52d6
2019-02-27 04:11:58 -08:00
Luke Huang
63a7632799
Cts test cases for asynchronous DNS query API
...
implement test cases without gtest
Test: build
atest MultinetworkApiTest
Change-Id: Iacb0b05f449c3a848c62a402cf0fa73d54956245
2019-02-26 16:44:34 +08:00
Luke Huang
f40d0f5739
Build libnativemultinetwork_jni with C++
...
Test: atest MultinetworkApiTest
Change-Id: If34a89cf00aa06590d947696fc647fc26aa019e8
2019-02-26 16:44:32 +08:00
Xin Li
869f10c7bd
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
am: d219742162 -s ours
am skip reason: subject contains skip directive
Change-Id: I5cbd25fc048187fd116bd6edfc70fe8bc4632f48
2019-02-25 16:11:13 -08:00
Xin Li
d219742162
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
Bug: 120848293
Change-Id: I4029675ab6a04d36baf8a44fa4aba3453b38a1c0
2019-02-21 09:41:33 -08:00
Xin Li
fedc7a9e81
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 498ce9335b -s ours
...
am: 7678b4061e -s ours
am skip reason: subject contains skip directive
Change-Id: I1b759608cf784407a98536011916ad115b864755
2019-02-20 09:17:33 -08:00
Xin Li
498ce9335b
DO NOT MERGE - Merge PPRL.190205.001 into master
...
Bug: 124234733
Change-Id: I06c90bc2fa7292199e3393cb5ca10347a36c9886
2019-02-18 15:58:02 -08:00
Xin Li
80adb946e5
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
am: 4dc9c47f70 -s ours
am skip reason: subject contains skip directive
Change-Id: If29b754b2455d6b6a6ace55ae42bea239e90de4c
2019-02-14 14:27:30 -08:00
jungyee.yoo
17ef99be74
Add sleep to avoid calling stopLocalOnlyHotspot before TetherController initialization.
...
Bug: 123205589
Test: run cts-on-gsi -m -m CtsNetTestCases -t android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotSingleRequestByApps
Bug: 123379970
Test: run cts-on-gsi -m -m CtsNetTestCases -t ndroid.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotSuccess
Change-Id: I7506c3037dc5368d69330acc47c97c765185870f
2019-02-14 00:18:23 +00:00
Xin Li
4dc9c47f70
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
Bug: 124234733
Change-Id: I961343ca4f8b16a49bb7bb4b16dceff17278a293
2019-02-12 17:27:47 -08:00
android-build-team Robot
e1f2690ea6
Snap for 5180536 from e6020941f11d6f2a6bdbe5f1c0d516ee40597e51 to pi-platform-release
...
Change-Id: If17e7e049978fbf4ca01a189f0a1befcbf9421a8
2019-02-09 02:18:46 +00:00
Chenbo Feng
ccef9c8093
Add checks for detailed uid stats
...
Get the detailed network stats for the test uid and check if the detail
stats is consistent with the per uid stats. This test is necessary since
the new devices may get detailed network stats and per uid total stats
from different eBPF maps.
Test: atest TrafficStatsTest
Bug: 79171384
Change-Id: I04533e9fa146e052bdc3787ec6b1f8dad9c19fb7
2019-02-08 12:32:28 -08:00
Pavel Grafov
6fe1ac0066
Merge "Cleanup leftover commented code." am: 89268e42f2
...
am: da8ad481d3
Change-Id: I6f0c705a51130288d2bb42f401baf8116f4b00dc
2019-01-31 02:24:11 -08:00
Pavel Grafov
da8ad481d3
Merge "Cleanup leftover commented code."
...
am: 89268e42f2
Change-Id: I5e57d84884676af7640d7ccb8c7d1d489184248d
2019-01-31 02:18:27 -08:00
Pavel Grafov
063552f8c9
Cleanup leftover commented code.
...
Test: builds
Bug: none
Change-Id: Ic14227d0ddccbd04e13c7a61197765eab2555cbe
2019-01-30 21:44:39 +00:00
Pavel Grafov
1c2ee40dcd
Merge "CTS test for VpnService.isAlwaysOn & .isLockdownEnabled." am: 30667cf8c0
...
am: ec4f77d275
Change-Id: Ie0394ebd32d5b0d80339d1a94210a0114189b942
2019-01-30 13:44:11 -08:00
Pavel Grafov
ec4f77d275
Merge "CTS test for VpnService.isAlwaysOn & .isLockdownEnabled."
...
am: 30667cf8c0
Change-Id: I428c9fe6d03c18136ba38e5a52938eb0bf8e8a5c
2019-01-30 13:27:23 -08:00
Pavel Grafov
49e9a78dcb
CTS test for VpnService.isAlwaysOn & .isLockdownEnabled.
...
Test cases that expect to get "true" returned are part of
devicepolicy tests since it is hard to set up always-on
configuration without device/profile owner.
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: atest HostsideVpnTests#testIsAlwaysOnIsLockdown
Bug: 72628179
Change-Id: I7fceab93a1d2d0255611f7a788391540e0dddccb
2019-01-30 18:50:15 +00:00
Irina Dumitrescu
8c37a098cb
Merge "CTS test for setting HTTP proxy on a VPN network." am: 1ca625c2cb
...
am: 0e603d64bf
Change-Id: I8c21e8835b7783415379477a598e450824a78133
2019-01-25 07:06:01 -08:00
Irina Dumitrescu
0e603d64bf
Merge "CTS test for setting HTTP proxy on a VPN network."
...
am: 1ca625c2cb
Change-Id: I002c03ebdb966157d11c511e1504991f5e8d7a30
2019-01-25 07:00:16 -08:00
Treehugger Robot
1ca625c2cb
Merge "CTS test for setting HTTP proxy on a VPN network."
2019-01-25 14:48:40 +00:00
Irina Dumitrescu
3e84aa2e36
CTS test for setting HTTP proxy on a VPN network.
...
Bug: 76001058
Test: adb shell settings put global stay_on_while_plugged_in 7 && atest HostsideVpnTests
Change-Id: Ifa64d640f15bb68736b8c12f70e58a180bd80869
2019-01-24 19:10:21 +00:00
Luke Huang
01dd25c4cb
Merge "Cts for DnsResolver" am: 1449fe3ba5
...
am: ec5579e054
Change-Id: Ifb1881048b61ed5be8efcd092a81105b82edbc4a
2019-01-23 09:23:56 -08:00
Luke Huang
ec5579e054
Merge "Cts for DnsResolver"
...
am: 1449fe3ba5
Change-Id: Ifc8bb1fb72977cf1c81a926cbcc9ad486d3d9020
2019-01-23 09:13:59 -08:00
Luke Huang
1449fe3ba5
Merge "Cts for DnsResolver"
2019-01-23 17:03:59 +00:00