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

Merge changes I6a51d803,I162fae5c

Browse Source 
* changes:
  Replace hidden NMS API for setting MTU
  Replace hidden NMS default network configuration API
This commit is contained in:
Chiachang Wang
2020-10-29 05:03:43 +00:00
committed by Gerrit Code Review
parent 2a40529747 8d39f189d5
commit b524e17519
4 changed files with 13 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,11 +116,6 @@ interface INetworkManagementService
*/ */
void removeRoute(int netId, in RouteInfo route); void removeRoute(int netId, in RouteInfo route);
/**
* Set the specified MTU size
*/
void setMtu(String iface, int mtu);
/** /**
* Shuts down the service * Shuts down the service
*/ */
@@ -352,9 +347,6 @@ interface INetworkManagementService
void addLegacyRouteForNetId(int netId, in RouteInfo routeInfo, int uid); void addLegacyRouteForNetId(int netId, in RouteInfo routeInfo, int uid);
void setDefaultNetId(int netId);
void clearDefaultNetId();
/** /**
* Set permission for a network. * Set permission for a network.
* @param permission PERMISSION_NONE to clear permissions. * @param permission PERMISSION_NONE to clear permissions.

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

@@ -2431,9 +2431,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
try { try {
if (VDBG || DDBG) log("Setting MTU size: " + iface + ", " + mtu); if (VDBG || DDBG) log("Setting MTU size: " + iface + ", " + mtu);
mNMS.setMtu(iface, mtu); mNetd.interfaceSetMtu(iface, mtu);
} catch (Exception e) { } catch (RemoteException | ServiceSpecificException e) {
Slog.e(TAG, "exception in setMtu()" + e); Slog.e(TAG, "exception in interfaceSetMtu()" + e);
} }
} }
@@ -6700,11 +6700,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
try { try {
if (null != newNetwork) { if (null != newNetwork) {
mNMS.setDefaultNetId(newNetwork.network.netId); mNetd.networkSetDefault(newNetwork.network.netId);
} else { } else {
mNMS.clearDefaultNetId(); mNetd.networkClearDefault();
} }
} catch (Exception e) { } catch (RemoteException | ServiceSpecificException e) {
loge("Exception setting default network :" + e); loge("Exception setting default network :" + e);
} }

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

@@ -944,17 +944,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
return list; 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 @Override
public void shutdown() { public void shutdown() {
// TODO: remove from aidl if nobody calls externally // TODO: remove from aidl if nobody calls externally
@@ -2019,28 +2008,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
} }
} }
@Override
public void setDefaultNetId(int netId) {
NetworkStack.checkNetworkStackPermission(mContext);
try {
mNetdService.networkSetDefault(netId);
} catch (RemoteException | ServiceSpecificException e) {
throw new IllegalStateException(e);
}
}
@Override
public void clearDefaultNetId() {
NetworkStack.checkNetworkStackPermission(mContext);
try {
mNetdService.networkClearDefault();
} catch (RemoteException | ServiceSpecificException e) {
throw new IllegalStateException(e);
}
}
@Override @Override
public void setNetworkPermission(int netId, int permission) { public void setNetworkPermission(int netId, int permission) {
NetworkStack.checkNetworkStackPermission(mContext); NetworkStack.checkNetworkStackPermission(mContext);

14
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -6023,23 +6023,23 @@ public class ConnectivityServiceTest {
mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR); mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);
mCellNetworkAgent.connect(true); mCellNetworkAgent.connect(true);
trustedCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent); trustedCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent);
verify(mNetworkManagementService).setDefaultNetId(eq(mCellNetworkAgent.getNetwork().netId)); verify(mMockNetd).networkSetDefault(eq(mCellNetworkAgent.getNetwork().netId));
reset(mNetworkManagementService); reset(mMockNetd);
mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI); mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI);
mWiFiNetworkAgent.connect(true); mWiFiNetworkAgent.connect(true);
trustedCallback.expectAvailableDoubleValidatedCallbacks(mWiFiNetworkAgent); trustedCallback.expectAvailableDoubleValidatedCallbacks(mWiFiNetworkAgent);
verify(mNetworkManagementService).setDefaultNetId(eq(mWiFiNetworkAgent.getNetwork().netId)); verify(mMockNetd).networkSetDefault(eq(mWiFiNetworkAgent.getNetwork().netId));
reset(mNetworkManagementService); reset(mMockNetd);
mWiFiNetworkAgent.removeCapability(NET_CAPABILITY_TRUSTED); mWiFiNetworkAgent.removeCapability(NET_CAPABILITY_TRUSTED);
trustedCallback.expectAvailableCallbacksValidated(mCellNetworkAgent); trustedCallback.expectAvailableCallbacksValidated(mCellNetworkAgent);
verify(mNetworkManagementService).setDefaultNetId(eq(mCellNetworkAgent.getNetwork().netId)); verify(mMockNetd).networkSetDefault(eq(mCellNetworkAgent.getNetwork().netId));
reset(mNetworkManagementService); reset(mMockNetd);
mCellNetworkAgent.removeCapability(NET_CAPABILITY_TRUSTED); mCellNetworkAgent.removeCapability(NET_CAPABILITY_TRUSTED);
trustedCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); trustedCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);
verify(mNetworkManagementService).clearDefaultNetId(); verify(mMockNetd).networkClearDefault();
mCm.unregisterNetworkCallback(trustedCallback); mCm.unregisterNetworkCallback(trustedCallback);
} }