Merge changes I98573a5c,Ic7394f24 am: 0855a3c457

am: 9567abb46b

Change-Id: I279765199a80b0639dde31302778a95c0f9fd705
This commit is contained in:
Benedict Wong 2019-04-11 10:05:20 -07:00 • committed by android-build-merger
commit 8cb5bb604b
2 changed files with 5 additions and 14 deletions

View file

@ -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;

View file

@ -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");
}