diff options
| author | Jordan Liu <jminjie@google.com> | 2017-11-09 18:24:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-09 18:24:16 +0000 |
| commit | bbaa19cad3227eb0262beb5555db54902ef17821 (patch) | |
| tree | 1bc23c1032ceb65195039fce18f29c5e384bde7b | |
| parent | cd35c65b5b22313559364bed8506666b4dd9bedf (diff) | |
| parent | 401843582aed2f2c853f6c028f3cf67099731379 (diff) | |
Merge "Add config to use a display rule that ServiceState was considered"
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 686818856fbe..8c64c7ffb1ef 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1620,6 +1620,26 @@ public class CarrierConfigManager { public static final String KEY_IDENTIFY_HIGH_DEFINITION_CALLS_IN_CALL_LOG_BOOL = "identify_high_definition_calls_in_call_log_bool"; + /** + * Flag specifying whether to use the {@link ServiceState} roaming status, which can be + * affected by other carrier configs (e.g. + * {@link #KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY}), when setting the SPN display. + * <p> + * If {@code true}, the SPN display uses {@link ServiceState#getRoaming}. + * If {@code false} the SPN display checks if the current MCC/MNC is different from the + * SIM card's MCC/MNC. + * + * @see KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY + * @see KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY + * @see KEY_NON_ROAMING_OPERATOR_STRING_ARRAY + * @see KEY_ROAMING_OPERATOR_STRING_ARRAY + * @see KEY_FORCE_HOME_NETWORK_BOOL + * + * @hide + */ + public static final String KEY_SPN_DISPLAY_RULE_USE_ROAMING_FROM_SERVICE_STATE_BOOL = + "spn_display_rule_use_roaming_from_service_state_bool"; + /** The default value for every variable. */ private final static PersistableBundle sDefaults; @@ -1895,6 +1915,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_DISABLE_CHARGE_INDICATION_BOOL, false); sDefaults.putStringArray(KEY_FEATURE_ACCESS_CODES_STRING_ARRAY, null); sDefaults.putBoolean(KEY_IDENTIFY_HIGH_DEFINITION_CALLS_IN_CALL_LOG_BOOL, false); + sDefaults.putBoolean(KEY_SPN_DISPLAY_RULE_USE_ROAMING_FROM_SERVICE_STATE_BOOL, false); } /** |