From 66e20271874f7bee0f0bdec203b9d4f848f0aa2c Mon Sep 17 00:00:00 2001
From: Shuibing Dai <shuibing@google.com>
Date: Thu, 13 Apr 2023 17:28:02 -0700
Subject: [PATCH] Enable updating country code from scan results for generic
 case

Bug: 271928725
Bug: 267944733
Test: manually test
Change-Id: Ic58802de7829ff0c82d088a34a5c7d019ec7e003
---
 cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++
 panther/rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
index 0e5e364..fa61183 100644
--- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
@@ -164,4 +164,10 @@
     <!-- Enable the feature of adjusting link layer stats polling interval based on
     device mobility state and client mode RSSI monitoring. -->
     <bool translatable="false" name="config_wifiAdjustPollRssiIntervalEnabled">true</bool>
+
+    <!-- Boolean indicating whether the framework updates country from scan results when there is
+         no telephony country code. This is applied to all generic cases and might require the
+         regulatory approval (for example, FCC pre-approval is required according to "594280 D01
+         Software Configuration Control v02r01").-->
+    <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultGeneric">true</bool>
 </resources>
diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml
index c905558..29a474f 100644
--- a/panther/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml
@@ -164,4 +164,10 @@
     <!-- Enable the feature of adjusting link layer stats polling interval based on
     device mobility state and client mode RSSI monitoring. -->
     <bool translatable="false" name="config_wifiAdjustPollRssiIntervalEnabled">true</bool>
+
+    <!-- Boolean indicating whether the framework updates country from scan results when there is
+         no telephony country code. This is applied to all generic cases and might require the
+         regulatory approval (for example, FCC pre-approval is required according to "594280 D01
+         Software Configuration Control v02r01").-->
+    <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultGeneric">true</bool>
 </resources>