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

VPN: Explicitly handle IAE from updating underlying network

Browse Source 
IpSecTunnelInterface#setUnderlyingNetwork will throw IAE when the
underlying network is not functional and has null LinkProperties.
This commit updates IKEv2 VPN to explicitly handle this exception.

Bug: 240112879
Test: VpnTest, VpnManagerTest, VpnManagerServiceTest, Ikev2VpnTest
Change-Id: I962ee07a5b0e38a07653c25349e41ae47623e7f6
This commit is contained in:
Yan Yan
2023-06-27 23:27:53 +00:00
parent 232000e8b8
commit 2152d88a16
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

@@ -3343,7 +3343,7 @@ public class Vpn {
// Transforms do not need to be persisted; the IkeSession will keep
// them alive for us
mIpSecManager.applyTunnelModeTransform(mTunnelIface, direction, transform);
} catch (IOException e) {
} catch (IOException | IllegalArgumentException e) {
Log.d(TAG, "Transform application failed for token " + token, e);
onSessionLost(token, e);
}
@@ -3437,7 +3437,7 @@ public class Vpn {
mTunnelIface, IpSecManager.DIRECTION_IN, inTransform);
mIpSecManager.applyTunnelModeTransform(
mTunnelIface, IpSecManager.DIRECTION_OUT, outTransform);
} catch (IOException e) {
} catch (IOException | IllegalArgumentException e) {
Log.d(TAG, "Transform application failed for token " + token, e);
onSessionLost(token, e);
}