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

Merge "Add a carrier config for WFC's carrier name override by ef_pnn" into rvc-dev am: 29db7a6a62

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11874044

Change-Id: Id3a587cd8b0ab0a2cda8d0973ae9f221c3c64094
This commit is contained in:
TreeHugger Robot
2020-06-18 21:42:29 +00:00
committed by Automerger Merge Worker
parent fd4448ac32 29db7a6a62
commit 778a866f06
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1384,6 +1384,14 @@ public class CarrierConfigManager {
*/
public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";
/**
* To override wifi calling's carrier name string using ef_pnn from sim card when SPN in empty.
*
* @hide
*/
public static final String KEY_WFC_CARRIER_NAME_OVERRIDE_BY_PNN_BOOL =
"wfc_carrier_name_override_by_pnn_bool";
/**
* Override the SPN Display Condition 2 integer bits (lsb). B2, B1 is the last two bits of the
* spn display condition coding.
@@ -4008,6 +4016,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false);
sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);
sDefaults.putString(KEY_CARRIER_NAME_STRING, "");
sDefaults.putBoolean(KEY_WFC_CARRIER_NAME_OVERRIDE_BY_PNN_BOOL, false);
sDefaults.putInt(KEY_SPN_DISPLAY_CONDITION_OVERRIDE_INT, -1);
sDefaults.putStringArray(KEY_SPDI_OVERRIDE_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_PNN_OVERRIDE_STRING_ARRAY, null);