Merge "Add carrier config for roaming meteredness" into rvc-dev

This commit is contained in:
Sarah Chin
2020-04-15 03:17:41 +00:00
committed by Android (Google) Code Review

View File

@@ -3083,6 +3083,16 @@ public class CarrierConfigManager {
*/
public static final String KEY_UNMETERED_NR_NSA_SUB6_BOOL = "unmetered_nr_nsa_sub6_bool";
/**
* Whether NR (non-standalone) should be unmetered when the device is roaming.
* If false, then the values for {@link #KEY_UNMETERED_NR_NSA_BOOL},
* {@link #KEY_UNMETERED_NR_NSA_MMWAVE_BOOL}, {@link #KEY_UNMETERED_NR_NSA_SUB6_BOOL},
* and unmetered {@link SubscriptionPlan} will be ignored.
* @hide
*/
public static final String KEY_UNMETERED_NR_NSA_WHEN_ROAMING_BOOL =
"unmetered_nr_nsa_when_roaming_bool";
/**
* Whether NR (standalone) should be unmetered for all frequencies.
* If either {@link #KEY_UNMETERED_NR_SA_MMWAVE_BOOL} or
@@ -4134,6 +4144,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_BOOL, false);
sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_MMWAVE_BOOL, false);
sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_SUB6_BOOL, false);
sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_WHEN_ROAMING_BOOL, false);
sDefaults.putBoolean(KEY_UNMETERED_NR_SA_BOOL, false);
sDefaults.putBoolean(KEY_UNMETERED_NR_SA_MMWAVE_BOOL, false);
sDefaults.putBoolean(KEY_UNMETERED_NR_SA_SUB6_BOOL, false);