summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hall Liu <hallliu@google.com> 2019-04-30 20:00:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-04-30 20:00:18 +0000
commit1923b35e15f892105f040fe7494b92b87cec14d1 (patch)
treed69fb92f7ef98016a639686c4b813c0c114c90bb
parent6758d78f792770e19691b4b9af83e42dc4f00b18 (diff)
parentf30b5acaa591f567e538ec8a902ec53e22a6d81f (diff)
Merge "Fix WFC location privacy carrier config" into qt-dev
-rwxr-xr-xtelephony/java/android/telephony/CarrierConfigManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 638733430ede..69500d77fd6f 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -3313,7 +3313,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_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL, false);
sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false);
sDefaults.putString(KEY_SMART_FORWARDING_CONFIG_COMPONENT_NAME_STRING, "");
sDefaults.putBoolean(KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN,