Commit Graph

2398 Commits

Author SHA1 Message Date
Sudheer Shanka
f3774740d1 Merge "Skipping printing AssumptionViolatedExceptions." am: b94021ab6e am: 188fa60f90 am: 391af8dda0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3858650d6c90212384c982a8d916e622d16f712
2021-03-10 15:44:15 +00:00
Remi NGUYEN VAN
be88fae8a3 Merge "Rename StringNetworkSpecifier to Ethernet" into sc-dev 2021-03-09 22:43:46 +00:00
Remi NGUYEN VAN
dd128f6ea3 Rename StringNetworkSpecifier to Ethernet
Tests just need a specifier to verify general NetworkSpecifier
functionality. They can use EthernetNetworkSpecifier the same way they
use StringNetworkSpecifier.

To keep the tests passing on Q and R, add a CompatUtil class that will
keep creating StringNetworkSpecifiers (now removed) instead.

Bug: 179329291
Test: atest CtsNetTestCases
Ignore-AOSP-First: Must be merged manually downstream first
Change-Id: Ic6bf611ba36b555e4e0bb1bd3fa0053fe29dc8cf
2021-03-09 22:42:51 +00:00
Lorenzo Colitti
86b0a68b2e Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim.
This is required to build in mainline-prod, which does not have
access to in-progress S APIs.

Bug: 167645754
Ignore-AOSP-First: already in AOSP
Test: m NetworkStack CtsNetTestCasesLatestSdk CtsHostsideNetworkTests CtsHostsideNetworkTestsApp
Change-Id: I1f234454e1e5ac4aa4d8828a2fb192c4cd18add9
(cherry picked from commit 7246474dfd)
2021-03-08 12:01:24 +00:00
Sudheer Shanka
c19cd34a35 Skipping printing AssumptionViolatedExceptions.
Right now, if there are any failures along with
the cases where we skip the test, we end up printing
failure exception and all AssumptionViolatedExceptions
which makes it hard to find the actual failures.

Bug: 181686645
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: Ib3f1622fc259ad4966789cfafdc54203c2559471
2021-03-05 09:30:34 +00:00
TreeHugger Robot
fc4ffdb4c5 Merge "Mark the test app as debuggable." into sc-dev 2021-03-04 08:22:33 +00:00
Sudheer Shanka
a723fbd612 Mark the test app as debuggable.
Accessing @TestApis is only allowed for
debuggable APKs on release builds.

Fixes: 181594072
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Ignore-AOSP-First: Related CL http://ag/13615939 is not in AOSP yet.
Change-Id: I7777d70e3dc4217e7eb931060feb658d8943962a
2021-03-04 05:25:30 +00:00
Treehugger Robot
750a7dd0d9 Merge "Make ConnectivityManagerTest use the API shims." am: c8761c98ae am: c7d509804b am: d5821f3c06
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I871cb81b88ec2c02d838a6f0ea33f842a1aa15f6
2021-03-01 20:48:44 +00:00
Lorenzo Colitti
8060dfed23 Make ConnectivityManagerTest use the API shims.
This is required for the code to be identical in AOSP and
mainline-prod.

Bug: 167645754
Test: atest CtsNetTestCases passes on AOSP device
Test: atest CtsNetTestCasesLatestSdk passes on AOSP device
Test: atest CtsNetTestCasesLatestSdk passes on R device
Change-Id: I094906e535d710a46a3fa833b6aa48cb007d6b63
2021-03-01 15:59:40 +09:00
Sudheer Shanka
9326a98dd9 Wait for the finish-component broadcasts to be handled.
Bug: 180533352
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Ignore-AOSP-First: Expedited jobs are not available in AOSP
Change-Id: I564c15c2fd6caba61029f2b282e7a3c3afeca120
2021-02-28 19:01:31 -08:00
Lorenzo Colitti
589d0ad195 Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim.
This is required to build in mainline-prod, which does not have
access to in-progress S APIs.

