From 8d39f189d570f5dd382bdc947cee51ea3e1b2fb2 Mon Sep 17 00:00:00 2001
From: Chiachang Wang <chiachangwang@google.com>
Date: Mon, 26 Oct 2020 17:13:09 +0800
Subject: [PATCH] Replace hidden NMS API for setting MTU

Replace the hidden NMS setMtu API with calling INetd directly
for incoming ConnectivityService mainline.

Bug: 170598012
Test: atest FrameworksNetTests
Test: manually connect and disconnect network
Change-Id: I6a51d8033b3354824d4cfb953c2bbe3055d00102
---
 core/java/android/os/INetworkManagementService.aidl   |  5 -----
 .../java/com/android/server/ConnectivityService.java  |  6 +++---
 .../com/android/server/NetworkManagementService.java  | 11 -----------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl
index 856d8bf23820e..3bcef901aa4a2 100644
--- a/core/java/android/os/INetworkManagementService.aidl
+++ b/core/java/android/os/INetworkManagementService.aidl
@@ -116,11 +116,6 @@ interface INetworkManagementService
      */
     void removeRoute(int netId, in RouteInfo route);
 
-    /**
-     * Set the specified MTU size
-     */
-    void setMtu(String iface, int mtu);
-
     /**
      * Shuts down the service
      */
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 0d1d2f7d4a7e8..3291e96f4dc82 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2437,9 +2437,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
 
         try {
             if (VDBG || DDBG) log("Setting MTU size: " + iface + ", " + mtu);
-            mNMS.setMtu(iface, mtu);
-        } catch (Exception e) {
-            Slog.e(TAG, "exception in setMtu()" + e);
+            mNetd.interfaceSetMtu(iface, mtu);
+        } catch (RemoteException | ServiceSpecificException e) {
+            Slog.e(TAG, "exception in interfaceSetMtu()" + e);
         }
     }
 
diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index 58c6780df7af5..dea6c04b4f372 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -944,17 +944,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
         return list;
     }
 
-    @Override
-    public void setMtu(String iface, int mtu) {
-        NetworkStack.checkNetworkStackPermission(mContext);
-
-        try {
-            mNetdService.interfaceSetMtu(iface, mtu);
-        } catch (RemoteException | ServiceSpecificException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
     @Override
     public void shutdown() {
         // TODO: remove from aidl if nobody calls externally