diff options
| author | 2019-11-26 10:11:17 -0800 | |
|---|---|---|
| committer | 2019-11-26 10:11:17 -0800 | |
| commit | 686df58861f320c49209ad1cb761ce1e35f3cf2b (patch) | |
| tree | b50627afc287da98063ce47eb048894c4fb37a66 | |
| parent | f72d5dbbf108693ef500cc11d2ea8b657a874aeb (diff) | |
| parent | c478e51e9bab9ce6104c526e105d70d06504c545 (diff) | |
Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public" am: 936fd348f7
am: c478e51e9b
Change-Id: If10fb4a795415bca2a0be8d334ba6e6e738c819a
| -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 5727491e81a3..bb15da7b496c 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"; |