diff options
| author | 2018-08-30 05:10:26 -0700 | |
|---|---|---|
| committer | 2018-08-30 05:10:26 -0700 | |
| commit | 4894817d0dbe0ccf63ed187ca73ed248ec6aeb48 (patch) | |
| tree | 6c89fe43c17fa9dd22f0d0ffb3270641c5605ec9 | |
| parent | 69f9c6fdc3ebb86544cac3e13d0c5ed1afad2ebf (diff) | |
| parent | 8396f846fe23c8a475b608ebc82be73af82ff1ec (diff) | |
Merge "Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"" am: b0896e61f8 am: ba11aeee6e
am: 8396f846fe
Change-Id: I4f8232db1b11be07363cda7ddf954dd4a51e0629
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt index 0d4c700ae6f5..7b8240314e2d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -41870,8 +41870,6 @@ package android.telephony { field public static final java.lang.String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array"; field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool"; field public static final java.lang.String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings"; - field public static final java.lang.String KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT = "carrier_default_wfc_ims_mode_int"; - field public static final java.lang.String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT = "carrier_default_wfc_ims_roaming_mode_int"; field public static final java.lang.String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL = "carrier_force_disable_etws_cmas_test_bool"; field public static final java.lang.String KEY_CARRIER_IMS_GBA_REQUIRED_BOOL = "carrier_ims_gba_required_bool"; field public static final java.lang.String KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL = "carrier_instant_lettering_available_bool"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 09bc2f17fb5a..0cf1aecb19fb 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -520,19 +520,19 @@ public class CarrierConfigManager { "carrier_wfc_supports_wifi_only_bool"; /** - * Default mode for WFC over IMS on home network: - * <ul> - * <li>0: Wi-Fi only - * <li>1: prefer mobile network - * <li>2: prefer Wi-Fi - * </ul> + * Default WFC_IMS_MODE for home network 0: WIFI_ONLY + * 1: CELLULAR_PREFERRED + * 2: WIFI_PREFERRED + * @hide */ public static final String KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT = "carrier_default_wfc_ims_mode_int"; /** - * Default mode for WFC over IMS on roaming network. - * See {@link KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT} for meaning of values. + * Default WFC_IMS_MODE for roaming + * See {@link KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT} for valid values. + * + * @hide */ public static final String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT = "carrier_default_wfc_ims_roaming_mode_int"; |