From 8856354a8a42711a23046bb3ef4a94f574e23790 Mon Sep 17 00:00:00 2001 From: Benedict Wong Date: Tue, 12 Mar 2019 21:54:16 -0700 Subject: [PATCH 1/2] Cleanup of Test Network service This follow-up change performs some cleanup changes without affecting functionality Bug: 72950854 Test: Compiles, CTS tests using this pass Change-Id: Ic7394f24f11d713c9374b438182e29d2a02ea236 --- core/java/android/net/TestNetworkInterface.java | 2 -- core/java/android/net/TestNetworkManager.java | 5 +---- .../core/java/com/android/server/TestNetworkService.java | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/java/android/net/TestNetworkInterface.java b/core/java/android/net/TestNetworkInterface.java index 30e68f5b98..84550834be 100644 --- a/core/java/android/net/TestNetworkInterface.java +++ b/core/java/android/net/TestNetworkInterface.java @@ -27,8 +27,6 @@ import android.os.Parcelable; */ @TestApi public final class TestNetworkInterface implements Parcelable { - private static final String TAG = "TestNetworkInterface"; - private final ParcelFileDescriptor mFileDescriptor; private final String mInterfaceName; diff --git a/core/java/android/net/TestNetworkManager.java b/core/java/android/net/TestNetworkManager.java index cd58e6641e..cfda460474 100644 --- a/core/java/android/net/TestNetworkManager.java +++ b/core/java/android/net/TestNetworkManager.java @@ -17,7 +17,6 @@ package android.net; import android.annotation.NonNull; import android.annotation.TestApi; -import android.content.Context; import android.os.IBinder; import android.os.RemoteException; @@ -33,11 +32,9 @@ public class TestNetworkManager { @NonNull private static final String TAG = TestNetworkManager.class.getSimpleName(); @NonNull private final ITestNetworkManager mService; - @NonNull private final Context mContext; /** @hide */ - public TestNetworkManager(@NonNull Context context, @NonNull ITestNetworkManager service) { - mContext = Preconditions.checkNotNull(context, "missing Context"); + public TestNetworkManager(@NonNull ITestNetworkManager service) { mService = Preconditions.checkNotNull(service, "missing ITestNetworkManager"); } diff --git a/services/core/java/com/android/server/TestNetworkService.java b/services/core/java/com/android/server/TestNetworkService.java index e64ab78d1e..8997d8c3e5 100644 --- a/services/core/java/com/android/server/TestNetworkService.java +++ b/services/core/java/com/android/server/TestNetworkService.java @@ -310,7 +310,7 @@ class TestNetworkService extends ITestNetworkManager.Stub { public void teardownTestNetwork(int netId) { enforceTestNetworkPermissions(mContext); - TestNetworkAgent agent; + final TestNetworkAgent agent; synchronized (mTestNetworkTracker) { agent = mTestNetworkTracker.get(netId); } From ff9d0bab2c59d979984e5bfe4778f87055e21e5c Mon Sep 17 00:00:00 2001 From: Benedict Wong Date: Tue, 9 Apr 2019 16:29:43 -0700 Subject: [PATCH 2/2] Enable checks for MANAGE_TEST_NETWORKS in TestNetworkService This commit re-enables enforcement of the MANAGE_TEST_NETWORK permission, which is only granted to the shell. CTS tests using this permission should use UiAutomation.adoptShellPermissionIdentity() to gain access. Bug: 72950854 Test: IPsec CTS tests using this passing Change-Id: I98573a5c68e45abbbaddef01f6ac74a6a18e26f9 --- .../java/com/android/server/TestNetworkService.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/TestNetworkService.java b/services/core/java/com/android/server/TestNetworkService.java index 8997d8c3e5..bd20a24468 100644 --- a/services/core/java/com/android/server/TestNetworkService.java +++ b/services/core/java/com/android/server/TestNetworkService.java @@ -325,14 +325,10 @@ class TestNetworkService extends ITestNetworkManager.Stub { agent.teardown(); } - // STOPSHIP: Change this back to android.Manifest.permission.MANAGE_TEST_NETWORKS - private static final String PERMISSION_NAME = "dummy"; + private static final String PERMISSION_NAME = + android.Manifest.permission.MANAGE_TEST_NETWORKS; public static void enforceTestNetworkPermissions(@NonNull Context context) { - // STOPSHIP: Re-enable these checks. Disabled until adoptShellPermissionIdentity() can be - // called from CTS test code. - if (false) { - context.enforceCallingOrSelfPermission(PERMISSION_NAME, "TestNetworkService"); - } + context.enforceCallingOrSelfPermission(PERMISSION_NAME, "TestNetworkService"); } }