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

Merge changes from topics "kpFromCarrier", "noNetCapNoMigration" am: ce27c182f0 am: 7e862640b7

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

Change-Id: I4e39fe01097909c1c0f7496eb86faea09225722f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-03-09 12:42:42 +00:00
committed by Automerger Merge Worker
parent 2137519ef9 7e862640b7
commit 13ccbb5c3c
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3302,8 +3302,6 @@ public class Vpn {
mUnderlyingLinkProperties = null; mUnderlyingLinkProperties = null;
mUnderlyingNetworkCapabilities = null; mUnderlyingNetworkCapabilities = null;
mRetryCount = 0; mRetryCount = 0;
startOrMigrateIkeSession(network);
} }
@NonNull @NonNull
@@ -3530,11 +3528,11 @@ public class Vpn {
public void onDefaultNetworkCapabilitiesChanged(@NonNull NetworkCapabilities nc) { public void onDefaultNetworkCapabilitiesChanged(@NonNull NetworkCapabilities nc) {
final NetworkCapabilities oldNc = mUnderlyingNetworkCapabilities; final NetworkCapabilities oldNc = mUnderlyingNetworkCapabilities;
mUnderlyingNetworkCapabilities = nc; mUnderlyingNetworkCapabilities = nc;
// The oldNc may be null when it's not assigned yet. if (oldNc == null) {
final boolean subIdChanged = // A new default network is available.
(oldNc == null) || !nc.getSubscriptionIds().equals(oldNc.getSubscriptionIds()); startOrMigrateIkeSession(mActiveNetwork);
// Update carrierConfig. } else if (!nc.getSubscriptionIds().equals(oldNc.getSubscriptionIds())) {
if (subIdChanged) { // Renew carrierConfig values.
maybeMigrateIkeSession(mActiveNetwork); maybeMigrateIkeSession(mActiveNetwork);
} }
} }