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

Commit 52885599 authored by Jean Chalard's avatar Jean Chalard Committed by Gerrit Code Review
Browse files

Merge "Always startOrMigrate connection when caps change"

parents 52457cc7 e8117f67

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

+3 −5
Original line number Diff line number Diff line
@@ -3744,12 +3744,10 @@ public class Vpn { 
                    + mUnderlyingNetworkCapabilities + " to " + nc);

            final NetworkCapabilities oldNc = mUnderlyingNetworkCapabilities;

            mUnderlyingNetworkCapabilities = nc;

            if (oldNc == null) {

                // A new default network is available.

            if (oldNc == null || !nc.getSubscriptionIds().equals(oldNc.getSubscriptionIds())) {

                // 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);

            } else if (!nc.getSubscriptionIds().equals(oldNc.getSubscriptionIds())) {

                // Renew carrierConfig values.

                maybeMigrateIkeSessionAndUpdateVpnTransportInfo(mActiveNetwork);

            }

        }