commit 7f3a9d08c63e3a5e32d13d92532cc8447badd81a
author Minoru Sakuma <minoru.x.sakuma@sonymobile.com> Wed Oct 25 15:52:31 2017 +0900
committer Hall Liu <hallliu@google.com> Fri Mar 15 16:18:52 2019 -0700
tree 94fa96e8ca64eafbd6d6989637882b388331aa64
parent 5b43aa7fd82a4a5f4267de45ed5955d31f773c91

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

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 524d080..bcf442e 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -2659,6 +2659,14 @@
             "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 @@
                 });
         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);