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

Merge "Specify exposed capabilities for VCN gateway connection errors."

Browse Source
This commit is contained in:
Cody Kesting
2021-03-10 02:00:50 +00:00
committed by Gerrit Code Review
parent d36130f759 cdc4d4adae
commit 54a3e52998
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -979,7 +979,7 @@ public class VcnGatewayConnection extends StateMachine {
// IkeSessionCallback.onClosedExceptionally(), which calls sessionClosed()
if (exception != null) {
mGatewayStatusCallback.onGatewayConnectionError(
mConnectionConfig.getRequiredUnderlyingCapabilities(),
mConnectionConfig.getExposedCapabilities(),
VCN_ERROR_CODE_INTERNAL_ERROR,
RuntimeException.class.getName(),
"Received "
@@ -1016,7 +1016,7 @@ public class VcnGatewayConnection extends StateMachine {
}
mGatewayStatusCallback.onGatewayConnectionError(
mConnectionConfig.getRequiredUnderlyingCapabilities(),
mConnectionConfig.getExposedCapabilities(),
errorCode,
exceptionClass,
exceptionMessage);

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

@@ -241,7 +241,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection
verify(mGatewayStatusCallback)
.onGatewayConnectionError(
eq(mConfig.getRequiredUnderlyingCapabilities()),
eq(mConfig.getExposedCapabilities()),
eq(VCN_ERROR_CODE_INTERNAL_ERROR),
any(),
any());
@@ -275,10 +275,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection
verify(mGatewayStatusCallback)
.onGatewayConnectionError(
eq(mConfig.getRequiredUnderlyingCapabilities()),
eq(expectedErrorType),
any(),
any());
eq(mConfig.getExposedCapabilities()), eq(expectedErrorType), any(), any());
}
@Test