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

Merge "Correct the naming of the variable" am: 1d896eeeb8

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

Change-Id: Iab65b6b0d2e4bcbfdc0b41a984a862db4696be28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-05-02 08:42:47 +00:00
committed by Automerger Merge Worker
parent 6fe2b44faa 1d896eeeb8
commit 05a1914677
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -456,22 +456,22 @@ public class Vpn {
private static class CarrierConfigInfo {
public final String mccMnc;
public final int keepaliveDelayMs;
public final int keepaliveDelaySec;
public final int encapType;
public final int ipVersion;
CarrierConfigInfo(String mccMnc, int keepaliveDelayMs,
CarrierConfigInfo(String mccMnc, int keepaliveDelaySec,
int encapType,
int ipVersion) {
this.mccMnc = mccMnc;
this.keepaliveDelayMs = keepaliveDelayMs;
this.keepaliveDelaySec = keepaliveDelaySec;
this.encapType = encapType;
this.ipVersion = ipVersion;
}
@Override
public String toString() {
return "CarrierConfigInfo(" + mccMnc + ") [keepaliveDelayMs=" + keepaliveDelayMs
return "CarrierConfigInfo(" + mccMnc + ") [keepaliveDelaySec=" + keepaliveDelaySec
+ ", encapType=" + encapType + ", ipVersion=" + ipVersion + "]";
}
}
@@ -3603,7 +3603,7 @@ public class Vpn {
}
final CarrierConfigInfo carrierconfig = getCarrierConfigForUnderlyingNetwork();
final int nattKeepaliveSec = (carrierconfig != null)
? carrierconfig.keepaliveDelayMs : AUTOMATIC_KEEPALIVE_DELAY_SECONDS;
? carrierconfig.keepaliveDelaySec : AUTOMATIC_KEEPALIVE_DELAY_SECONDS;
if (carrierconfig != null) {
Log.d(TAG, "Get customized keepalive (" + nattKeepaliveSec + "s) on SIM (mccmnc="
+ carrierconfig.mccMnc + ")");