Brett Chabot
f49a651d2d
Merge "[automerger skipped] Merge "DO NOT MERGE - Migrate remaining cts to androidx.test." into pie-cts-dev am: 4fb729db4e -s ours am: 889c64da2a -s ours
...
am: 00cee53591
2019-03-12 11:13:28 -07:00
Brett Chabot
00cee53591
Merge "[automerger skipped] Merge "DO NOT MERGE - Migrate remaining cts to androidx.test." into pie-cts-dev am: 4fb729db4e -s ours
...
am: 889c64da2a
2019-03-12 11:08:20 -07:00
Android Merger
889c64da2a
Merge "[automerger skipped] Merge "DO NOT MERGE - Migrate remaining cts to androidx.test." into pie-cts-dev am: 4fb729db4e -s ours am skip reason: subject contains skip directive"
2019-03-12 18:00:49 +00:00
Brett Chabot
bd8a86b83b
[automerger skipped] Merge "DO NOT MERGE - Migrate remaining cts to androidx.test." into pie-cts-dev
...
am: 4fb729db4e -s ours
am skip reason: subject contains skip directive
Change-Id: I46cc9b14f580c8d5231adcba078e1513f3d3e5b1
2019-03-12 11:00:18 -07:00
Brett Chabot
f16bbb9eb7
[automerger skipped] Merge "DO NOT MERGE - Migrate remaining cts to androidx.test." into pie-cts-dev am: 4fb729db4e -s ours
...
am: 720760b6fc
2019-03-12 10:58:35 -07:00
Brett Chabot
720760b6fc
[automerger skipped] Merge "DO NOT MERGE - Migrate remaining cts to androidx.test." into pie-cts-dev
...
am: 4fb729db4e -s ours
am skip reason: subject contains skip directive
Change-Id: I71b2f3cb44260abea706f86371339237447f076b
2019-03-12 10:51:16 -07:00
Brett Chabot
c45065bdea
DO NOT MERGE - Migrate remaining cts to androidx.test.
...
See go/jetpack-test-android-migration
Test: m cts
Exempt-From-Owner-Approval: automated refactoring, has already been reviewed by owners downstream
Bug: 127482512
Change-Id: If72aed95ef9e436bcc6e063abc0478eca365cc9b
2019-03-11 23:26:10 +00:00
Luke Huang
8432fdb074
Merge "Minor changes and more cts tests for DnsResolver" am: db7e161d85
...
am: fc677b506c
2019-03-08 07:39:06 -08:00
Luke Huang
fc677b506c
Merge "Minor changes and more cts tests for DnsResolver"
...
am: db7e161d85
2019-03-08 05:49:53 -08:00
Luke Huang
3ac88e7cd5
Merge "Minor change for jni cts test of asynchronous DNS query API" am: 652fc29761
...
am: bf375e495d
2019-03-07 20:45:36 -08:00
Luke Huang
bf375e495d
Merge "Minor change for jni cts test of asynchronous DNS query API"
...
am: 652fc29761
2019-03-07 20:18:37 -08:00
Luke Huang
db7e161d85
Merge "Minor changes and more cts tests for DnsResolver"
2019-03-08 03:19:55 +00:00
Luke Huang
652fc29761
Merge "Minor change for jni cts test of asynchronous DNS query API"
2019-03-08 03:19:41 +00:00
Luke Huang
a0629ad8b9
Minor changes and more cts tests for DnsResolver
...
Test: built, flashed, booted
atest DnsResolverTest
Change-Id: I39f24b9751ab507bf7fc6bcd90376fafc60221b8
2019-03-07 16:49:17 +08:00
Benedict Wong
5fa21a5ce0
Merge "Remove point-to-point assertion in IpSecManagerTunnelTest" am: 774ee87692
...
am: 339a7d3b85
2019-03-05 19:46:21 -08:00
Benedict Wong
339a7d3b85
Merge "Remove point-to-point assertion in IpSecManagerTunnelTest"
...
am: 774ee87692
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
2019-03-03 22:39:24 -08:00
Brett Chabot
59492a091e
Merge "Migrate remaining cts to androidx.test."
...
am: 40fadc421c
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
2019-03-01 17:29:54 -08:00
Brett Chabot
928821e657
Merge "Migrate cts/tests/tests/net to androidx.test"
...
am: c4c0bb37cf
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
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
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
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
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
2019-02-27 14:02:59 -08:00
Chenbo Feng
f9f0f582cd
Merge "Add checks for detailed uid stats"
...
am: 8d9b120318
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
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
e1a851f029
Minor change for jni cts test of asynchronous DNS query API
...
Test: build
atest MultinetworkApiTest
Change-Id: I644adb74b841d70bb3396104fb483793a25cd36a
2019-02-27 18:28:21 +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
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
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
