From 075432d7c9111a5b11d522a904e1f41777917f83 Mon Sep 17 00:00:00 2001 From: markchien Date: Fri, 7 May 2021 00:30:01 +0800 Subject: [PATCH] Fix some TetheringCoverageTest failure 1. Fix no ACCESS_NETWORK_STATE permission problem when accessing EthernetManager#getAvailableInterfaces API from S. 2. Fix some wrong jarjar rules. Bug: 187371740 Test: atest TetheringCoverageTest on R platform Change-Id: I203db6c4ea2e13d8fb5bc2db7ee877ccbb97b761 --- .../integration/src/android/net/EthernetTetheringTest.java | 3 ++- Tethering/tests/jarjar-rules.txt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java index fe4e696708..de94cba5f5 100644 --- a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java +++ b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java @@ -16,6 +16,7 @@ package android.net; +import static android.Manifest.permission.ACCESS_NETWORK_STATE; import static android.Manifest.permission.MANAGE_TEST_NETWORKS; import static android.Manifest.permission.NETWORK_SETTINGS; import static android.Manifest.permission.TETHER_PRIVILEGED; @@ -121,7 +122,7 @@ public class EthernetTetheringTest { // Needed to create a TestNetworkInterface, to call requestTetheredInterface, and to receive // tethered client callbacks. mUiAutomation.adoptShellPermissionIdentity( - MANAGE_TEST_NETWORKS, NETWORK_SETTINGS, TETHER_PRIVILEGED); + MANAGE_TEST_NETWORKS, NETWORK_SETTINGS, TETHER_PRIVILEGED, ACCESS_NETWORK_STATE); mRunTests = mTm.isTetheringSupported() && mEm != null; assumeTrue(mRunTests); diff --git a/Tethering/tests/jarjar-rules.txt b/Tethering/tests/jarjar-rules.txt index c99ff7f818..9cb143e5aa 100644 --- a/Tethering/tests/jarjar-rules.txt +++ b/Tethering/tests/jarjar-rules.txt @@ -1,8 +1,8 @@ # Don't jar-jar the entire package because this test use some # internal classes (like ArrayUtils in com.android.internal.util) rule com.android.internal.util.BitUtils* com.android.networkstack.tethering.util.BitUtils@1 -rule com.android.internal.util.IndentingPrintWriter.java* com.android.networkstack.tethering.util.IndentingPrintWriter.java@1 -rule com.android.internal.util.IState.java* com.android.networkstack.tethering.util.IState.java@1 +rule com.android.internal.util.IndentingPrintWriter* com.android.networkstack.tethering.util.IndentingPrintWriter@1 +rule com.android.internal.util.IState* com.android.networkstack.tethering.util.IState@1 rule com.android.internal.util.MessageUtils* com.android.networkstack.tethering.util.MessageUtils@1 rule com.android.internal.util.State* com.android.networkstack.tethering.util.State@1 rule com.android.internal.util.StateMachine* com.android.networkstack.tethering.util.StateMachine@1