Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 932438a9 authored by Cody Kesting's avatar Cody Kesting Committed by Automerger Merge Worker
Browse files

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

Merge "Specify exposed capabilities for VCN gateway connection errors." am: 54a3e529 am: 0bfa6b43 am: a5d4be1b am: 58ca793f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9d7d6b9dd5302d067a4dd30672d50f32f9715c9
parents 689423b4 58ca793f

services/core/java/com/android/server/vcn/VcnGatewayConnection.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java

+2 −5
Original line number Diff line number Diff line
@@ -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