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

Correct the naming of the variable

Browse Source 
Test: atest FrameworksNetTests
Bug: 269714970
(cherry picked from https://android-review.googlesource.com/q/commit:7577245b94488d0f192cb8ca054d2933985ddca2)
Merged-In: If65e0ce229983a0b84fe3ad63710e18f76c3be17
Change-Id: If65e0ce229983a0b84fe3ad63710e18f76c3be17
This commit is contained in:
chiachangwang
2023-04-21 08:42:26 +00:00
committed by Chiachang Wang
parent 6a9342d76f
commit f86a2b809a
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 { private static class CarrierConfigInfo {
public final String mccMnc; public final String mccMnc;
public final int keepaliveDelayMs; public final int keepaliveDelaySec;
public final int encapType; public final int encapType;
public final int ipVersion; public final int ipVersion;
CarrierConfigInfo(String mccMnc, int keepaliveDelayMs, CarrierConfigInfo(String mccMnc, int keepaliveDelaySec,
int encapType, int encapType,
int ipVersion) { int ipVersion) {
this.mccMnc = mccMnc; this.mccMnc = mccMnc;
this.keepaliveDelayMs = keepaliveDelayMs; this.keepaliveDelaySec = keepaliveDelaySec;
this.encapType = encapType; this.encapType = encapType;
this.ipVersion = ipVersion; this.ipVersion = ipVersion;
} }
@Override @Override
public String toString() { public String toString() {
return "CarrierConfigInfo(" + mccMnc + ") [keepaliveDelayMs=" + keepaliveDelayMs return "CarrierConfigInfo(" + mccMnc + ") [keepaliveDelaySec=" + keepaliveDelaySec
+ ", encapType=" + encapType + ", ipVersion=" + ipVersion + "]"; + ", encapType=" + encapType + ", ipVersion=" + ipVersion + "]";
} }
} }
@@ -3603,7 +3603,7 @@ public class Vpn {
} }
final CarrierConfigInfo carrierconfig = getCarrierConfigForUnderlyingNetwork(); final CarrierConfigInfo carrierconfig = getCarrierConfigForUnderlyingNetwork();
final int nattKeepaliveSec = (carrierconfig != null) final int nattKeepaliveSec = (carrierconfig != null)
? carrierconfig.keepaliveDelayMs : AUTOMATIC_KEEPALIVE_DELAY_SECONDS; ? carrierconfig.keepaliveDelaySec : AUTOMATIC_KEEPALIVE_DELAY_SECONDS;
if (carrierconfig != null) { if (carrierconfig != null) {
Log.d(TAG, "Get customized keepalive (" + nattKeepaliveSec + "s) on SIM (mccmnc=" Log.d(TAG, "Get customized keepalive (" + nattKeepaliveSec + "s) on SIM (mccmnc="
+ carrierconfig.mccMnc + ")"); + carrierconfig.mccMnc + ")");