summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sarah Chin <sarahchin@google.com> 2020-04-01 10:59:34 -0700
committer Sarah Chin <sarahchin@google.com> 2020-04-28 12:29:25 -0700
commit86ef2bf41907e58e45f2ff24d9d6904ca6536e8b (patch)
treef2ba6e912efa061091ea10607e4e4badfa1fc4e4
parentdf6e608fcabfc173eae79724c2018d2b10f27bbd (diff)
Add carrier config for roaming meteredness
Test: atest DcTrackerTest, DataConnectionTest Bug: 152541872 Change-Id: I07e9fd2cf42de8c6f924cda5e16aa6820baef4cd Merged-In: I07e9fd2cf42de8c6f924cda5e16aa6820baef4cd
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index f17a9547e612..5149ad232705 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -3068,6 +3068,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
* {@link #KEY_UNMETERED_NR_SA_SUB6_BOOL} are true, then this value will be ignored.
@@ -4085,6 +4095,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);