From 8fbadf4ac5a562ff00f5f97e339934d1c063411a Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Tue, 24 Aug 2021 15:13:12 +0900 Subject: [PATCH] Give EthernetTetheringTest the restricted networks permission. This test fails on devices where physical Ethernet interfaces are available but marked restricted, like cuttlefish. Bug: 197462993 Test: test-only change Change-Id: I15c991b2e43e2d5e823dcdcfbd74adfd9b2f6f08 --- .../src/android/net/EthernetTetheringTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java index f1ddc6dffa..26297a22f8 100644 --- a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java +++ b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java @@ -17,6 +17,7 @@ package android.net; import static android.Manifest.permission.ACCESS_NETWORK_STATE; +import static android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS; import static android.Manifest.permission.MANAGE_TEST_NETWORKS; import static android.Manifest.permission.NETWORK_SETTINGS; import static android.Manifest.permission.TETHER_PRIVILEGED; @@ -121,9 +122,12 @@ public class EthernetTetheringTest { @Before public void setUp() throws Exception { // Needed to create a TestNetworkInterface, to call requestTetheredInterface, and to receive - // tethered client callbacks. + // tethered client callbacks. The restricted networks permission is needed to ensure that + // EthernetManager#isAvailable will correctly return true on devices where Ethernet is + // marked restricted, like cuttlefish. mUiAutomation.adoptShellPermissionIdentity( - MANAGE_TEST_NETWORKS, NETWORK_SETTINGS, TETHER_PRIVILEGED, ACCESS_NETWORK_STATE); + MANAGE_TEST_NETWORKS, NETWORK_SETTINGS, TETHER_PRIVILEGED, ACCESS_NETWORK_STATE, + CONNECTIVITY_USE_RESTRICTED_NETWORKS); mRunTests = mTm.isTetheringSupported() && mEm != null; assumeTrue(mRunTests);