From 8616174b53e440d7e88ce802a55bf882195016f0 Mon Sep 17 00:00:00 2001
From: Jack Wu <wjack@google.com>
Date: Thu, 2 Mar 2023 17:35:33 +0800
Subject: [PATCH 1/3] gs101: update AIDL IGoogleBattery manifest version to 2

Bug: 274701302
Test: TH
Change-Id: Ic737349bdfb9e8342730ceef0da5308e443bfc1e
Merged-In: Ic737349bdfb9e8342730ceef0da5308e443bfc1e
Signed-off-by: Jack Wu <wjack@google.com>
(cherry picked from commit 71043f13f619b36e5a898fe10d1df4b2e75cf738)
---
 device_framework_matrix_product.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index d938aecb..c037a4a4 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -138,7 +138,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>

From a9207eff25f9b68710295c3b2a022384382ee80f Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Mon, 27 Mar 2023 10:35:44 +0800
Subject: [PATCH 2/3] Move camera text dump to dump_gs101

Bug: 273380985
Test: adb bugreport
Change-Id: Ie82c87ba87d175cb861d36f7e4a94c0e730da0d2
---
 dumpstate/Dumpstate.cpp | 9 ---------
 dumpstate/Dumpstate.h   | 1 -
 dumpstate/dump_gs101.sh | 7 +++++++
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index d4af35b0..de973669 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -242,7 +242,6 @@ void endSection(int fd, const std::string &sectionName, timepoint_t startTime) {
 Dumpstate::Dumpstate()
   : mTextSections{
         { "power", [this](int fd) { dumpPowerSection(fd); } },
-        { "camera", [this](int fd) { dumpCameraSection(fd); } },
     } {
 }
 
@@ -491,14 +490,6 @@ void Dumpstate::dumpPowerSection(int fd) {
 
 }
 
-// Dump essential camera debugging logs
-void Dumpstate::dumpCameraSection(int fd) {
-    RunCommandToFd(fd, "Camera HAL Graph State Dump", {"/vendor/bin/sh", "-c",
-                       "for f in $(ls -t /data/vendor/camera/hal_graph_state*.txt |head -1); do "
-                       "echo $f ; cat $f ; done"},
-                       CommandOptions::WithTimeout(4).Build());
-}
-
 static void *dumpModemThread(void *data) {
     ATRACE_ASYNC_BEGIN("dumpModemThread", 0);
     std::string modemLogDir = MODEM_LOG_DIRECTORY;
diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h
index cfad9f97..cfca5a15 100644
--- a/dumpstate/Dumpstate.h
+++ b/dumpstate/Dumpstate.h
@@ -49,7 +49,6 @@ class Dumpstate : public BnDumpstateDevice {
     // addition to being included in full dumps
     void dumpPowerSection(int fd);
     void dumpMemorySection(int fd);
-    void dumpCameraSection(int fd);
 };
 
 }  // namespace dumpstate
diff --git a/dumpstate/dump_gs101.sh b/dumpstate/dump_gs101.sh
index 211140ca..c37b2bfb 100644
--- a/dumpstate/dump_gs101.sh
+++ b/dumpstate/dump_gs101.sh
@@ -12,3 +12,10 @@ for d in $(ls -d /sys/kernel/pixel_stat/mm/cma/*); do
   fi
 done
 
+
+echo "------ Camera HAL Graph State Dump ------"
+for f in $(ls -t /data/vendor/camera/hal_graph_state*.txt |head -1); do
+  echo $f
+  cat $f
+done
+

From e60bfbd0a7423f9931efff147f0d0a98120c4f0d Mon Sep 17 00:00:00 2001
From: Liang Li <lianglli@google.com>
Date: Mon, 13 Mar 2023 21:41:58 -0700
Subject: [PATCH 3/3] Enable adjusting link layer stats polling interval

Enable the feature of adjusting link layer stats polling interval in Pixels.

Bug: 237530606
Test: manual
Change-Id: I3029edfb2b794542af9e4a73cb7bcb90c59a5af3
---
 rro_overlays/WifiOverlay/res/values/config.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 5254b0a7..7fccdd15 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -154,4 +154,8 @@
          no telephony country code and driver country code is 00.
          This is applied only during the setup wizard -->
     <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultSetupWizard">true</bool>
+
+    <!-- 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>
 </resources>