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

Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public"

Browse Source 
am: 936fd348f7

Change-Id: I5e915d62c31a05a4b6d6a1e61df814444e68fb37
This commit is contained in:
Jiashen Wang
2019-11-26 10:06:08 -08:00
committed by android-build-merger
parent c0ea72cf10 936fd348f7
commit c478e51e9b
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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_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_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_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_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_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"; field public static final String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings";

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

@@ -1708,7 +1708,6 @@ public class CarrierConfigManager {
/** /**
* Determines whether the carrier app needed to be involved when users try to finish setting up * Determines whether the carrier app needed to be involved when users try to finish setting up
* the SIM card to get network service. * the SIM card to get network service.
* @hide
*/ */
public static final String KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL = public static final String KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL =
"carrier_app_required_during_setup_bool"; "carrier_app_required_during_setup_bool";