Commit Graph

5039 Commits

Author SHA1 Message Date
TreeHugger Robot
32276ea510 [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e -s ours am: 38bd84d94e -s ours am: 8340720e76 -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: Ic41ea0bfe2208a20c82269f4710bb4a780db1851
2020-04-24 06:57:47 +00:00
TreeHugger Robot
10f877bd35 [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e am: 2eed6ea182 -s ours am: 4201ba3fa3 -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: I68c1a0c75d91eb410e3af59a85fba0ec90525839
2020-04-24 06:57:22 +00:00
TreeHugger Robot
8340720e76 [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e -s ours am: 38bd84d94e -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: I656462f68b3fba1eefdd61ddff1ca4faec05212f
2020-04-24 06:42:28 +00:00
TreeHugger Robot
4201ba3fa3 [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e am: 2eed6ea182 -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: If2e49d8251036dba4decffc2c1631a7171334c95
2020-04-24 06:42:05 +00:00
TreeHugger Robot
2eed6ea182 Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e
Change-Id: I68240e77ac0e8a6328cfc92f0a5cd844129ae316
2020-04-24 06:27:50 +00:00
TreeHugger Robot
38bd84d94e [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: Ie70f26552e41ba517d80067fad37cabf1980f5cb
2020-04-24 06:27:15 +00:00
TreeHugger Robot
25cd61eb7e Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev 2020-04-24 06:15:12 +00:00
Sudheer Shanka
09be86c47f [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master am: 4cd0f56bea -s ours am: f5af3d7527 -s ours am: 8451b7d01c -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: I9f6529bd4b719fdb22f5248280c900e384086743
2020-04-24 03:33:10 +00:00
Sudheer Shanka
8451b7d01c [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master am: 4cd0f56bea -s ours am: f5af3d7527 -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: Ie16e6a712f34ed9f9c30d2c8d0ff4bd49f48a54b
2020-04-24 03:29:05 +00:00
Sudheer Shanka
f5af3d7527 [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master am: 4cd0f56bea -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: I7964684d586048225998b2956500b96d8f57988c
2020-04-24 03:15:54 +00:00
Sudheer Shanka
4cd0f56bea Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master
* changes:
  Ensure location is enabled before getting SSID.
  Fix a regression in how required properties are collected.
  Fix Error Prone errors
  Reland "Pull service dumps to help debug test failures."
2020-04-24 03:14:17 +00:00
Yan Yan
b174661034 Merge "Add CTS for EapSessionConfig" am: c7afaba688 am: b15c228d88 am: f2d50ece98 am: 986cf9af4e
Change-Id: Icc35fc9344853eb0b0e2d1b8fe1d5664ee573ba4
2020-04-24 00:59:00 +00:00
Yan Yan
986cf9af4e Merge "Add CTS for EapSessionConfig" am: c7afaba688 am: b15c228d88 am: f2d50ece98
Change-Id: Ida96e4a0dd074a288b1b44defd18097370d618dc
2020-04-24 00:42:06 +00:00
Yan Yan
f2d50ece98 Merge "Add CTS for EapSessionConfig" am: c7afaba688 am: b15c228d88
Change-Id: I3d2ee1aeba0c8473c71a41f3202da663707724f1
2020-04-24 00:39:39 +00:00
Yan Yan
b15c228d88 Merge "Add CTS for EapSessionConfig" am: c7afaba688
Change-Id: I51e89a5604d78c325a8a985b3144ae49734f9eb3
2020-04-24 00:25:31 +00:00
Yan Yan
c7afaba688 Merge "Add CTS for EapSessionConfig" 2020-04-24 00:00:43 +00:00
Yan Yan
38d4245f6b Merge "Create base class that sets up test network" am: c921e5075f am: a1c71f705b am: 8d5985e738 am: 89a9fa945e
Change-Id: I0b9fa1a7c70f28e681b1f5942d3e1726a4639fd5
2020-04-23 23:18:32 +00:00
Yan Yan
e629ac5127 Merge "Make a copy of TunUtils and PacketUtils" am: dbe2adf308 am: 755a4b59b7 am: 1020e90c9a am: ce75b8aba4
Change-Id: I4cf9f6320ba00b17612a47f69816be0538e99b71
2020-04-23 23:17:58 +00:00
Yan Yan
89a9fa945e Merge "Create base class that sets up test network" am: c921e5075f am: a1c71f705b am: 8d5985e738
Change-Id: I3d2f6217cad6915e7d8338d1fd5809c0be2598cf
2020-04-23 23:04:56 +00:00
Yan Yan
ce75b8aba4 Merge "Make a copy of TunUtils and PacketUtils" am: dbe2adf308 am: 755a4b59b7 am: 1020e90c9a
Change-Id: Ie91b4f41f3a73c9e4ac82980dcbfd87e05b99350
2020-04-23 23:04:23 +00:00
Yan Yan
8d5985e738 Merge "Create base class that sets up test network" am: c921e5075f am: a1c71f705b
Change-Id: I750675c3eafb2a28d554df163826b8ec86f03ca0
2020-04-23 22:52:51 +00:00
Yan Yan
1020e90c9a Merge "Make a copy of TunUtils and PacketUtils" am: dbe2adf308 am: 755a4b59b7
Change-Id: I42e2ccd1d5a884d0992f3f75468904799d4f3ec6
2020-04-23 22:52:40 +00:00
Yan Yan
a1c71f705b Merge "Create base class that sets up test network" am: c921e5075f
Change-Id: Ib5f5fd2bc54ad5c4866622f74f1c1d555fee5592
2020-04-23 22:37:28 +00:00
Yan Yan
755a4b59b7 Merge "Make a copy of TunUtils and PacketUtils" am: dbe2adf308
Change-Id: I8a268a878c089a98a1d9b73190ab0db6204b0746
2020-04-23 22:37:03 +00:00
Yan Yan
c921e5075f Merge "Create base class that sets up test network" 2020-04-23 22:19:21 +00:00
Yan Yan
dbe2adf308 Merge "Make a copy of TunUtils and PacketUtils" 2020-04-23 22:18:45 +00:00
Sudheer Shanka
d43f034725 Ensure location is enabled before getting SSID.
When location is disabled, Wi-Fi scan results and SSID are not available
to apps.

Fixes: 153850762
Fixes: 153396893
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I05285811d7131e116d5e1d072137ed2cf9576d05
Merged-In: I05285811d7131e116d5e1d072137ed2cf9576d05
2020-04-23 14:18:32 -07:00
Sudheer Shanka
004c442de9 Fix a regression in how required properties are collected.
+ Enable app standby mode before running the tests.

Fixes: 147459100
Fixes: 117169751
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: cts-tradefed run singleCommand cts-on-gsi --skip-device-info \
      --skip-preconditions -m CtsHostsideNetworkTests \
      -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: I782f8a06922622d28f9a9d5c9f2afa2b12f8aa80
Merged-In: I782f8a06922622d28f9a9d5c9f2afa2b12f8aa80
2020-04-23 14:18:32 -07:00
Sudheer Shanka
a0e71e89ea Fix Error Prone errors
Soong wasn't including android_app or android_test sources in the
javac-check target used for the Error Prone build, which allowed
some Error Prone errors to get in.  Fix them so Error Prone can be
re-enabled for these targets.

Fixes:
cts/hostsidetests/net/app/src/com/android/cts/net/hostside/RequiredPropertiesRule.java:61: error: [CollectionIncompatibleType] Argument '~requiredProperty.getValue()' should not be passed to this method; its type int is not compatible with its collection's type argument Property

Bug: 146455923
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I7c5bf823bf371902285ce3ee3929796fa40c653b
Merged-In: I48b1ccb61c807d0b41a165298ef5981258d6656e
2020-04-23 14:18:32 -07:00
Sudheer Shanka
3cd28c2a39 Reland "Pull service dumps to help debug test failures."
+ Convert tests to use Junit4
+ Add annotations to specify required conditions for the test to run.

This reverts commit 89099548f8.

Bug: 137859686
Change-Id: I7bb2a7e4b2dca3696761e7c030f3380b9226b676
Merged-In: I93317c201a0ea06732e29154ab7e140735381f59
2020-04-23 14:18:32 -07:00
Sudheer Shanka
8a9c6c47fe [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 am: 8d7f5f0f9a -s ours am: 03b91d2e5e -s ours am: e3b1da9363 -s ours am: 1802c8b1de -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: If2338a2e14f233c4291b209abae254d1879237ee
2020-04-23 20:12:32 +00:00
Sudheer Shanka
1802c8b1de [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 am: 8d7f5f0f9a -s ours am: 03b91d2e5e -s ours am: e3b1da9363 -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: I08fe715f097b43dc899182c6be99e3fb5e2fb512
2020-04-23 20:00:26 +00:00
Sudheer Shanka
e3b1da9363 [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 am: 8d7f5f0f9a -s ours am: 03b91d2e5e -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: I6752e843170f0c0447ffe42bb297180a4d0a8c75
2020-04-23 19:45:46 +00:00
Sudheer Shanka
03b91d2e5e [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 am: 8d7f5f0f9a -s ours
am skip reason: skipped by user sudheersai

Change-Id: I13d4668cb83890490a46ef63444ef6390d1e0e91
2020-04-23 19:33:11 +00:00
Sudheer Shanka
8d7f5f0f9a Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4
* changes:
  Ensure location is enabled before getting SSID.
  Fix a regression in how required properties are collected.
  Fix Error Prone errors
  Reland "Pull service dumps to help debug test failures."
2020-04-23 17:57:10 +00:00
evitayan
8cfc634bbc Create base class that sets up test network
This class will be extended by both IkeSessionParamsTest and
IkeSessionTestBase

Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: I98979758a7a684219e35c02ded93224ea172d44f
2020-04-23 10:40:49 -07:00
Mark Chien
b7bc75c6d9 [automerger skipped] Merge "Test enable tethering permission and stopAllTethering" into rvc-dev am: 2cf72fecd3 -s ours am: 3928481da4 -s ours am: f05d98d62e -s ours
am skip reason: Change-Id I38702886ea355e1aec8eb8ac404fdd46a44582e3 with SHA-1 f46d6a1e8d is in history

Change-Id: I605bd55fc3be14f3d7970c05268a240eb37c996a
2020-04-23 17:38:37 +00:00
Mark Chien
c270c3c2b4 [automerger skipped] Merge "Test enable tethering permission and stopAllTethering" into rvc-dev am: 2cf72fecd3 am: 1b3e9d2de5 -s ours am: 2be74fb6c8 -s ours
am skip reason: Change-Id I38702886ea355e1aec8eb8ac404fdd46a44582e3 with SHA-1 257cad8052 is in history

Change-Id: I8d4a8772a4666878663b2a6400bc9c73309cbe8f
2020-04-23 17:36:24 +00:00
Mark Chien
f05d98d62e [automerger skipped] Merge "Test enable tethering permission and stopAllTethering" into rvc-dev am: 2cf72fecd3 -s ours am: 3928481da4 -s ours
am skip reason: Change-Id I38702886ea355e1aec8eb8ac404fdd46a44582e3 with SHA-1 f46d6a1e8d is in history

Change-Id: Ib64af06ea0fd384a55f5f7c47ae0b7faa6998651
2020-04-23 17:22:09 +00:00
Mark Chien
2be74fb6c8 [automerger skipped] Merge "Test enable tethering permission and stopAllTethering" into rvc-dev am: 2cf72fecd3 am: 1b3e9d2de5 -s ours
am skip reason: Change-Id I38702886ea355e1aec8eb8ac404fdd46a44582e3 with SHA-1 257cad8052 is in history

Change-Id: I4949d6724f72d78d4bf1e8b7d3e842f53e23e1f0
2020-04-23 17:16:06 +00:00
Mark Chien
3928481da4 [automerger skipped] Merge "Test enable tethering permission and stopAllTethering" into rvc-dev am: 2cf72fecd3 -s ours
am skip reason: Change-Id I38702886ea355e1aec8eb8ac404fdd46a44582e3 with SHA-1 257cad8052 is in history

Change-Id: Ibb1747b13ce5dfcf1d2ee15d9656f58956aaa6a5
2020-04-23 17:01:01 +00:00
Mark Chien
1b3e9d2de5 Merge "Test enable tethering permission and stopAllTethering" into rvc-dev am: 2cf72fecd3
Change-Id: I74d89dbff01cdbf10c07f632aec74f8b2cfc7fa3
2020-04-23 16:58:34 +00:00
Mark Chien
f46d6a1e8d Test enable tethering permission and stopAllTethering
1. Test whether start tethering is gated by suitable permission.
2. Test stopAllTethering

Bug: 153613718
Test: atest CtsTetheringTest

Merged-In: I38702886ea355e1aec8eb8ac404fdd46a44582e3
Change-Id: I38702886ea355e1aec8eb8ac404fdd46a44582e3
2020-04-23 14:48:03 +00:00
Mark Chien
ee07663cfe Merge "Test enable tethering permission and stopAllTethering" am: 34ec9b0db7 am: 39a164dfd0 am: f7963a7f35 am: 150c70644c
Change-Id: I252fc139e22d05925c57434483b6bb42aabf2864
2020-04-23 13:58:02 +00:00
Mark Chien
150c70644c Merge "Test enable tethering permission and stopAllTethering" am: 34ec9b0db7 am: 39a164dfd0 am: f7963a7f35
Change-Id: Id9d2d9fa7fd25c181f82b51d5854e458944decbc
2020-04-23 13:39:41 +00:00
Mark Chien
f7963a7f35 Merge "Test enable tethering permission and stopAllTethering" am: 34ec9b0db7 am: 39a164dfd0
Change-Id: Ie5bef87706d63f4ea2c09c2a6161290e7c5a88a3
2020-04-23 13:28:22 +00:00
Mark Chien
39a164dfd0 Merge "Test enable tethering permission and stopAllTethering" am: 34ec9b0db7
Change-Id: Ib650908fbb6e1fcb39689168e3d85e78c821e278
2020-04-23 13:14:52 +00:00
Mark Chien
34ec9b0db7 Merge "Test enable tethering permission and stopAllTethering" 2020-04-23 13:02:04 +00:00
Paul Hu
c760a050a9 [automerger skipped] Add TetheringCommonTests to CtsTetheringTest am: 11fec376f5 -s ours am: b37f3618f9 -s ours am: 6791fbb084 -s ours
am skip reason: Change-Id I26c06d522ef2935deb2b1abbd3c5b6be97a48a27 with SHA-1 11fec376f5 is in history

Change-Id: Iaf788bad10b359f03856d347d387abf3e32f9dfc
2020-04-23 08:47:04 +00:00
Paul Hu
8d8ba81b69 [automerger skipped] Add TetheringCommonTests to CtsTetheringTest am: 11fec376f5 am: 13de869fa6 -s ours am: 8a61481338 -s ours
am skip reason: Change-Id I26c06d522ef2935deb2b1abbd3c5b6be97a48a27 with SHA-1 6f203abeab is in history

Change-Id: I0cea1089b3c06cc70c1f1a499c234a29652bdd37
2020-04-23 08:46:49 +00:00