From cbd0cca98485e7adffbcc0f88f5c4d5265369f51 Mon Sep 17 00:00:00 2001 From: Youming Ye Date: Fri, 19 Oct 2018 21:34:27 +0000 Subject: [PATCH] Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting" This reverts commit 187c9943ff68dd30aac90ec322622eb67813d7ff. Reason for revert: Slipped off master. Revert and try put it back. Change-Id: I5823566523346c943c14e91848e7d5de9c14d68d --- api/current.txt | 1 - .../java/android/telephony/CarrierConfigManager.java | 8 -------- 2 files changed, 9 deletions(-) diff --git a/api/current.txt b/api/current.txt index 220b677660453..b691ef37492e4 100755 --- a/api/current.txt +++ b/api/current.txt @@ -41999,7 +41999,6 @@ 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 56ffe93b24562..42596b3324d6a 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2223,13 +2223,6 @@ 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; @@ -2577,7 +2570,6 @@ 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); } /**