LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I98573a5c,Ic7394f24

Browse Source 
am: 0855a3c457

Change-Id: I2ffeb6ef1a19f7b2982c3631fe2c040024fb53cb
This commit is contained in:
Benedict Wong
2019-04-10 11:00:10 -07:00
committed by android-build-merger
parent 26174b9b95 0855a3c457
commit 9567abb46b
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/TestNetworkInterface.java
View File

@@ -27,8 +27,6 @@ import android.os.Parcelable;
*/ */
@TestApi @TestApi
public final class TestNetworkInterface implements Parcelable { public final class TestNetworkInterface implements Parcelable {
private static final String TAG = "TestNetworkInterface";
private final ParcelFileDescriptor mFileDescriptor; private final ParcelFileDescriptor mFileDescriptor;
private final String mInterfaceName; private final String mInterfaceName;

5
core/java/android/net/TestNetworkManager.java
View File

@@ -17,7 +17,6 @@ package android.net;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.content.Context;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
@@ -33,11 +32,9 @@ public class TestNetworkManager {
@NonNull private static final String TAG = TestNetworkManager.class.getSimpleName(); @NonNull private static final String TAG = TestNetworkManager.class.getSimpleName();
@NonNull private final ITestNetworkManager mService; @NonNull private final ITestNetworkManager mService;
@NonNull private final Context mContext;
/** @hide */ /** @hide */
public TestNetworkManager(@NonNull Context context, @NonNull ITestNetworkManager service) { public TestNetworkManager(@NonNull ITestNetworkManager service) {
mContext = Preconditions.checkNotNull(context, "missing Context");
mService = Preconditions.checkNotNull(service, "missing ITestNetworkManager"); mService = Preconditions.checkNotNull(service, "missing ITestNetworkManager");
} }

12
services/core/java/com/android/server/TestNetworkService.java
View File

@@ -310,7 +310,7 @@ class TestNetworkService extends ITestNetworkManager.Stub {
public void teardownTestNetwork(int netId) { public void teardownTestNetwork(int netId) {
enforceTestNetworkPermissions(mContext); enforceTestNetworkPermissions(mContext);
TestNetworkAgent agent; final TestNetworkAgent agent;
synchronized (mTestNetworkTracker) { synchronized (mTestNetworkTracker) {
agent = mTestNetworkTracker.get(netId); agent = mTestNetworkTracker.get(netId);
} }
@@ -325,14 +325,10 @@ class TestNetworkService extends ITestNetworkManager.Stub {
agent.teardown(); agent.teardown();
} }
// STOPSHIP: Change this back to android.Manifest.permission.MANAGE_TEST_NETWORKS private static final String PERMISSION_NAME =
private static final String PERMISSION_NAME = "dummy"; android.Manifest.permission.MANAGE_TEST_NETWORKS;
public static void enforceTestNetworkPermissions(@NonNull Context context) { public static void enforceTestNetworkPermissions(@NonNull Context context) {
// STOPSHIP: Re-enable these checks. Disabled until adoptShellPermissionIdentity() can be context.enforceCallingOrSelfPermission(PERMISSION_NAME, "TestNetworkService");
// called from CTS test code.
if (false) {
context.enforceCallingOrSelfPermission(PERMISSION_NAME, "TestNetworkService");
}
} }
} }