diff options
| author | Cody Kesting <ckesting@google.com> | 2021-03-10 02:00:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-10 02:00:50 +0000 |
| commit | 54a3e529986904e77314cf8b729e7acccbfb629b (patch) | |
| tree | 5fbd1b767ca2ae9b4c80e1cdd7840068d9733f2c | |
| parent | d36130f7592d68284e0e48d9a735faf5896d011c (diff) | |
| parent | cdc4d4adaee0ce3c317357f6aa2f952d3a158c2f (diff) | |
Merge "Specify exposed capabilities for VCN gateway connection errors."
| -rw-r--r-- | services/core/java/com/android/server/vcn/VcnGatewayConnection.java | 4 | ||||
| -rw-r--r-- | tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java index 6bc9978a0731..15429f455d6e 100644 --- a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java +++ b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java @@ -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); diff --git a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java index 69b2fb135a8d..4bf849111a5d 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java @@ -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 |