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

Merge "Always startOrMigrate connection when caps change"

Browse Source
This commit is contained in:
Jean Chalard
2023-04-14 03:20:23 +00:00
committed by Gerrit Code Review
parent 52457cc775 e8117f6720
commit 5288559979
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3744,12 +3744,10 @@ public class Vpn {
+ mUnderlyingNetworkCapabilities + " to " + nc); + mUnderlyingNetworkCapabilities + " to " + nc);
final NetworkCapabilities oldNc = mUnderlyingNetworkCapabilities; final NetworkCapabilities oldNc = mUnderlyingNetworkCapabilities;
mUnderlyingNetworkCapabilities = nc; mUnderlyingNetworkCapabilities = nc;
if (oldNc == null) { if (oldNc == null || !nc.getSubscriptionIds().equals(oldNc.getSubscriptionIds())) {
// A new default network is available. // A new default network is available, or the subscription has changed.
// Try to migrate the session, or failing that, start a new one.
startOrMigrateIkeSession(mActiveNetwork); startOrMigrateIkeSession(mActiveNetwork);
} else if (!nc.getSubscriptionIds().equals(oldNc.getSubscriptionIds())) {
// Renew carrierConfig values.
maybeMigrateIkeSessionAndUpdateVpnTransportInfo(mActiveNetwork);
} }
} }