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

Bug: 271928725
Bug: 267944733
Test: manually test
Change-Id: Id5ffab8c4c35797872d96ca3448d7d8adeea6b0a
Merged-In: Id5ffab8c4c35797872d96ca3448d7d8adeea6b0a
(cherry picked from commit 5e3e1c947ee2c29687bb25d439518305b824c135)
---
 rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 9df1922..f46ac82 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -165,4 +165,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>