From 5b7374adf4045e9d34987270b82d9ce4bb49b53c Mon Sep 17 00:00:00 2001
From: wenchangliu <wenchangliu@google.com>
Date: Mon, 17 Apr 2023 08:23:09 +0000
Subject: [PATCH 1/2] Update media_codecs_performance_c2.xml base on
 UP1A.230414

- add sw av1 encoder performance measure result from PVT device

Bug: 271510425
Test: run cts -m CtsVideoTestCases -t android.video.cts.VideoEncoderDecoderTest
Change-Id: I26515dd7d38f2e5c9fcfcf3abc0fbdffec342784
---
 media_codecs_performance_c2.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index 7000661b..d8f1f609 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -250,5 +250,13 @@
             <Limit name="measured-frame-rate-640x360" range="64-97" />
             <Limit name="measured-frame-rate-1280x720" range="16-24" />
         </MediaCodec>
+        <MediaCodec name="c2.android.av1.encoder" type="video/av01" update="true">
+            <!-- measured 90%:297-298 med:298 N=2 -->
+            <Limit name="measured-frame-rate-320x240" range="297-298" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:65-66 med:66 N=2 -->
+            <Limit name="measured-frame-rate-720x480" range="65-66" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:24-25 med:25 N=2 -->
+            <Limit name="measured-frame-rate-1280x720" range="24-25" /> <!-- v90%=1.0 -->
+        </MediaCodec>
     </Encoders>
 </MediaCodecs>

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

Bug: 271928725
Bug: 267944733
Test: manually test
Change-Id: I6f1f0ce3afdf203812965ede07422f454566f33d
---
 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 7fccdd15..bb57116d 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -158,4 +158,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>