Commit Graph

3338 Commits

Author SHA1 Message Date
Luke Huang
757a1caa8f [automerger skipped] Merge "Convert Android.mk to Android.bp for net cts" into qt-dev am: 10b4eaa6f0 am: 8f58b93e39
am: cc76120fcc -s ours
am skip reason: change_id I5bb6de7a07494bd13d069212223691968d4f080e with SHA1 db29b055d9 is in history

Change-Id: I5a5c2f5acce645ad11937bd4bcbb86342e7092f1
2019-05-28 01:38:07 -07:00
Luke Huang
cc76120fcc Merge "Convert Android.mk to Android.bp for net cts" into qt-dev am: 10b4eaa6f0
am: 8f58b93e39

Change-Id: I40204b4745dc08cb6056955a915a7c6a39807adc
2019-05-28 01:33:00 -07:00
TreeHugger Robot
10b4eaa6f0 Merge "Convert Android.mk to Android.bp for net cts" into qt-dev 2019-05-28 08:14:58 +00:00
Luke Huang
971b79519a Convert Android.mk to Android.bp for net cts
Bug: 130623306
Test: Run the tests below on Crosshatch, Sailfish, Bonito
      atest CtsNativeNetTestCases CtsNativeNetDnsTestCases
      atest CtsNetTestCases

Merged-In: I5bb6de7a07494bd13d069212223691968d4f080e
(cherry picked from commit db29b055d9)

Change-Id: I0f1f70794c0ce303158f1aea54f0801379498071
2019-05-28 06:37:32 +00:00
Paul Hu
f98653a0d8 Merge "[automerger skipped] Ignore all tests in IpSecManagerTunnelTest with instant apps am: a138c9e487 am: 298d129743 -s ours
am: 74e472c995 -s ours
am skip reason: change_id Ia18c6bfe791692f8835b127adf734ce3d2a4ba95 with SHA1 829a040a81 is in history

Change-Id: Icf6c8cfceb7b5d6ddccec35d3f0b26076646ba99
2019-05-27 10:53:13 -07:00
Paul Hu
747b4af554 [automerger skipped] Ignore all tests in IpSecManagerTunnelTest with instant apps am: a138c9e487 -s ours am: a29a169fb1 -s ours
am: ffb91ac365 -s ours
am skip reason: change_id Ia18c6bfe791692f8835b127adf734ce3d2a4ba95 with SHA1 829a040a81 is in history

Change-Id: Iba4435832ffe93b3157dcc610e6ef5005ed5ba64
2019-05-27 10:29:46 -07:00
Android Build Merger (Role)
74e472c995 Merge "[automerger skipped] Ignore all tests in IpSecManagerTunnelTest with instant apps am: a138c9e487 am: 298d129743 -s ours am skip reason: change_id Ia18c6bfe791692f8835b127adf734ce3d2a4ba95 with SHA1 829a040a81 is in history" into qt-r1-dev-plus-aosp 2019-05-27 11:08:12 +00:00
Paul Hu
c19f5c98b4 [automerger skipped] Ignore all tests in IpSecManagerTunnelTest with instant apps am: a138c9e487
am: 298d129743 -s ours
am skip reason: change_id Ia18c6bfe791692f8835b127adf734ce3d2a4ba95 with SHA1 829a040a81 is in history

Change-Id: Id71777e240a67e62a9191c2c253c81032f9b656f
2019-05-27 04:07:51 -07:00
Paul Hu
ffb91ac365 [automerger skipped] Ignore all tests in IpSecManagerTunnelTest with instant apps am: a138c9e487 -s ours
am: a29a169fb1 -s ours
am skip reason: change_id Ia18c6bfe791692f8835b127adf734ce3d2a4ba95 with SHA1 829a040a81 is in history

Change-Id: I3bf6c5f46789182cbf251a06a9c2809b626c8706
2019-05-27 04:07:50 -07:00
Paul Hu
a29a169fb1 [automerger skipped] Ignore all tests in IpSecManagerTunnelTest with instant apps
am: a138c9e487 -s ours
am skip reason: change_id Ia18c6bfe791692f8835b127adf734ce3d2a4ba95 with SHA1 829a040a81 is in history

Change-Id: I432b16b910227bced7ca8de0347b72c52a7459d2
2019-05-27 04:02:51 -07:00
Paul Hu
a138c9e487 Ignore all tests in IpSecManagerTunnelTest with instant apps
Test runner will crash while tring to get test network service
in IpSecManagerTunnelTest. Because MANAGE_TEST_NETWORKS
permission can't be granted to instant apps. So ignore all tests
in this file.

