From 62477018955f38f5fca20b40b90c4885728cf5e5 Mon Sep 17 00:00:00 2001
From: Vinit Deshpande <vinitd@google.com>
Date: Fri, 4 Sep 2015 15:01:23 -0700
Subject: [PATCH] Introduce config_wifi_revert_country_code_on_cellular_loss

This setting allows wifi country code to automatically reset
to default (i.e. ro.boot.wificountrycode property value) when
cellular modem loses MCC

bug: 21795172

Change-Id: I20bd3a260b639dba331305c6baa39ffb52e2fd6f
---
 core/res/res/values/config.xml  | 4 ++++
 core/res/res/values/symbols.xml | 1 +
 2 files changed, 5 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index bd02d4ded7cfe..d7658d17d4177 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -387,6 +387,10 @@
     <!-- Boolean indicating autojoin will prefer 5GHz and choose 5GHz BSSIDs -->
     <bool translatable="true" name="config_wifi_enable_5GHz_preference">true</bool>
 
+    <!-- Boolean indicating whether or not to revert to default country code when cellular
+         radio is unable to find any MCC information to infer wifi country code from -->
+    <bool translatable="false" name="config_wifi_revert_country_code_on_cellular_loss">false</bool>
+
     <!-- Integer specifying the basic autojoin parameters -->
     <integer translatable="false" name="config_wifi_framework_5GHz_preference_boost_threshold">-65</integer>
     <integer translatable="false" name="config_wifi_framework_5GHz_preference_boost_factor">5</integer>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index b7aafc36e23d7..4c8e55e07e7e8 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -301,6 +301,7 @@
   <java-symbol type="bool" name="config_wifi_only_link_same_credential_configurations" />
   <java-symbol type="bool" name="config_wifi_enable_disconnection_debounce" />
   <java-symbol type="bool" name="config_wifi_enable_5GHz_preference" />
+  <java-symbol type="bool" name="config_wifi_revert_country_code_on_cellular_loss" />
   <java-symbol type="bool" name="config_supportMicNearUltrasound" />
   <java-symbol type="bool" name="config_supportSpeakerNearUltrasound" />
   <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_threshold" />