LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace hidden NMS default network configuration API

Browse Source 
Replace the hidden setDefaultNetId and clearDefaultNetId NMS
APIs with accessing INetd directly for the incoming
ConnectivityService mainline.

Bug: 170598012
Test: atest FrameworksNetTests
Test: manually connect and disconnect wifi
Change-Id: I162fae5ca444207a037e5ac4bf8fa0a77a648ca1
This commit is contained in:
Chiachang Wang
2020-10-26 15:12:12 +08:00
parent f83a718af1
commit 1b7ae75c11
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6708,11 +6708,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);
} }

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

@@ -6021,23 +6021,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);
} }