drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Trigger revalidation of VCN, underlying networks" am: bd14581e6b am: 4755021eb1 am: 3e2628d028

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

Change-Id: Ic7d85b02a4df497e74f7a4d5273d7d9e2d820afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Benedict Wong 2022-04-01 23:49:30 +00:00 committed by Automerger Merge Worker
commit 986b9fcaf5
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/vcn/VcnGatewayConnection.java
View File

@ -544,6 +544,7 @@ public class VcnGatewayConnection extends StateMachine {
private final boolean mIsMobileDataEnabled; private final boolean mIsMobileDataEnabled;
@NonNull private final IpSecManager mIpSecManager; @NonNull private final IpSecManager mIpSecManager;
@NonNull private final ConnectivityManager mConnectivityManager;
@Nullable private IpSecTunnelInterface mTunnelIface = null; @Nullable private IpSecTunnelInterface mTunnelIface = null;
@ -701,6 +702,7 @@ public class VcnGatewayConnection extends StateMachine {
mLastSnapshot, mLastSnapshot,
mUnderlyingNetworkControllerCallback); mUnderlyingNetworkControllerCallback);
mIpSecManager = mVcnContext.getContext().getSystemService(IpSecManager.class); mIpSecManager = mVcnContext.getContext().getSystemService(IpSecManager.class);
mConnectivityManager = mVcnContext.getContext().getSystemService(ConnectivityManager.class);
addState(mDisconnectedState); addState(mDisconnectedState);
addState(mDisconnectingState); addState(mDisconnectingState);
@ -1683,6 +1685,14 @@ public class VcnGatewayConnection extends StateMachine {
clearFailedAttemptCounterAndSafeModeAlarm(); clearFailedAttemptCounterAndSafeModeAlarm();
break; break;
case NetworkAgent.VALIDATION_STATUS_NOT_VALID: case NetworkAgent.VALIDATION_STATUS_NOT_VALID:
// Trigger re-validation of underlying networks; if it
// fails, the VCN will attempt to migrate away.
if (mUnderlying != null) {
mConnectivityManager.reportNetworkConnectivity(
mUnderlying.network,
false /* hasConnectivity */);
}
// Will only set a new alarm if no safe mode alarm is // Will only set a new alarm if no safe mode alarm is
// currently scheduled. // currently scheduled.
setSafeModeAlarm(); setSafeModeAlarm();
@ -1869,6 +1879,10 @@ public class VcnGatewayConnection extends StateMachine {
IpSecManager.DIRECTION_OUT); IpSecManager.DIRECTION_OUT);
updateNetworkAgent(mTunnelIface, mNetworkAgent, mChildConfig); updateNetworkAgent(mTunnelIface, mNetworkAgent, mChildConfig);
// Trigger re-validation after migration events.
mConnectivityManager.reportNetworkConnectivity(
mNetworkAgent.getNetwork(), false /* hasConnectivity */);
} }
private void handleUnderlyingNetworkChanged(@NonNull Message msg) { private void handleUnderlyingNetworkChanged(@NonNull Message msg) {

6
tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java
View File

@ -252,6 +252,9 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection
&& TEST_TCP_BUFFER_SIZES_2.equals(lp.getTcpBufferSizes()))); && TEST_TCP_BUFFER_SIZES_2.equals(lp.getTcpBufferSizes())));
verify(mNetworkAgent) verify(mNetworkAgent)
.setUnderlyingNetworks(eq(singletonList(TEST_UNDERLYING_NETWORK_RECORD_2.network))); .setUnderlyingNetworks(eq(singletonList(TEST_UNDERLYING_NETWORK_RECORD_2.network)));
// Verify revalidation is triggered on VCN network
verify(mConnMgr).reportNetworkConnectivity(eq(mNetworkAgent.getNetwork()), eq(false));
} }
private void triggerChildOpened() { private void triggerChildOpened() {
@ -425,6 +428,9 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection
triggerValidation(NetworkAgent.VALIDATION_STATUS_NOT_VALID); triggerValidation(NetworkAgent.VALIDATION_STATUS_NOT_VALID);
mTestLooper.dispatchAll(); mTestLooper.dispatchAll();
verify(mConnMgr)
.reportNetworkConnectivity(eq(TEST_UNDERLYING_NETWORK_RECORD_1.network), eq(false));
final ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class); final ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
verify(mDeps, times(2)) verify(mDeps, times(2))
.newWakeupMessage( .newWakeupMessage(