Bug: 133399750
Test: atest CtsNetTestCases --instant

Change-Id: I31b7e12a5a0021185851ba4435a6c42d457f34b6
Merged-In: Ia18c6bfe791692f8835b127adf734ce3d2a4ba95
Merged-In: I697333a7a64d794208d80112bdc1d1e50c5d2b56
Merged-In: I31b7e12a5a0021185851ba4435a6c42d457f34b6
(cherry picked from commit eb29c90465)
2019-05-27 01:19:17 +00:00
Luke Huang
393feda86c [automerger skipped] Merge "Minor changes for DnsResolverTest" into qt-dev am: ac707024b2 am: cb2ace5a9b
am: 070fe0921c -s ours
am skip reason: change_id Ibe5b5396d7d7563643eae14940934786903a4f64 with SHA1 a2f73df47b is in history

Change-Id: I7ddca19c48104572a10004baaa7d2c0bc35e231e
2019-05-24 19:59:55 -07:00
Luke Huang
ea7eac44e2 [automerger skipped] Merge "Minor changes for DnsResolverTest" into qt-dev am: ac707024b2 am: 7ff1c9d1a0
am: 0439123cfe -s ours
am skip reason: change_id Ibe5b5396d7d7563643eae14940934786903a4f64 with SHA1 a2f73df47b is in history

Change-Id: I7023195d36bef7c09fb219b87a0b83e4ac7ad724
2019-05-24 19:27:59 -07:00
Henry Tung
53f1860afa Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev am: 7058c3fbd8 am: 8b37619dc6
am: 0417c40f81

Change-Id: Ia9e55df7311ac4ed066686b04a905f48e90ba874
2019-05-24 18:53:18 -07:00
Paul Hu
eb29c90465 Merge "Ignore all tests in IpSecManagerTunnelTest with instant apps" am: 57e952f8f8 am: 7510105d86 am: 829a040a81
am: eb452c132b

Change-Id: I31b7e12a5a0021185851ba4435a6c42d457f34b6
2019-05-24 18:52:54 -07:00
Henry Tung
c22e8292a6 Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev am: 7058c3fbd8 am: 7c6a82be82
am: ef230a98bb

Change-Id: I8a607c3655caea9920d61d8376a5e799e230f088
2019-05-24 18:14:10 -07:00
Luke Huang
070fe0921c Merge "Minor changes for DnsResolverTest" into qt-dev am: ac707024b2
am: cb2ace5a9b

Change-Id: I01c4bb5f69e5b583371c8e772a6cb2b594d83f1e
2019-05-24 18:01:10 -07:00
Luke Huang
cb2ace5a9b Merge "Minor changes for DnsResolverTest" into qt-dev
am: ac707024b2

Change-Id: I95e48ad3bdb5004e4acced034a6d6efac6f031c2
2019-05-24 16:27:41 -07:00
Luke Huang
0439123cfe Merge "Minor changes for DnsResolverTest" into qt-dev am: ac707024b2
am: 7ff1c9d1a0

Change-Id: If438b61f29a1a00703001a2bcf8e53661ff110c2
2019-05-24 13:09:55 -07:00
TreeHugger Robot
ac707024b2 Merge "Minor changes for DnsResolverTest" into qt-dev 2019-05-24 19:28:19 +00:00
Henry Tung
0417c40f81 Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev am: 7058c3fbd8
am: 8b37619dc6

Change-Id: Ib449e8fe5b2135bf6d1297ad19212f300ca47e66
2019-05-24 02:47:03 -07:00
Paul Hu
eb452c132b Merge "Ignore all tests in IpSecManagerTunnelTest with instant apps" am: 57e952f8f8 am: 7510105d86
am: 829a040a81

Change-Id: I697333a7a64d794208d80112bdc1d1e50c5d2b56
2019-05-24 02:43:26 -07:00
Henry Tung
ef230a98bb Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev am: 7058c3fbd8
am: 7c6a82be82

Change-Id: I796034207ed597c39935f773c233a54e7547c03b
2019-05-24 00:26:47 -07:00
Henry Tung
8b37619dc6 Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev
am: 7058c3fbd8

Change-Id: I942634bd70d37363e0078e9c352d34190ba0c2ad
2019-05-24 00:15:53 -07:00
Henry Tung
7058c3fbd8 Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev 2019-05-24 07:03:31 +00:00
Paul Hu
829a040a81 Merge "Ignore all tests in IpSecManagerTunnelTest with instant apps" am: 57e952f8f8
am: 7510105d86

