From e72a5245904ac78368cd8eb7023702480aa0dede Mon Sep 17 00:00:00 2001 From: Ian Zerny Date: Thu, 30 Aug 2018 08:28:27 +0000 Subject: Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" This reverts commit 3284e35061f74d39e23039c8ae3cf2adc9af4415. Reason for revert: breaks most branches Bug: 112867975 Change-Id: Icb27e193529f523f4cf07ef55e19625c402a2d3b --- api/current.txt | 2 -- .../java/android/telephony/CarrierConfigManager.java | 16 ++++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/api/current.txt b/api/current.txt index acfb34f5179c..1cb9186156f3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -41692,8 +41692,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 5220731f7bd1..fdee2f494253 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -496,19 +496,19 @@ public class CarrierConfigManager { "carrier_wfc_supports_wifi_only_bool"; /** - * Default mode for WFC over IMS on home network: - * + * 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"; -- cgit v1.2.3-59-g8ed1b