diff --git a/service/src/com/android/server/TestNetworkService.java b/service/src/com/android/server/TestNetworkService.java index 09873f4db0..fffd2be35e 100644 --- a/service/src/com/android/server/TestNetworkService.java +++ b/service/src/com/android/server/TestNetworkService.java @@ -48,7 +48,6 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.net.module.util.NetdUtils; import com.android.net.module.util.NetworkStackConstants; -import com.android.net.module.util.PermissionUtils; import java.io.UncheckedIOException; import java.net.Inet4Address; @@ -123,6 +122,8 @@ class TestNetworkService extends ITestNetworkManager.Stub { addr.getPrefixLength()); } + NetdUtils.setInterfaceUp(mNetd, iface); + return new TestNetworkInterface(tunIntf, iface); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -324,14 +325,6 @@ class TestNetworkService extends ITestNetworkManager.Stub { } try { - final long token = Binder.clearCallingIdentity(); - try { - PermissionUtils.enforceNetworkStackPermission(mContext); - NetdUtils.setInterfaceUp(mNetd, iface); - } finally { - Binder.restoreCallingIdentity(token); - } - // Synchronize all accesses to mTestNetworkTracker to prevent the case where: // 1. TestNetworkAgent successfully binds to death of binder // 2. Before it is added to the mTestNetworkTracker, binder dies, binderDied() is called