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 "[Thread] grant the NEARBY_WIFI_DEVICES permission to Thread tests" into main am: a72fc32e50

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

Change-Id: I5a161009c1d146b44684dc92b4335eefddee5b1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2025-03-21 03:53:55 -07:00 • committed by Automerger Merge Worker
commit fc89769613
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
thread/tests/integration/AndroidManifest.xml
View file

@ -24,6 +24,7 @@
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
<uses-permission android:name="android.permission.THREAD_NETWORK_PRIVILEGED"/>
<uses-permission android:name="android.permission.NETWORK_SETTINGS"/>
<uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" />
<uses-permission android:name="android.permission.INTERNET"/>
<application android:debuggable="true">

8
thread/tests/integration/src/android/net/thread/ThreadIntegrationTest.java
View file

@ -27,6 +27,8 @@ import static android.net.thread.utils.IntegrationTestUtils.waitFor;
import static android.net.thread.utils.ThreadNetworkControllerWrapper.JOIN_TIMEOUT;
import static android.os.SystemClock.elapsedRealtime;
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
import static com.android.compatibility.common.util.SystemUtil.runShellCommandOrThrow;
import static com.android.testutils.TestPermissionUtil.runAsShell;
@ -121,6 +123,12 @@ public class ThreadIntegrationTest {
@Before
public void setUp() throws Exception {
getInstrumentation()
.getUiAutomation()
.grantRuntimePermission(
"com.android.thread.tests.integration",
"android.permission.NEARBY_WIFI_DEVICES");
mExecutor = Executors.newSingleThreadExecutor();
mFtd = new FullThreadDevice(10 /* nodeId */);
mOtCtl = new OtDaemonController();