joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Ignore keepalive tests before S and without Tethering module" am: 8438c257fc

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2574971

Change-Id: Id8ec0a23ab072423c45d6883b6dd7175216bc1c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-08 04:00:36 +00:00 • committed by Automerger Merge Worker
commit 36f371dc8c
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View file

@ -1901,6 +1901,9 @@ public class ConnectivityManagerTest {
*/
@AppModeFull(reason = "Cannot get WifiManager in instant app mode")
@Test
// getSupportedKeepalives is available in updatable ConnectivityManager (S+)
// Also, this feature is not mainlined before S, and it's fine to skip on R- devices.
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
@RequiresDevice // Keepalive is not supported on virtual hardware
public void testSocketKeepaliveLimitWifi() throws Exception {
assumeTrue(mPackageManager.hasSystemFeature(FEATURE_WIFI));
@ -1951,6 +1954,9 @@ public class ConnectivityManagerTest {
*/
@AppModeFull(reason = "Cannot request network in instant app mode")
@Test
// getSupportedKeepalives is available in updatable ConnectivityManager (S+)
// Also, this feature is not mainlined before S, and it's fine to skip on R- devices.
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
@RequiresDevice // Keepalive is not supported on virtual hardware
public void testSocketKeepaliveLimitTelephony() throws Exception {
if (!mPackageManager.hasSystemFeature(FEATURE_TELEPHONY)) {
@ -1997,6 +2003,9 @@ public class ConnectivityManagerTest {
*/
@AppModeFull(reason = "Cannot get WifiManager in instant app mode")
@Test
// getSupportedKeepalives is available in updatable ConnectivityManager (S+)
// Also, this feature is not mainlined before S, and it's fine to skip on R- devices.
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
@RequiresDevice // Keepalive is not supported on virtual hardware
public void testSocketKeepaliveUnprivileged() throws Exception {
assumeTrue(mPackageManager.hasSystemFeature(FEATURE_WIFI));