Merge "Make it possible to dial an operator specific code" am: f4f4ba3d42 am: 6519e65ed8

am: a44a9d8b98

Change-Id: I7424799b74b61d3f507fbe8fb99c09d48e30cba8
This commit is contained in:
Jordan Liu
2017-10-25 19:12:47 +00:00
committed by android-build-merger

View File

@@ -1615,6 +1615,13 @@ public class CarrierConfigManager {
public static final String KEY_SKIP_CF_FAIL_TO_DISABLE_DIALOG_BOOL =
"skip_cf_fail_to_disable_dialog_bool";
/**
* List of the FAC (feature access codes) to dial as a normal call.
* @hide
*/
public static final String KEY_FEATURE_ACCESS_CODES_STRING_ARRAY =
"feature_access_codes_string_array";
/** The default value for every variable. */
private final static PersistableBundle sDefaults;
@@ -1887,6 +1894,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_ROAMING_OPERATOR_STRING_ARRAY, null);
sDefaults.putBoolean(KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);
sDefaults.putBoolean(KEY_DISABLE_CHARGE_INDICATION_BOOL, false);
sDefaults.putStringArray(KEY_FEATURE_ACCESS_CODES_STRING_ARRAY, null);
}
/**