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

Merge "resolve merge conflicts of 04d262db15 to pi-dev-plus-aosp" into pi-dev-plus-aosp

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-08 23:47:40 +00:00
committed by Android (Google) Code Review
parent 3d1b2b2201 7a3b8109cf
commit 4048d32e48
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2491,6 +2491,13 @@ public class CarrierConfigManager {
public static final String KEY_5G_ICON_CONFIGURATION_STRING = public static final String KEY_5G_ICON_CONFIGURATION_STRING =
"5g_icon_configuration_string"; "5g_icon_configuration_string";
/**
* Indicates use 3GPP application to replace 3GPP2 application even if it's a CDMA/CDMA-LTE
* phone, becasue some carriers's CSIM application is present but not supported.
* @hide
*/
public static final String KEY_USE_USIM_BOOL = "use_usim_bool";
/** The default value for every variable. */ /** The default value for every variable. */
private final static PersistableBundle sDefaults; private final static PersistableBundle sDefaults;
@@ -2872,6 +2879,7 @@ public class CarrierConfigManager {
}); });
sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING, sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,
"connected_mmwave:None,connected:5G,not_restricted:None,restricted:None"); "connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");
sDefaults.putBoolean(KEY_USE_USIM_BOOL, false);
} }
/** /**