From 4b43c079ff661fb442b160971b6b401b1bb9ed84 Mon Sep 17 00:00:00 2001 From: Yang Sun Date: Mon, 25 Nov 2024 09:58:37 +0800 Subject: [PATCH] Add WRITE_ALLOWLISTED_DEVICE_CONFIG when modifying DeviceConfig Bug: 380648508 Test: atest ThreadNetworkControllerServiceTest Change-Id: I36908316f5eef6a3712c98f5901a5c162db3471c --- .../server/thread/ThreadNetworkControllerServiceTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/thread/tests/unit/src/com/android/server/thread/ThreadNetworkControllerServiceTest.java b/thread/tests/unit/src/com/android/server/thread/ThreadNetworkControllerServiceTest.java index 9af0b53967..dcbb3f51e0 100644 --- a/thread/tests/unit/src/com/android/server/thread/ThreadNetworkControllerServiceTest.java +++ b/thread/tests/unit/src/com/android/server/thread/ThreadNetworkControllerServiceTest.java @@ -17,6 +17,7 @@ package com.android.server.thread; import static android.Manifest.permission.NETWORK_SETTINGS; +import static android.Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG; import static android.Manifest.permission.WRITE_DEVICE_CONFIG; import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN; @@ -266,6 +267,7 @@ public final class ThreadNetworkControllerServiceTest { public void tearDown() throws Exception { runAsShell( WRITE_DEVICE_CONFIG, + WRITE_ALLOWLISTED_DEVICE_CONFIG, () -> DeviceConfig.deleteProperty("thread_network", "TrelFeature__enabled")); } @@ -338,6 +340,7 @@ public final class ThreadNetworkControllerServiceTest { public void initialize_trelFeatureDisabled_trelDisabledAtOtDaemon() throws Exception { runAsShell( WRITE_DEVICE_CONFIG, + WRITE_ALLOWLISTED_DEVICE_CONFIG, () -> DeviceConfig.setProperty( "thread_network", "TrelFeature__enabled", "false", false)); @@ -352,6 +355,7 @@ public final class ThreadNetworkControllerServiceTest { public void initialize_trelFeatureEnabled_setTrelEnabledAtOtDamon() throws Exception { runAsShell( WRITE_DEVICE_CONFIG, + WRITE_ALLOWLISTED_DEVICE_CONFIG, () -> DeviceConfig.setProperty( "thread_network", "TrelFeature__enabled", "true", false));