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

Merge "Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT""

Browse Source 
am: b0896e61f8

Change-Id: I356bd75a0d1b0a0334cde5703a9ce7a24874bed4
This commit is contained in:
Ian Zerny
2018-08-30 02:51:21 -07:00
committed by android-build-merger
parent 44787b6aa7 b0896e61f8
commit ba11aeee6e
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -41698,8 +41698,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";

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

@@ -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";