Bug: 167645754
Test: m NetworkStack CtsNetTestCasesLatestSdk CtsHostsideNetworkTests CtsHostsideNetworkTestsApp
Change-Id: If40ebfadbf6d3ee86a58a55711fbc146a8599fdb
Merged-In: If40ebfadbf6d3ee86a58a55711fbc146a8599fdb
2021-03-01 00:16:36 +09:00
Junyu Lai
7b0fc6f309 Merge "Fix CTS test failed on R device" am: 75d28bee27 am: 3ec8882370 am: 0937250278
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1602480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie091b95fd2dc27f2cd03aa45e316fc5f8af0188b
2021-02-26 11:13:44 +00:00
Junyu Lai
31d4b0a112 Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" am: 3f134a3805 am: b209d3a2a7 am: da1951ace8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597477

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfb07b84b3a6d708241eec5629c8fccc79b712b1
2021-02-26 11:12:21 +00:00
Junyu Lai
0937250278 Merge "Fix CTS test failed on R device" am: 75d28bee27 am: 3ec8882370
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1602480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9003eaba1c2548349904c5281cfaf0089320c56a
2021-02-26 10:01:40 +00:00
Junyu Lai
75d28bee27 Merge "Fix CTS test failed on R device" 2021-02-26 07:17:47 +00:00
Junyu Lai
da1951ace8 Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" am: 3f134a3805 am: b209d3a2a7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597477

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic26361a1b95dcdf6322b086e558a843a645a0a8e
2021-02-26 06:56:59 +00:00
Chalard Jean
41870192e3 Merge "Release test network in a test" am: 26c11595bc am: d3e8ae1f88
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I698d0908daa511b48b387d973fdd8b724a203e75
2021-02-26 06:56:52 +00:00
Lorenzo Colitti
264d8e24bd Revert "Update tests to use Doze DeviceConfig flags."
This change went into internal after R branched, and did not
go to AOSP. Revert it in mainline-prod in order to ensure that
CtsHostsideNetworkTests builds.

These tests are developed in internal, not AOSP, so do not need
to automerge to mainline-prod.

Bug: 167645754
Test: treehugger
Ignore-AOSP-First: needed to sync mainline-prod with AOSP
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
Change-Id: I2b7d9855b81be5ef968a3de72bf9f7e7225075e1
2021-02-26 00:43:57 +09:00
Lorenzo Colitti
9afd779325 Revert "Fix DeviceConfig resetting."
This change went into internal after R branched, and did not
go to AOSP. Revert it in mainline-prod in order to ensure that
CtsHostsideNetworkTests builds.

These tests are developed in internal, not AOSP, so do not need
to automerge to mainline-prod.

Bug: 167645754
Test: treehugger
Ignore-AOSP-First: needed to sync mainline-prod with AOSP
Change-Id: Ieb1f0ce2a69180bbe89f810ddb3b48188ae3530e
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-26 00:43:18 +09:00
Lorenzo Colitti
5de0092e3c Revert "Do not install tethering in TEST_MAPPING"
This reverts commit c2858740c1.

Reason for revert: tethering in mainline-prod should always be
updatable.

Bug: 167645754
Test: treehugger
Ignore-AOSP-First: this change must not go into AOSP
Change-Id: I0e60eb2c4a1a2e8e985c8ff91d343d1255ddf783
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-25 20:42:59 +09:00
Daulet Zhanguzin
ac80a885b0 Use unbundled version of BouncyCastle in Ike cts tests
Since BouncyCastle APIs provided by platform vary, use unbundled
BouncyCastle

Fixes: 180870458
Test: atest CtsNetTestCases
Change-Id: I78c053150bb9cf86173f869dd6e13e9a6917ffa7
Merged-In: I78c053150bb9cf86173f869dd6e13e9a6917ffa7
2021-02-25 20:42:59 +09:00
Lorenzo Colitti
d3d4461f48 Temporarily stop compiling three CTS tests.
This is better than commenting out code because any changes in
AOSP will automerge cleanly. When these tests are fixed by
adding a shim for ConnectivityManager, we can simply revert this
change.