Change-Id: Ia18c6bfe791692f8835b127adf734ce3d2a4ba95
2019-05-23 23:39:38 -07:00
paulhu
5f7599b6d5 Ignore all tests in IpSecManagerTunnelTest with instant apps
Test runner will crash while tring to get test network service
in IpSecManagerTunnelTest. Because MANAGE_TEST_NETWORKS
permission can't be granted to instant apps. So ignore all tests
in this file.

Bug: 133399750
Test: atest CtsNetTestCases --instant
Change-Id: I5a096f20ec168133dbb65d27d3388c01e6ee895b
2019-05-24 11:37:37 +08:00
Paul Hu
3cad5ddf54 [automerger skipped] Merge "Enable instant app mode for CtsNetTestCases" am: 5013b29af8 am: b073a29470 -s ours am: 0f897b8d71 -s ours
am: 4375670a45 -s ours
am skip reason: change_id I1d78349d14763c133e1eab020d26865f46ff19a3 with SHA1 d02d469390 is in history

Change-Id: Ie083cfec311b37f9d8d20baf3ac83d1bfea96650
2019-05-23 12:50:01 -07:00
Paul Hu
4375670a45 [automerger skipped] Merge "Enable instant app mode for CtsNetTestCases" am: 5013b29af8 am: b073a29470 -s ours
am: 0f897b8d71 -s ours
am skip reason: change_id I931369875c86a396a898682009337cef1b918ba4 with SHA1 a5f4202a7b is in history

Change-Id: I86d951bf470cdec18147a5cb2f33527301a4ecb0
2019-05-22 14:10:55 -07:00
Paul Hu
0f897b8d71 [automerger skipped] Merge "Enable instant app mode for CtsNetTestCases" am: 5013b29af8
am: b073a29470 -s ours
am skip reason: change_id I931369875c86a396a898682009337cef1b918ba4 with SHA1 a5f4202a7b is in history

Change-Id: Ibf168d3166a11309d6a1a1ab5849d737bae436bd
2019-05-22 10:29:01 -07:00
Henry Tung
0097cb240d Modify testNetworkSetupWizardPermission let it fit Factory Ota use case.
Bug: 131304475
Test: run cts -m CtsNetTestCases -t android.net.wifi.cts.WifiManagerTest#testNetworkSetupWizardPermission
Change-Id: I41a457e6f31fcf3c45b171937d61b6342e3c0946
2019-05-22 11:18:07 +08:00
paulhu
435166fa86 Enable instant app mode for CtsNetTestCases
1. Indicating CtsNetTestCases support instant app mode but
   ignore some tests that cannot run in instant app mode.
2. Move some tests which need to test on API 23 into
   CtsNetApi23TestCases module due to instant app package
   must target at least API 26.

Bug: 123366918
Test: atest CtsNetTestCases --instant
Test: atest CtsNetApi23TestCases
Test: atest FrameworksNetTests

Change-Id: I4e828cbc48143e36c1be38b91c3c698122d4be5a
Merged-In: I1d78349d14763c133e1eab020d26865f46ff19a3
Merged-In: I931369875c86a396a898682009337cef1b918ba4
Merged-In: Ia8a45d6d751be94f9f707f879ea6ce4e6a45fae1
2019-05-22 01:11:10 +08:00
Paul Hu
d02d469390 Merge "Enable instant app mode for CtsNetTestCases" into qt-dev am: 732767e5a9 am: a5f4202a7b
am: e7e90600ec

Change-Id: I1d78349d14763c133e1eab020d26865f46ff19a3
2019-05-20 09:10:49 -07:00
Paul Hu
e7e90600ec Merge "Enable instant app mode for CtsNetTestCases" into qt-dev am: 732767e5a9
am: a5f4202a7b

Change-Id: Ia8a45d6d751be94f9f707f879ea6ce4e6a45fae1
2019-05-20 06:42:59 -07:00
Paul Hu
a5f4202a7b Merge "Enable instant app mode for CtsNetTestCases" into qt-dev
am: 732767e5a9

