aosp/1622675 made handler to be nonnull but
testRequestBackgroundNetwork still pass null as handler when
calling requestBackgroundNetwork, so there is a NullPointerException
when running testRequestBackgroundNetwork.
Bug: 175662146
Test: atest CtsNetTestCases:ConnectivityManagerTest#testRequestBackgroundNetwork
Change-Id: I871992549dfc8cc356221164f1dd49c64f0dae67
The parameter of NetworkCapabilities.setUids() and
NetworkRequest.Builder.setUids() are updated to take a set of
integer Range instead of a set of UidRange because of refactor
work for the incoming connectivity mainline module.
The parameter change stops NetworkRequestTest to work in the
different API levels. Replace the usage with shims to work in
both current and stable APIs.
Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536
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
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)
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
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
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
Merged-In: Ic6bf611ba36b555e4e0bb1bd3fa0053fe29dc8cf
Change-Id: I38fa9eed5915264a53cc70e8f170c003eefe04e2
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
(note the merged-in clause is an unrelated change, used to avoid the
branch)
Merged-In: I8a6d7cf41c4bbc61cee1bb5570cee5bbeb85be49
Change-Id: Ic6bf611ba36b555e4e0bb1bd3fa0053fe29dc8cf
Bug: 167645754
Ignore-AOSP-First: test is already enabled in AOSP
Test: atest CtsNetTestCasesLatestSdk passes on R device
Change-Id: I9677518a6a43bf3195e42ba21291a84846e31f14
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
This currently still builds, but it will stop building as soon
as we make it depend on the networkstack current shims. It should
not be used for anything in mainline-prod anyway, everything uses
CtsNetTestCasesLatestSdk.
The Merged-In clause is from unrelated change aosp/1542627 and is
intended to ensure this change does not propagate to any
downstream branches.
Bug: 167645754
Test: mmm packages/modules/Connectivity
Change-Id: Ib47b181902e8e634f419e5544472859760c2ce77
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
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
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
This is required to build in mainline-prod, which does not have
access to in-progress S APIs.
The Merged-In tag in this CL is from aosp/1604974, which is an
arbitrary CL that is already in sc-dev, with the purpose of
preventing this CL from reaching sc-dev.
Bug: 167645754
Ignore-AOSP-First: need to fix build
Test: m NetworkStack CtsNetTestCasesLatestSdk CtsHostsideNetworkTests CtsHostsideNetworkTestsApp
Change-Id: If40ebfadbf6d3ee86a58a55711fbc146a8599fdb
Merged-In: I5cd32efd0f87c823cd2d0a2fa3a95a83093fb6f9
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
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
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
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
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
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
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
This causes failures in subsequent tests that expect
only one test network to be up.
Bug: 181033598
Test: this
Change-Id: I74444f4aff7750a5bbd2564e5e22714d73c72d8b
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