Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace hidden NMS API for setting MTU

Browse Source 
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
This commit is contained in:
Chiachang Wang
2020-10-26 17:13:09 +08:00
parent ffa7b2f12c
commit 8d39f189d5
3 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/os/INetworkManagementService.aidl
View File

@@ -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
*/

6
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -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);
}
}

11
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -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