From 7f3a9d08c63e3a5e32d13d92532cc8447badd81a Mon Sep 17 00:00:00 2001 From: Minoru Sakuma Date: Wed, 25 Oct 2017 15:52:31 +0900 Subject: [PATCH] Add a new carrier config to show the WFC location privacy policy UI Controls whether to show the privacy policy prompt message before opening Wi-Fi call settings. Test: manual - Passed make build Bug: 67872298 Change-Id: I58df76ae97b54009b55a7a78fcaec95cd9b27ca6 --- telephony/java/android/telephony/CarrierConfigManager.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 524d080c2ea5..bcf442e60535 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2659,6 +2659,14 @@ public class CarrierConfigManager { "cdma_enhanced_roaming_indicator_for_home_network_int_array"; /** + * Determines whether wifi calling location privacy policy is shown. + * + * @hide + */ + public static final String KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL = + "show_wfc_location_privacy_policy_bool"; + + /** * Indicates use 3GPP application to replace 3GPP2 application even if it's a CDMA/CDMA-LTE * phone, becasue some carriers's CSIM application is present but not supported. * @hide @@ -3063,6 +3071,7 @@ public class CarrierConfigManager { }); sDefaults.putStringArray(KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY, new String[0]); sDefaults.putBoolean(KEY_USE_USIM_BOOL, false); + sDefaults.putBoolean(KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL, true); sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false); sDefaults.putBoolean(KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN, false); -- 2.11.0