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

Commit 6ae4584b authored by Jean Chalard's avatar Jean Chalard Committed by Automerger Merge Worker
Browse files

Merge "Always startOrMigrate connection when caps change" am: 52885599 am: 38904b15 

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



Change-Id: I8ff523996249135b3df4c991d9d2bff7de8551b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9fd820f 38904b15

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -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);

            }

            }

        }

        }