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

Commit edf258ad authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "VPN: Explicitly handle IAE from updating underlying network" into main... 

Merge "VPN: Explicitly handle IAE from updating underlying network" into main am: a6cf261f am: 12af8505

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



Change-Id: I14e0b6e8a46c68ccf76a224e61ea0a8c3768108b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45ea8d3e 12af8505

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -3346,7 +3346,7 @@ public class Vpn { 
                // Transforms do not need to be persisted; the IkeSession will keep

                // Transforms do not need to be persisted; the IkeSession will keep

                // them alive for us

                // them alive for us

                mIpSecManager.applyTunnelModeTransform(mTunnelIface, direction, transform);

                mIpSecManager.applyTunnelModeTransform(mTunnelIface, direction, transform);

            } catch (IOException e) {

            } catch (IOException | IllegalArgumentException e) {

                Log.d(TAG, "Transform application failed for token " + token, e);

                Log.d(TAG, "Transform application failed for token " + token, e);

                onSessionLost(token, e);

                onSessionLost(token, e);

            }

            }
@@ -3440,7 +3440,7 @@ public class Vpn { 
                        mTunnelIface, IpSecManager.DIRECTION_IN, inTransform);

                        mTunnelIface, IpSecManager.DIRECTION_IN, inTransform);

                mIpSecManager.applyTunnelModeTransform(

                mIpSecManager.applyTunnelModeTransform(

                        mTunnelIface, IpSecManager.DIRECTION_OUT, outTransform);

                        mTunnelIface, IpSecManager.DIRECTION_OUT, outTransform);

            } catch (IOException e) {

            } catch (IOException | IllegalArgumentException e) {

                Log.d(TAG, "Transform application failed for token " + token, e);

                Log.d(TAG, "Transform application failed for token " + token, e);

                onSessionLost(token, e);

                onSessionLost(token, e);

            }

            }