diff options
| author | 2019-11-25 23:01:13 +0000 | |
|---|---|---|
| committer | 2019-11-25 23:01:13 +0000 | |
| commit | 829ca16f1b90fc139a3d67c60c5f6567a2a3ecbd (patch) | |
| tree | 3a3ffffae020d659adeee54dbc4941aeab82c1a1 | |
| parent | b03e9a1171a7c217be85798fd97c6ec5d094cd94 (diff) | |
| parent | 48ae8d52c3ce23190256f0474ea69ab51589a035 (diff) | |
Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rwxr-xr-x | telephony/java/android/telephony/CarrierConfigManager.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index c2939fd38e4b..98ee1255aff9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44419,6 +44419,7 @@ package android.telephony { field public static final String KEY_CALL_BARRING_VISIBILITY_BOOL = "call_barring_visibility_bool"; field public static final String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array"; field public static final String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool"; + field public static final String KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL = "carrier_app_required_during_setup_bool"; field public static final String KEY_CARRIER_CALL_SCREENING_APP_STRING = "call_screening_app"; field public static final String KEY_CARRIER_CONFIG_VERSION_STRING = "carrier_config_version_string"; field public static final String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index f94c8e39cb17..479b1442c788 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1701,7 +1701,6 @@ public class CarrierConfigManager { /** * Determines whether the carrier app needed to be involved when users try to finish setting up * the SIM card to get network service. - * @hide */ public static final String KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL = "carrier_app_required_during_setup_bool"; |