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

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

Merge "Correct the naming of the variable" into udc-dev am: 92b3d1a6 

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



Change-Id: I3bd290beaf7ba6e0e672a949c4b0629fb6d497e1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f5f0b9ff 92b3d1a6

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

+5 −5
Original line number Diff line number Diff line
@@ -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 + ")");