Bug: 167645754
Test: m com.android.tethering
Ignore-AOSP-First: needed to sync mainline-prod with AOSP
Change-Id: I450e2d44870e70ad3b80f1843ff90dbd5cfc4902
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-25 20:42:55 +09:00
Chalard Jean
fb2192f670 Merge "Release test network in a test" am: 26c11595bc am: d3e8ae1f88 am: a1596090db
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96044cf7ee80a2d71114bc357b93001ec2c89df3
2021-02-25 10:22:03 +00:00
Junyu Lai
3f134a3805 Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" 2021-02-25 10:16:03 +00:00
Sudheer Shanka
54c8041ff0 Merge "Update CtsHostsideNetworkTests to take network capability into account." into sc-dev 2021-02-25 09:19:14 +00:00
Daulet Zhanguzin
39ae785e3f Use unbundled version of BouncyCastle in Ike cts tests am: bb540131b7 am: c4f27ccd99 am: f82155f4b9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee67d255b39a153cfa3e02a652291bfe627708f0
2021-02-25 08:49:26 +00:00
Chalard Jean
26c11595bc Merge "Release test network in a test" 2021-02-25 08:06:15 +00:00
Lorenzo Colitti
09074df188 Merge remote-tracking branch 'goog/rvc-qpr-dev-plus-aosp' into merge-sc-dev-plus-aosp-then-rvc-qpr-dev-plus-aosp
This CL merges rvc-qpr-dev-plus-aosp on top of sc-dev-plus-aosp
on top of mainline-prod. It picks up changes that were merged
into aosp/master before sc-dev-plus-aosp was on the path between
AOSP and master. One such very simple CL is aosp/1554765.

There were no merge conflicts.

Current diffstat with aosp/master is:
 97 files changed, 2219 insertions(+), 84 deletions(-)

This includes 1800 lines of translations added in 72 files like
Tethering/res/values-*/strings.xml

Bug: 167645754
Test: no merge conflicts
Test: didn't even try to build
Ignore-AOSP-First: this is a merge from AOSP
Change-Id: I63af0b95e2d0e6bddc217c29014c03ea0dbda6ec
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-25 16:23:06 +09:00
junyulai
d69d7c815c Fix CTS test failed on R device
The test failed since the API is not available on R device.
Add conditions to ignore it.

Test: atest CtsHostsideNetworkTests:com.android.cts.net.HostsideVpnTests
      on R device
Bug: None
Change-Id: I05a1f63adec72e89382cb095db714bccbdff0058
2021-02-25 08:39:28 +08:00
Sudheer Shanka
4a96c79495 Update CtsHostsideNetworkTests to take network capability into account.
Bug: 177641226
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Ignore-AOSP-First: Expedited jobs are not available in AOSP
Change-Id: Ic75ebdc184764b7e7ac02d3e2ca18cbba1c55ee5
2021-02-24 08:00:12 -08:00
Chalard Jean
8a8bf7434c Release test network in a test
This causes failures in subsequent tests that expect
only one test network to be up.

Bug: 181033598
Test: this
Change-Id: I74444f4aff7750a5bbd2564e5e22714d73c72d8b
2021-02-24 23:07:13 +09:00
Daulet Zhanguzin
bb540131b7 Use unbundled version of BouncyCastle in Ike cts tests
Since BouncyCastle APIs provided by platform vary, use unbundled
BouncyCastle

Fixes: 180870458
Test: atest CtsNetTestCases
Change-Id: I78c053150bb9cf86173f869dd6e13e9a6917ffa7
2021-02-24 13:09:36 +00:00
Lorenzo Colitti
a26f72c34d Make the CTS tests explicitly depend on modules-utils-build. am: 2be434ab12 am: 6af777632d am: f6603588ab
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib914dff2e0fe6b94902d53130eefe8bfce7b3a62
2021-02-24 07:39:10 +00:00
Lorenzo Colitti
2be434ab12 Make the CTS tests explicitly depend on modules-utils-build.
In AOSP master and downstream branches, this likely works via a
transitive dependency. In mainline-prod, this doesn't work. Add
the dependency explicitly, since it makes things build everywhere
and in general it's also good practice to "include what you use".

