Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yan Yan
2023-07-17 21:30:09 +00:00
committed by Gerrit Code Review
parent 9add45eefb 2152d88a16
commit a6cf261f85
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -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);
} }