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

Commit cf4d533a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [19415033] into tm-d1-release. 

Change-Id: I28060188d28fec50f926e95e6144d925f6cf2a25
parents f600ab43 ff1c6735

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

+6 −6
Original line number Diff line number Diff line
@@ -2944,7 +2944,7 @@ public class Vpn { 
                            // 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()) {

                            if (SdkLevel.isAtLeastT() && isVpnApp(mPackage)) {

                                sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_IKE_ERROR,

                                        VpnManager.ERROR_CLASS_NOT_RECOVERABLE,

                                        ikeException.getErrorType(),
@@ -2962,7 +2962,7 @@ public class Vpn { 
                            // 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()) {

                            if (SdkLevel.isAtLeastT() && isVpnApp(mPackage)) {

                                sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_IKE_ERROR,

                                        VpnManager.ERROR_CLASS_RECOVERABLE,

                                        ikeException.getErrorType(),
@@ -2981,7 +2981,7 @@ public class Vpn { 
                } else if (exception instanceof IkeNetworkLostException) {

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

                    //  decoupled from ConnectivityServiceTest.

                    if (SdkLevel.isAtLeastT()) {

                    if (SdkLevel.isAtLeastT() && isVpnApp(mPackage)) {

                        sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_NETWORK_ERROR,

                                VpnManager.ERROR_CLASS_RECOVERABLE,

                                VpnManager.ERROR_CODE_NETWORK_LOST,
@@ -2996,7 +2996,7 @@ public class Vpn { 
                    if (exception.getCause() instanceof UnknownHostException) {

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

                        //  decoupled from ConnectivityServiceTest.

                        if (SdkLevel.isAtLeastT()) {

                        if (SdkLevel.isAtLeastT() && isVpnApp(mPackage)) {

                            sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_NETWORK_ERROR,

                                    VpnManager.ERROR_CLASS_RECOVERABLE,

                                    VpnManager.ERROR_CODE_NETWORK_UNKNOWN_HOST,
@@ -3010,7 +3010,7 @@ public class Vpn { 
                    } else if (exception.getCause() instanceof IkeTimeoutException) {

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

                        //  decoupled from ConnectivityServiceTest.

                        if (SdkLevel.isAtLeastT()) {

                        if (SdkLevel.isAtLeastT() && isVpnApp(mPackage)) {

                            sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_NETWORK_ERROR,

                                    VpnManager.ERROR_CLASS_RECOVERABLE,

                                    VpnManager.ERROR_CODE_NETWORK_PROTOCOL_TIMEOUT,
@@ -3024,7 +3024,7 @@ public class Vpn { 
                    } else if (exception.getCause() instanceof IOException) {

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

                        //  decoupled from ConnectivityServiceTest.

                        if (SdkLevel.isAtLeastT()) {

                        if (SdkLevel.isAtLeastT() && isVpnApp(mPackage)) {

                            sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_NETWORK_ERROR,

                                    VpnManager.ERROR_CLASS_RECOVERABLE,

                                    VpnManager.ERROR_CODE_NETWORK_IO,