From f2edd6477d8e9b13d509e30d4292b79f7c53f6e7 Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Wed, 2 Nov 2022 14:13:42 +0800 Subject: [PATCH] Remove unnecessary permission mock for registerSystemDefaultNetwork registerSystemDefaultNetwork now can be accessed via CONNECTIVITY_USE_RESTRICTED_NETWORKS, there is no need to mock NETWORK_SETTINGS prior to test. Test: atest com.android.server.ConnectivityServiceTest Change-Id: I408094959286f3782496ce7f356f84a6a47c0902 --- .../com/android/server/ConnectivityServiceTest.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index 53cb71c483..1652676f58 100755 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -4974,9 +4974,6 @@ public class ConnectivityServiceTest { @Test public void testRegisterDefaultNetworkCallback() throws Exception { - // NETWORK_SETTINGS is necessary to call registerSystemDefaultNetworkCallback. - mServiceContext.setPermission(NETWORK_SETTINGS, PERMISSION_GRANTED); - final TestNetworkCallback defaultNetworkCallback = new TestNetworkCallback(); mCm.registerDefaultNetworkCallback(defaultNetworkCallback); defaultNetworkCallback.assertNoCallback(); @@ -8077,9 +8074,6 @@ public class ConnectivityServiceTest { @Test public void testVpnNetworkActive() throws Exception { - // NETWORK_SETTINGS is necessary to call registerSystemDefaultNetworkCallback. - mServiceContext.setPermission(NETWORK_SETTINGS, PERMISSION_GRANTED); - final int uid = Process.myUid(); final TestNetworkCallback genericNetworkCallback = new TestNetworkCallback(); @@ -9423,8 +9417,6 @@ public class ConnectivityServiceTest { public void testLegacyLockdownVpn() throws Exception { mServiceContext.setPermission( Manifest.permission.CONTROL_VPN, PERMISSION_GRANTED); - // For LockdownVpnTracker to call registerSystemDefaultNetworkCallback. - mServiceContext.setPermission(NETWORK_SETTINGS, PERMISSION_GRANTED); final NetworkRequest request = new NetworkRequest.Builder().clearCapabilities().build(); final TestNetworkCallback callback = new TestNetworkCallback(); @@ -12924,8 +12916,6 @@ public class ConnectivityServiceTest { throw new IllegalStateException("Default network callbacks already registered"); } - // Using Manifest.permission.NETWORK_SETTINGS for registerSystemDefaultNetworkCallback() - mServiceContext.setPermission(NETWORK_SETTINGS, PERMISSION_GRANTED); mSystemDefaultNetworkCallback = new TestNetworkCallback(); mDefaultNetworkCallback = new TestNetworkCallback(); mProfileDefaultNetworkCallback = new TestNetworkCallback();