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

Merge changes from topic "cherrypick"

Browse Source 
am: c4b647458c

Change-Id: Id372458d932eb34db2f7cdc5bc25159f65f1d93c
This commit is contained in:
Youming Ye
2018-10-19 10:15:55 -07:00
committed by android-build-merger
parent dd86ea6036 c4b647458c
commit 130aacd566
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -42000,6 +42000,7 @@ package android.telephony {
field public static final java.lang.String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";
field public static final java.lang.String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";
field public static final java.lang.String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";
field public static final java.lang.String KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL = "support_clir_network_default_bool";
field public static final java.lang.String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";
field public static final java.lang.String KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL = "support_emergency_sms_over_ims_bool";
field public static final java.lang.String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool";

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

@@ -2223,6 +2223,13 @@ public class CarrierConfigManager {
public static final String KEY_CALL_WAITING_OVER_UT_WARNING_BOOL =
"call_waiting_over_ut_warning_bool";
/**
* Flag indicating whether to support "Network default" option in Caller ID settings for Calling
* Line Identification Restriction (CLIR).
*/
public static final String KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL =
"support_clir_network_default_bool";
/** The default value for every variable. */
private final static PersistableBundle sDefaults;
@@ -2570,6 +2577,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CALL_BARRING_OVER_UT_WARNING_BOOL, false);
sDefaults.putBoolean(KEY_CALLER_ID_OVER_UT_WARNING_BOOL, false);
sDefaults.putBoolean(KEY_CALL_WAITING_OVER_UT_WARNING_BOOL, false);
sDefaults.putBoolean(KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL, true);
}
/**