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

Commit bc816c40 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge changes from topics "kpFromCarrier", "noNetCapNoMigration" am:... 

Merge changes from topics "kpFromCarrier", "noNetCapNoMigration" am: ce27c182 am: 7e862640 am: 13ccbb5c am: 26aa79f2

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



Change-Id: Ie45ea2a070b7015d75748ab701e6b0ca9bea9a8c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1764855 26aa79f2

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

+5 −7
Original line number Diff line number Diff line
@@ -3302,8 +3302,6 @@ public class Vpn { 
            mUnderlyingLinkProperties = null;

            mUnderlyingNetworkCapabilities = null;

            mRetryCount = 0;



            startOrMigrateIkeSession(network);

        }



        @NonNull
@@ -3530,11 +3528,11 @@ public class Vpn { 
        public void onDefaultNetworkCapabilitiesChanged(@NonNull NetworkCapabilities nc) {

            final NetworkCapabilities oldNc = mUnderlyingNetworkCapabilities;

            mUnderlyingNetworkCapabilities = nc;

            // The oldNc may be null when it's not assigned yet.

            final boolean subIdChanged =

                    (oldNc == null) || !nc.getSubscriptionIds().equals(oldNc.getSubscriptionIds());

            // Update carrierConfig.

            if (subIdChanged) {

            if (oldNc == null) {

                // A new default network is available.

                startOrMigrateIkeSession(mActiveNetwork);

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

                // Renew carrierConfig values.

                maybeMigrateIkeSession(mActiveNetwork);

            }

        }