joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge changes I6a51d803,I162fae5c am: b75c584971 am: 18013cefe3

Browse source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473228

Change-Id: I61cdda413fe21a46ac075a0abba2b9affa015149
This commit is contained in:
Chiachang Wang 2020-10-29 05:52:33 +00:00 • committed by Automerger Merge Worker
commit 2d6e0ab8e7
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2431,9 +2431,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);
}
}
@ -6700,11 +6700,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
try {
if (null != newNetwork) {
mNMS.setDefaultNetId(newNetwork.network.netId);
mNetd.networkSetDefault(newNetwork.network.netId);
} else {
mNMS.clearDefaultNetId();
mNetd.networkClearDefault();
}
} catch (Exception e) {
} catch (RemoteException | ServiceSpecificException e) {
loge("Exception setting default network :" + e);
}

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

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