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

Commit 710d9416 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Improve the code of handleSessionLost()" am: 4c7e8dc8 

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



Change-Id: I51f0a02cc3f8188c126145e8bb4fcb015e07c8c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d38f81f 4c7e8dc8

services/core/java/com/android/server/connectivity/Vpn.java

+34 −81
Original line number Diff line number Diff line
@@ -3301,8 +3301,13 @@ public class Vpn { 
            cancelHandleNetworkLostTimeout();



            synchronized (Vpn.this) {

                String category = null;

                int errorClass = -1;

                int errorCode = -1;

                if (exception instanceof IkeProtocolException) {

                    final IkeProtocolException ikeException = (IkeProtocolException) exception;

                    category = VpnManager.CATEGORY_EVENT_IKE_ERROR;

                    errorCode = ikeException.getErrorType();



                    switch (ikeException.getErrorType()) {

                        case IkeProtocolException.ERROR_TYPE_NO_PROPOSAL_CHOSEN: // Fallthrough
@@ -3312,106 +3317,54 @@ public class Vpn { 
                        case IkeProtocolException.ERROR_TYPE_FAILED_CP_REQUIRED: // Fallthrough

                        case IkeProtocolException.ERROR_TYPE_TS_UNACCEPTABLE:

                            // All the above failures are configuration errors, and are terminal

                            // TODO(b/230548427): Remove SDK check once VPN related stuff are

                            //  decoupled from ConnectivityServiceTest.

                            if (SdkLevel.isAtLeastT()) {

                                sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_IKE_ERROR,

                                        VpnManager.ERROR_CLASS_NOT_RECOVERABLE,

                                        ikeException.getErrorType(),

                                        getPackage(), mSessionKey, makeVpnProfileStateLocked(),

                                        network,

                                        getRedactedNetworkCapabilitiesOfUnderlyingNetwork(

                                                mUnderlyingNetworkCapabilities),

                                        getRedactedLinkPropertiesOfUnderlyingNetwork(

                                                mUnderlyingLinkProperties));

                            }

                            markFailedAndDisconnect(exception);

                            return;

                            errorClass = VpnManager.ERROR_CLASS_NOT_RECOVERABLE;

                            break;

                        // All other cases possibly recoverable.

                        default:

                            // All the above failures are configuration errors, and are terminal

                            // TODO(b/230548427): Remove SDK check once VPN related stuff are

                            //  decoupled from ConnectivityServiceTest.

                            if (SdkLevel.isAtLeastT()) {

                                sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_IKE_ERROR,

                                        VpnManager.ERROR_CLASS_RECOVERABLE,

                                        ikeException.getErrorType(),

                                        getPackage(), mSessionKey, makeVpnProfileStateLocked(),

                                        network,

                                        getRedactedNetworkCapabilitiesOfUnderlyingNetwork(

                                                mUnderlyingNetworkCapabilities),

                                        getRedactedLinkPropertiesOfUnderlyingNetwork(

                                                mUnderlyingLinkProperties));

                            }

                            errorClass = VpnManager.ERROR_CLASS_RECOVERABLE;

                    }

                } else if (exception instanceof IllegalArgumentException) {

                    // Failed to build IKE/ChildSessionParams; fatal profile configuration error

                    markFailedAndDisconnect(exception);

                    return;

                } else if (exception instanceof IkeNetworkLostException) {

                    // TODO(b/230548427): Remove SDK check once VPN related stuff are

                    //  decoupled from ConnectivityServiceTest.

                    if (SdkLevel.isAtLeastT()) {

                        sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_NETWORK_ERROR,

                                VpnManager.ERROR_CLASS_RECOVERABLE,

                                VpnManager.ERROR_CODE_NETWORK_LOST,

                                getPackage(), mSessionKey, makeVpnProfileStateLocked(),

                                network,

                                getRedactedNetworkCapabilitiesOfUnderlyingNetwork(

                                        mUnderlyingNetworkCapabilities),

                                getRedactedLinkPropertiesOfUnderlyingNetwork(

                                        mUnderlyingLinkProperties));

                    }

                    category = VpnManager.CATEGORY_EVENT_NETWORK_ERROR;

                    errorClass = VpnManager.ERROR_CLASS_RECOVERABLE;

                    errorCode = VpnManager.ERROR_CODE_NETWORK_LOST;

                } else if (exception instanceof IkeNonProtocolException) {

                    category = VpnManager.CATEGORY_EVENT_NETWORK_ERROR;

                    errorClass = VpnManager.ERROR_CLASS_RECOVERABLE;

                    if (exception.getCause() instanceof UnknownHostException) {

                        // TODO(b/230548427): Remove SDK check once VPN related stuff are

                        //  decoupled from ConnectivityServiceTest.

                        if (SdkLevel.isAtLeastT()) {

                            sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_NETWORK_ERROR,

                                    VpnManager.ERROR_CLASS_RECOVERABLE,

                                    VpnManager.ERROR_CODE_NETWORK_UNKNOWN_HOST,

                                    getPackage(), mSessionKey, makeVpnProfileStateLocked(),

                                    network,

                                    getRedactedNetworkCapabilitiesOfUnderlyingNetwork(

                                            mUnderlyingNetworkCapabilities),

                                    getRedactedLinkPropertiesOfUnderlyingNetwork(

                                            mUnderlyingLinkProperties));

                        }

                        errorCode = VpnManager.ERROR_CODE_NETWORK_UNKNOWN_HOST;

                    } else if (exception.getCause() instanceof IkeTimeoutException) {

                        // TODO(b/230548427): Remove SDK check once VPN related stuff are

                        //  decoupled from ConnectivityServiceTest.

                        if (SdkLevel.isAtLeastT()) {

                            sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_NETWORK_ERROR,

                                    VpnManager.ERROR_CLASS_RECOVERABLE,

                                    VpnManager.ERROR_CODE_NETWORK_PROTOCOL_TIMEOUT,

                                    getPackage(), mSessionKey, makeVpnProfileStateLocked(),

                                    network,

                                    getRedactedNetworkCapabilitiesOfUnderlyingNetwork(

                                            mUnderlyingNetworkCapabilities),

                                    getRedactedLinkPropertiesOfUnderlyingNetwork(

                                            mUnderlyingLinkProperties));

                        }

                        errorCode = VpnManager.ERROR_CODE_NETWORK_PROTOCOL_TIMEOUT;

                    } else if (exception.getCause() instanceof IOException) {

                        errorCode = VpnManager.ERROR_CODE_NETWORK_IO;

                    }

                } else if (exception != null) {

                    Log.wtf(TAG, "onSessionLost: exception = " + exception);

                }



                // TODO(b/230548427): Remove SDK check once VPN related stuff are

                //  decoupled from ConnectivityServiceTest.

                        if (SdkLevel.isAtLeastT()) {

                            sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_NETWORK_ERROR,

                                    VpnManager.ERROR_CLASS_RECOVERABLE,

                                    VpnManager.ERROR_CODE_NETWORK_IO,

                if (SdkLevel.isAtLeastT() && category != null) {

                    sendEventToVpnManagerApp(category, errorClass, errorCode,

                            getPackage(), mSessionKey, makeVpnProfileStateLocked(),

                                    network,

                            mActiveNetwork,

                            getRedactedNetworkCapabilitiesOfUnderlyingNetwork(

                                    mUnderlyingNetworkCapabilities),

                            getRedactedLinkPropertiesOfUnderlyingNetwork(

                                    mUnderlyingLinkProperties));

                }

                    }

                } else if (exception != null) {

                    Log.wtf(TAG, "onSessionLost: exception = " + exception);

                }



                if (errorClass == VpnManager.ERROR_CLASS_NOT_RECOVERABLE) {

                    markFailedAndDisconnect(exception);

                    return;

                } else {

                    scheduleRetryNewIkeSession();

                }

            }



            mUnderlyingNetworkCapabilities = null;

            mUnderlyingLinkProperties = null;