Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add carrier configs for NR SA unmetered" into rvc-dev am: 31354ac59f

Browse Source 
Change-Id: Ifbccbbfbe740e0ec59efc09346e6311f5555eae3
This commit is contained in:
Sarah Chin
2020-04-11 00:09:15 +00:00
committed by Automerger Merge Worker
parent 44fb3f71c5 31354ac59f
commit c8fff7ea25
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -3101,6 +3101,28 @@ public class CarrierConfigManager {
*/
public static final String KEY_UNMETERED_NR_NSA_SUB6_BOOL = "unmetered_nr_nsa_sub6_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.
* @hide
*/
public static final String KEY_UNMETERED_NR_SA_BOOL = "unmetered_nr_sa_bool";
/**
* Whether NR (standalone) frequencies above 6GHz (millimeter wave) should be unmetered.
* If this is true, then the value for {@link #KEY_UNMETERED_NR_SA_BOOL} will be ignored.
* @hide
*/
public static final String KEY_UNMETERED_NR_SA_MMWAVE_BOOL = "unmetered_nr_sa_mmwave_bool";
/**
* Whether NR (standalone) frequencies below 6GHz (sub6) should be unmetered.
* If this is true, then the value for {@link #KEY_UNMETERED_NR_SA_BOOL} will be ignored.
* @hide
*/
public static final String KEY_UNMETERED_NR_SA_SUB6_BOOL = "unmetered_nr_sa_sub6_bool";
/**
* Support ASCII 7-BIT encoding for long SMS. This carrier config is used to enable
* this feature.
@@ -4129,6 +4151,9 @@ 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_SA_BOOL, false);
sDefaults.putBoolean(KEY_UNMETERED_NR_SA_MMWAVE_BOOL, false);
sDefaults.putBoolean(KEY_UNMETERED_NR_SA_SUB6_BOOL, false);
sDefaults.putBoolean(KEY_ASCII_7_BIT_SUPPORT_FOR_LONG_MESSAGE_BOOL, false);
sDefaults.putBoolean(KEY_SHOW_WIFI_CALLING_ICON_IN_STATUS_BAR_BOOL, false);
/* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_GOOD */