From 060571655e1f862483aedd8dc78eb76f59e54073 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Thu, 28 Jun 2018 17:28:22 +0800 Subject: [PATCH] add three new carrier configs for call forwarding, Caller ID and Call Waiting. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The carrier configs control the call forwarding and additional settings button in the Call Settings menu and caller ID and call waiting in additional settings menu. Bug: 110121209 Test: manual - test case as below : 1.flag clir on and flag cw on ,do CLIR show/hide, and make call to other device.(PASS） 2.flag clir on and flag cw on ,do CW on/off,and CW function work.（PASS） 3.flag clir off and flag cw on ,no CLIR in additional settings page（PASS） 4.flag clir off and flag cw on ,do CW on/off,and CW function work.（PASS） 5.flag clir on and flag cw off ,do CLIR show/hide , and make call to other device.（PASS） 6.flag clir on and flag cw off ,no CW in additional settings page（PASS） 7.flag clir off and flag cw off, no Additional Settings in call feature settings（PASS） 8.flag cf off,no cf in call settings page (PASS) Change-Id: I29d7a71ad57b3b05ccc6025154f63119b35dab71 --- .../telephony/CarrierConfigManager.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index f66164c302c38..03ffebaf6cc28 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -77,6 +77,30 @@ public class CarrierConfigManager { public static final String KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool"; + /** + * Boolean indicating if the "Call forwarding" item is visible in the Call Settings menu. + * true means visible. false means gone. + * @hide + */ + public static final String KEY_CALL_FORWARDING_VISIBILITY_BOOL = + "call_forwarding_visibility_bool"; + + /** + * Boolean indicating if the "Caller ID" item is visible in the Additional Settings menu. + * true means visible. false means gone. + * @hide + */ + public static final String KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL = + "additional_settings_caller_id_visibility_bool"; + + /** + * Boolean indicating if the "Call Waiting" item is visible in the Additional Settings menu. + * true means visible. false means gone. + * @hide + */ + public static final String KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL = + "additional_settings_call_waiting_visibility_bool"; + /** * Boolean indicating if the "Call barring" item is visible in the Call Settings menu. * true means visible. false means gone. @@ -2015,6 +2039,9 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONED_BOOL, false); sDefaults.putBoolean(KEY_CALL_BARRING_VISIBILITY_BOOL, false); + sDefaults.putBoolean(KEY_CALL_FORWARDING_VISIBILITY_BOOL, true); + sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL, true); + sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL, true); sDefaults.putBoolean(KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL, false); sDefaults.putBoolean(KEY_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false); sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);