Refactor NetworkStackService for testability

Refactor some methods to allow integration testing between
ConnectivityService and NetworkStack. The integration tests override
some NetworkStack methods to mock permission checks or NetworkMonitor
network requests.

Test: atest NetworkStackTests
Change-Id: Ib5b4458f0b4d1423759e1e4016ab961d3ced7b48

1 files changed, 14 insertions, 14 deletions

diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java
index 45bdff3..08a9c5c 100644
--- a/src/android/net/ip/IpClient.java
+++ b/src/android/net/ip/IpClient.java
@@ -19,7 +19,7 @@ package android.net.ip;
 import static android.net.RouteInfo.RTN_UNICAST;
 import static android.net.shared.IpConfigurationParcelableUtil.toStableParcelable;
 
-import static com.android.server.util.PermissionUtil.checkNetworkStackCallingPermission;
+import static com.android.server.util.PermissionUtil.enforceNetworkStackCallingPermission;
 
 import android.annotation.NonNull;
 import android.content.Context;
@@ -515,67 +515,67 @@ public class IpClient extends StateMachine {
     class IpClientConnector extends IIpClient.Stub {
         @Override
         public void completedPreDhcpAction() {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.completedPreDhcpAction();
         }
         @Override
         public void confirmConfiguration() {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.confirmConfiguration();
         }
         @Override
         public void readPacketFilterComplete(byte[] data) {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.readPacketFilterComplete(data);
         }
         @Override
         public void shutdown() {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.shutdown();
         }
         @Override
         public void startProvisioning(ProvisioningConfigurationParcelable req) {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.startProvisioning(ProvisioningConfiguration.fromStableParcelable(req));
         }
         @Override
         public void stop() {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.stop();
         }
         @Override
         public void setL2KeyAndGroupHint(String l2Key, String groupHint) {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.setL2KeyAndGroupHint(l2Key, groupHint);
         }
         @Override
         public void setTcpBufferSizes(String tcpBufferSizes) {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.setTcpBufferSizes(tcpBufferSizes);
         }
         @Override
         public void setHttpProxy(ProxyInfo proxyInfo) {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.setHttpProxy(proxyInfo);
         }
         @Override
         public void setMulticastFilter(boolean enabled) {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.setMulticastFilter(enabled);
         }
         @Override
         public void addKeepalivePacketFilter(int slot, TcpKeepalivePacketDataParcelable pkt) {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.addKeepalivePacketFilter(slot, pkt);
         }
         @Override
         public void addNattKeepalivePacketFilter(int slot, NattKeepalivePacketDataParcelable pkt) {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.addNattKeepalivePacketFilter(slot, pkt);
         }
         @Override
         public void removeKeepalivePacketFilter(int slot) {
-            checkNetworkStackCallingPermission();
+            enforceNetworkStackCallingPermission();
             IpClient.this.removeKeepalivePacketFilter(slot);
         }