commit 770e7672107cc9415720eca483a1aa32a601d008
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 02 08:55:28 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 02 08:55:28 2021 +0000
tree 486af011409086d814483b3e7ca2de653ecae904
parent ae0eb0a9a67fbb333898d3f4dfc6eb4d505583ba
parent 6efd0522b68980e1cbe6f3c8fc7899bdd8a20bf1

Merge "Replace checkNetworkStackPermission in TestNetworkService"

services/core/java/com/android/server/TestNetworkService.java

diff --git a/services/core/java/com/android/server/TestNetworkService.java b/services/core/java/com/android/server/TestNetworkService.java
index 3e5c89d..55408ea 100644
--- a/services/core/java/com/android/server/TestNetworkService.java
+++ b/services/core/java/com/android/server/TestNetworkService.java
@@ -32,7 +32,6 @@
 import android.net.NetworkAgentConfig;
 import android.net.NetworkCapabilities;
 import android.net.NetworkProvider;
-import android.net.NetworkStack;
 import android.net.RouteInfo;
 import android.net.StringNetworkSpecifier;
 import android.net.TestNetworkInterface;
@@ -50,6 +49,7 @@
 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;
@@ -320,7 +320,7 @@
         try {
             final long token = Binder.clearCallingIdentity();
             try {
-                NetworkStack.checkNetworkStackPermission(mContext);
+                PermissionUtils.enforceNetworkStackPermission(mContext);
                 NetdUtils.setInterfaceUp(mNetd, iface);
             } finally {
                 Binder.restoreCallingIdentity(token);