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

Commit 687d38bf authored by Lucas Lin's avatar Lucas Lin Committed by Android (Google) Code Review
Browse files

Merge "Skip sending VpnManager events for Settings VPNs" into tm-qpr-dev

parents bb9d6126 3912b21c

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

+6 −6
Original line number Diff line number Diff line
@@ -3281,7 +3281,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(),
@@ -3299,7 +3299,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(),
@@ -3318,7 +3318,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,
@@ -3333,7 +3333,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,
@@ -3347,7 +3347,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,
@@ -3361,7 +3361,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,