diff options
| author | 2019-11-26 10:06:08 -0800 | |
|---|---|---|
| committer | 2019-11-26 10:06:08 -0800 | |
| commit | c478e51e9bab9ce6104c526e105d70d06504c545 (patch) | |
| tree | b03d0747ca91e210d2207c870061741bc430e68d | |
| parent | c0ea72cf104d1c0e5f36d5726aafa004c6c9daaf (diff) | |
| parent | 936fd348f72d1e1ab92de257c088d56b85a4106d (diff) | |
Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public"
am: 936fd348f7
Change-Id: I5e915d62c31a05a4b6d6a1e61df814444e68fb37
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | 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 5098324142d1..bf3b525ec9f4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44066,6 +44066,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 f7b3cbad54d6..78ba5b0fe8e6 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1708,7 +1708,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"; |