commit 6d5c0e714bed41cd07964e425bd8c8645192d461
author Chiachang Wang <chiachangwang@google.com> Mon Oct 26 17:13:09 2020 +0800
committer Chiachang Wang <chiachangwang@google.com> Wed Oct 28 14:38:18 2020 +0800
tree fd1f3a5da279a72d9bfaf7d39d4badb5f2450940
parent 1b7ae75c11fc9a6657caef56290b7ec33cf0ed52

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

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 0d1d2f7..3291e96 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2437,9 +2437,9 @@
 
         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);
         }
     }