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

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

Merge "Use PersistableBundle.getInt(String, int) with default value parameter"... 

Merge "Use PersistableBundle.getInt(String, int) with default value parameter" am: a4bef297 am: ea0a395b am: 585c520f am: 8caf5cad

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



Change-Id: I0a35f88f266709fb465855a467cf6796ded75387
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 19defcde 8caf5cad

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

+5 −3
Original line number Diff line number Diff line
@@ -309,6 +309,8 @@ public class Vpn { 
     */

    @VisibleForTesting

    static final int DEFAULT_LONG_LIVED_TCP_CONNS_EXPENSIVE_TIMEOUT_SEC = 60;



    private static final int PREFERRED_IKE_PROTOCOL_UNKNOWN = -1;

    /**

     *  Prefer using {@link IkeSessionParams.ESP_IP_VERSION_AUTO} and

     *  {@link IkeSessionParams.ESP_ENCAP_TYPE_AUTO} for ESP packets.
@@ -3643,11 +3645,11 @@ public class Vpn { 


            final int natKeepalive =

                    carrierConfig.getInt(KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT);

            final int preferredIpPortocol =

                    carrierConfig.getInt(KEY_PREFERRED_IKE_PROTOCOL_INT);

            final int preferredIpProtocol = carrierConfig.getInt(

                    KEY_PREFERRED_IKE_PROTOCOL_INT, PREFERRED_IKE_PROTOCOL_UNKNOWN);

            final String mccMnc = perSubTm.getSimOperator(subId);

            final CarrierConfigInfo info =

                    buildCarrierConfigInfo(mccMnc, natKeepalive, preferredIpPortocol);

                    buildCarrierConfigInfo(mccMnc, natKeepalive, preferredIpProtocol);

            synchronized (Vpn.this) {

                mCachedCarrierConfigInfoPerSubId.put(subId, info);

            }