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

Commit 2d87e934 authored by rambowang's avatar rambowang Committed by Jack Yu
Browse files

Update CellularNetworkValidator with new carrier config key 

Carrier config key KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG has
been renamed to KEY_DATA_SWITCH_VALIDATION_MIN_INTERVAL_MILLIS_LONG
to follow the canonical naming format when exposing as public.

Bug: 181813215
Test: atest CellularNetworkValidatorTest
Merged-In: Idfd8d5d32c8bed71fbe91154c2a65cb987a35850
Change-Id: Idfd8d5d32c8bed71fbe91154c2a65cb987a35850
parent bd35a1b6

src/java/com/android/internal/telephony/data/CellularNetworkValidator.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.internal.telephony.data;



import static android.telephony.AccessNetworkConstants.TRANSPORT_TYPE_WWAN;

import static android.telephony.CarrierConfigManager.KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG;

import static android.telephony.CarrierConfigManager.KEY_DATA_SWITCH_VALIDATION_MIN_INTERVAL_MILLIS_LONG;

import static android.telephony.NetworkRegistrationInfo.DOMAIN_PS;



import android.content.Context;
@@ -202,7 +202,7 @@ public class CellularNetworkValidator { 
            if (configManager != null) {

                PersistableBundle b = configManager.getConfigForSubId(subId);

                if (b != null) {

                    ttl = b.getLong(KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG);

                    ttl = b.getLong(KEY_DATA_SWITCH_VALIDATION_MIN_INTERVAL_MILLIS_LONG);

                }

            }

            // Ttl can't be bigger than one day for now.

tests/telephonytests/src/com/android/internal/telephony/data/CellularNetworkValidatorTest.java

+2 −1
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ public class CellularNetworkValidatorTest extends TelephonyTest { 
        CarrierConfigManager carrierConfigManager = (CarrierConfigManager)

                mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

        PersistableBundle bundle = carrierConfigManager.getConfigForSubId(anyInt());

        bundle.putLong(CarrierConfigManager.KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG, ttl);

        bundle.putLong(CarrierConfigManager.KEY_DATA_SWITCH_VALIDATION_MIN_INTERVAL_MILLIS_LONG,

                ttl);

    }

}