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." am: 54a3e52998 am: 0bfa6b43fa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb5f973c5bfa7bb9a917909ff685b89aa86f6239
This commit is contained in:
Cody Kesting
2021-03-10 04:31:22 +00:00
committed by Automerger Merge Worker
parent 0a07cc6615 0bfa6b43fa
commit a5d4be1bdd
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() // IkeSessionCallback.onClosedExceptionally(), which calls sessionClosed()
if (exception != null) { if (exception != null) {
mGatewayStatusCallback.onGatewayConnectionError( mGatewayStatusCallback.onGatewayConnectionError(
mConnectionConfig.getRequiredUnderlyingCapabilities(), mConnectionConfig.getExposedCapabilities(),
VCN_ERROR_CODE_INTERNAL_ERROR, VCN_ERROR_CODE_INTERNAL_ERROR,
RuntimeException.class.getName(), RuntimeException.class.getName(),
"Received " "Received "
@@ -1016,7 +1016,7 @@ public class VcnGatewayConnection extends StateMachine {
} }
mGatewayStatusCallback.onGatewayConnectionError( mGatewayStatusCallback.onGatewayConnectionError(
mConnectionConfig.getRequiredUnderlyingCapabilities(), mConnectionConfig.getExposedCapabilities(),
errorCode, errorCode,
exceptionClass, exceptionClass,
exceptionMessage); exceptionMessage);

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

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