diff options
| author | taiki tsutsumi <taiki.tsutsumi@sony.com> | 2018-05-30 13:50:16 +0900 |
|---|---|---|
| committer | Youming Ye <paulye@google.com> | 2018-10-19 01:12:39 +0000 |
| commit | 187c9943ff68dd30aac90ec322622eb67813d7ff (patch) | |
| tree | a72382f20c525582b3f91fa043c7e668beb34ede | |
| parent | 7e7c7d2abf135a592b0dffb30fa27d4c07907ee1 (diff) | |
| download | base-187c9943ff68dd30aac90ec322622eb67813d7ff.tar.gz | |
Add CarrierConfig to hide "Network default" option in Caller ID setting
Add a key to hide "Network default". When value is false,
"Network default" shouldn't be displayed for options in Caller ID
setting.
Test: manual - check options in Caller ID setting
Bug: 111809829
Change-Id: Id07ab2d2281a1ebb07d631045ada705cda53daf2
Merged-In: I5fbe9734dbb092b25fd145344c7559d2dee79df2
| -rwxr-xr-x | api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index b691ef37492e..220b67766045 100755 --- a/api/current.txt +++ b/api/current.txt @@ -41999,6 +41999,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"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 42596b3324d6..56ffe93b2456 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -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); } /** |