From d6789606d560135b4f29ce82db7a1f09041db089 Mon Sep 17 00:00:00 2001
From: paulhu <paulhu@google.com>
Date: Wed, 15 Sep 2021 16:53:45 +0800
Subject: [PATCH] Stop using NetworkStack#checkNetworkStackPermission*

Replace them with PermissionUtils.enforceNetworkStackPermission*
since those methods are deprecated.

Bug: 177187957
Test: atest EthernetServiceTests
Change-Id: Ifde4a8898439b86e6cc49b7469787bc5e4a91835
---
 .../android/server/ethernet/EthernetServiceImpl.java  | 11 +++++------
 .../com/android/server/ethernet/EthernetTracker.java  |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
index 6b0ce32644..0d4074ea1a 100644
--- a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
+++ b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
@@ -22,16 +22,15 @@ import android.net.IEthernetManager;
 import android.net.IEthernetServiceListener;
 import android.net.ITetheredInterfaceCallback;
 import android.net.IpConfiguration;
-import android.net.NetworkStack;
 import android.os.Binder;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.RemoteException;
-import android.provider.Settings;
 import android.util.Log;
 import android.util.PrintWriterPrinter;
 
 import com.android.internal.util.IndentingPrintWriter;
+import com.android.net.module.util.PermissionUtils;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -115,7 +114,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
             Log.w(TAG, "System isn't ready enough to change ethernet configuration");
         }
 
-        NetworkStack.checkNetworkStackPermission(mContext);
+        PermissionUtils.enforceNetworkStackPermission(mContext);
 
         if (mTracker.isRestrictedInterface(iface)) {
             enforceUseRestrictedNetworksPermission();
@@ -166,7 +165,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
 
     @Override
     public void setIncludeTestInterfaces(boolean include) {
-        NetworkStack.checkNetworkStackPermissionOr(mContext,
+        PermissionUtils.enforceNetworkStackPermissionOr(mContext,
                 android.Manifest.permission.NETWORK_SETTINGS);
         mTracker.setIncludeTestInterfaces(include);
     }
@@ -174,7 +173,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
     @Override
     public void requestTetheredInterface(ITetheredInterfaceCallback callback) {
         Objects.requireNonNull(callback, "callback must not be null");
-        NetworkStack.checkNetworkStackPermissionOr(mContext,
+        PermissionUtils.enforceNetworkStackPermissionOr(mContext,
                 android.Manifest.permission.NETWORK_SETTINGS);
         mTracker.requestTetheredInterface(callback);
     }
@@ -182,7 +181,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
     @Override
     public void releaseTetheredInterface(ITetheredInterfaceCallback callback) {
         Objects.requireNonNull(callback, "callback must not be null");
-        NetworkStack.checkNetworkStackPermissionOr(mContext,
+        PermissionUtils.enforceNetworkStackPermissionOr(mContext,
                 android.Manifest.permission.NETWORK_SETTINGS);
         mTracker.releaseTetheredInterface(callback);
     }
diff --git a/service-t/src/com/android/server/ethernet/EthernetTracker.java b/service-t/src/com/android/server/ethernet/EthernetTracker.java
index b2b60fcb83..d79c7a9dfd 100644
--- a/service-t/src/com/android/server/ethernet/EthernetTracker.java
+++ b/service-t/src/com/android/server/ethernet/EthernetTracker.java
@@ -29,7 +29,6 @@ import android.net.IpConfiguration.IpAssignment;
 import android.net.IpConfiguration.ProxySettings;
 import android.net.LinkAddress;
 import android.net.NetworkCapabilities;
-import android.net.NetworkStack;
 import android.net.StaticIpConfiguration;
 import android.os.Handler;
 import android.os.IBinder;
@@ -45,6 +44,7 @@ import android.net.util.NetdService;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.IndentingPrintWriter;
 import com.android.net.module.util.NetdUtils;
+import com.android.net.module.util.PermissionUtils;
 import com.android.server.net.BaseNetworkObserver;
 
 import java.io.FileDescriptor;
@@ -287,7 +287,7 @@ final class EthernetTracker {
         InterfaceConfiguration config = null;
         // Bring up the interface so we get link status indications.
         try {
-            NetworkStack.checkNetworkStackPermission(mContext);
+            PermissionUtils.enforceNetworkStackPermission(mContext);
             NetdUtils.setInterfaceUp(mNetd, iface);
             config = mNMService.getInterfaceConfig(iface);
         } catch (RemoteException | IllegalStateException e) {