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

Commit 0ad604e4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update CellularNetworkValidator with new carrier config key"

parents 723e47db cec627e2

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;
@@ -192,7 +192,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);

    }

}