Bug: 167645754
Test: m CtsNetTestCasesLatestSdk in mainline-prod has fewer errors
Change-Id: Ie575372415a806deee9996aab7f920d2c15bff80
2021-02-24 05:43:36 +00:00
Treehugger Robot
f151ba8ad9 Merge "Fix CTS test failed on R device" am: afa18f0256 am: 0919cc06c5 am: d517fa33a0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a60d442ddacc2dd45f0c301578450b76c7a6d51
2021-02-22 13:42:26 +00:00
Treehugger Robot
1ad4ee61fa Merge "Add MUTABLE flag when creating PendingIntent" am: f754671f07 am: ac7587318f am: 1eed01b25c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1598634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0dc53b11897ee902f22eb915a25b476de7870fe
2021-02-22 13:42:02 +00:00
Treehugger Robot
6afc54561b Merge "Fix flaky test by extending timeout" am: 2108eada65 am: e46d5eb40f am: f59622b124
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597473

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0fc94ab8e034d3935f628623ca73f62fbc55533
2021-02-22 11:13:04 +00:00
Treehugger Robot
afa18f0256 Merge "Fix CTS test failed on R device" 2021-02-22 10:37:29 +00:00
Treehugger Robot
f754671f07 Merge "Add MUTABLE flag when creating PendingIntent" 2021-02-22 10:29:31 +00:00
Treehugger Robot
2108eada65 Merge "Fix flaky test by extending timeout" 2021-02-22 07:58:10 +00:00
junyulai
62f5117bfd Add MUTABLE flag when creating PendingIntent
By the new feature introduced in next Android release.
Any PendingIntent needs to be specified about the mutability.

While ConnectivityService would put extra info such as
network or request id before broadcasting the inner intent.
The MUTABLE flag needs to be added accordingly.

Test: this
Fix: 178121691
Change-Id: I87d0efaf51a91556ef9f8e18db38803e4861cfd7
2021-02-22 15:06:32 +08:00
junyulai
e26bbf8032 Fix CTS test failed on R device
The test failed since the API is not available on R device.
Add conditions to ignore it.

Test: atest CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest
Bug: None
Change-Id: I3cbc623a84f7313e1155fe83a44ebef042a04076
2021-02-22 14:26:27 +08:00
junyulai
607985b57f Fix flaky test by extending timeout
The asserted capabilities change callback event took 170ms
in average to fire on cuttlefish, which causes 35% of
flakiness since the event might delay up to 500ms in practice.
Extend to 30s timeout value which is the standard value
of waiting for network callback events in CTS.

This change also ignore the test up to Android R since the API
is not available for R devices or below.

Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork \
      --rerun-until-failure 500
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest
      on R device
Bug: 179694867

Change-Id: Ic5e11d4a4f326150848bc48038fa01cde39f7661
2021-02-22 14:26:05 +08:00
Bob Badour
cfaae9a3b2 Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity" am: f5b346ed1d am: c384c677ef am: a3f610a7b2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1587901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51b1e86a8740ca95a948c1cf1d8bc0bbd48bce88
2021-02-21 19:04:24 +00:00
junyulai
651a95f126 [VCN07.1] Add test for bypassing VCN for non-internet request
This is a re-upload that combines aosp/1550755 and aosp/1579872.

Test: atest NetworkRequestTest#testBypassingVcnForNonInternetRequest
Test: atest CtsNetTestCasesLatestSdk on R device
Bug: 175662146
Change-Id: I2fdc2418339bef30c9f816d63418bba218abf4a1
2021-02-20 19:22:25 +08:00
Bob Badour
f5b346ed1d Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity" 2021-02-19 06:23:22 +00:00
Sudheer Shanka
cc95bc9d32 Merge "Add TEST_MAPPING to run CtsHostsideNetworkTests in presubmit." am: ddcfa071ab am: cccaa598fc am: 970f6836ce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id24816d62219e23f0f0109019f84d79effa8ae11
2021-02-19 03:05:41 +00:00
Sudheer Shanka
ddcfa071ab Merge "Add TEST_MAPPING to run CtsHostsideNetworkTests in presubmit." 2021-02-19 00:33:15 +00:00
Remi NGUYEN VAN
e817bee583 Merge "Deflake CaptivePortalTest mobile data usage" am: 1a16358c36 am: 9b5f78886d am: 0e251f7a8e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1593857

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5cdde3f25901ee56165bd8950ce8bbb428a46dc
2021-02-18 15:48:20 +00:00
Remi NGUYEN VAN
1a16358c36 Merge "Deflake CaptivePortalTest mobile data usage" 2021-02-18 13:11:25 +00:00