Change-Id: I931369875c86a396a898682009337cef1b918ba4
2019-05-20 05:41:24 -07:00
Xin Li
d5ef4dbdbf [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 0f12601ff3 -s ours am: 79d906ff81 -s ours am: ede550a504
am: d8cf850578 -s ours
am skip reason: subject contains skip directive

Change-Id: I4c220c4ce16694a153bbb17971dd461acb6e0157
2019-05-17 09:51:30 -07:00
Xin Li
d8cf850578 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 0f12601ff3 -s ours am: 79d906ff81 -s ours
am: ede550a504

Change-Id: I4f6bb23e9896a9100c9b31aa036c88271ce5745e
2019-05-16 22:39:56 -07:00
Xin Li
ede550a504 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 0f12601ff3 -s ours
am: 79d906ff81 -s ours
am skip reason: subject contains skip directive

Change-Id: I8d9b6b2fd99063662562208fe5e1cd7a3b7bae8f
2019-05-16 21:18:55 -07:00
Xin Li
91d9b93ebc Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: acd4822618 -s ours am: 5840687195
am: be9818746b -s ours
am skip reason: subject contains skip directive

Change-Id: I1a9fc0b81e27e0aa143a1c6e0ea81e96196ece43
2019-05-16 13:42:40 -07:00
Xin Li
ff12aba32b [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: acd4822618 -s ours am: a81e804393
am: 72f1581e89 -s ours
am skip reason: subject contains skip directive

Change-Id: I103b9bd04bd9126c8da9769fecafb20caac7e4d6
2019-05-16 10:13:26 -07:00
Benedict Wong
23ab30d68f Merge "Merge "Fix IPsec CTS tests for interface address checking" into qt-dev am: b256c48d9b am: 701f04f642" into qt-r1-dev-plus-aosp
am: e9c7cd9254

Change-Id: I6eba2fd8ce11a54dd8b7d1770be1e85e3e522e6d
2019-05-16 08:12:46 -07:00
Xin Li
be9818746b Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: acd4822618 -s ours
am: 5840687195

Change-Id: Iea90194c111ce5f14de10a0fa71945a0416d818d
2019-05-16 03:31:53 -07:00
Benedict Wong
0b8d449ec2 Merge "Fix IPsec CTS tests for interface address checking" into qt-dev am: b256c48d9b am: 8638f6bd88
am: de4f181e1a

Change-Id: I81ea3a4eb67961c56a68ced13aaec9675ac9a77c
2019-05-16 02:34:21 -07:00
Xin Li
72f1581e89 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: acd4822618 -s ours
am: a81e804393

Change-Id: Ic1b824193391dafaf2ea3996c89e2975829a3abc
2019-05-16 02:29:04 -07:00
Benedict Wong
d09d1dc280 [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev am: c7774ffa16 -s ours am: c7657003be -s ours
am: ced3090359 -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: I4aa807405215cf72914bb96c53da03af21dc331a
2019-05-16 01:42:50 -07:00
paulhu
78e4a184a1 Enable instant app mode for CtsNetTestCases
1. Indicating CtsNetTestCases support instant app mode but
   ignore some tests that cannot run in instant app mode.
2. Move some tests which need to test on API 23 into
   CtsNetApi23TestCases module due to instant app package
   must target at least API 26.

Bug: 123366918
Test: atest CtsNetTestCases --instant
Test: atest CtsNetApi23TestCases
Test: atest FrameworksNetTests

Change-Id: I4e828cbc48143e36c1be38b91c3c698122d4be5a
2019-05-16 16:07:07 +08:00
Junyu Lai
89165b1f20 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev am: 8702c1454d -s ours am: 9fe83529b8 -s ours
am: 33dd370165 -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 80ec50b8ae is in history

Change-Id: If89cdbe56a37a6e70ae4e29adb3f87ab86ee36c0
2019-05-16 00:47:13 -07:00
Android Build Merger (Role)
e9c7cd9254 Merge "Merge "Fix IPsec CTS tests for interface address checking" into qt-dev am: b256c48d9b am: 701f04f642" into qt-r1-dev-plus-aosp 2019-05-16 06:43:32 +00:00
Benedict Wong
53f9ca33f5 Merge "Fix IPsec CTS tests for interface address checking" into qt-dev am: b256c48d9b
am: 701f04f642

Change-Id: I9338241469f0c707817b04ed7f7a2769e149202a
2019-05-15 23:43:11 -07:00
Benedict Wong
de4f181e1a Merge "Fix IPsec CTS tests for interface address checking" into qt-dev am: b256c48d9b
am: 8638f6bd88

Change-Id: Ie09d1ec0a6c28f40a8898f0807dc8830c9f1df75
2019-05-15 22:11:32 -07:00