From 9f615faa63e7ecd4d117f28f67a3074c4e30ddcc Mon Sep 17 00:00:00 2001
From: Alex Hong <rurumihong@google.com>
Date: Tue, 8 Mar 2022 21:28:36 +0800
Subject: [PATCH 1/2] Remove the redundant Product FCM for wireless charger HAL

We already have the settings for Wireless charger HAL for gs201

Test: m check-vintf-all
      run vts -m vts_treble_vintf_vendor_test
Bug: 207076973
Change-Id: I74abd1de7004edce3e711d60b87f8849839f35e4
---
 device-felix.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/device-felix.mk b/device-felix.mk
index 2435ba7..e794d41 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -168,9 +168,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES_DEBUG += \
     sar_test
 
-# WirelessCharger
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
-
 # Bluetooth
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.a2dp_aac.vbr_supported=true

From d57360af9bf0eef36a21beddbcaa457258905d7b Mon Sep 17 00:00:00 2001
From: Daeho Jeong <daehojeong@google.com>
Date: Wed, 16 Mar 2022 11:03:38 -0700
Subject: [PATCH 2/2] disable powerhint for F2FS gc_urgent mode

Disable the powerhint for F2FS gc_urgent mode, since we are going to
replace this with the smart idle maintenance service.

Test: turn on/off the screen & check /sys/fs/f2fs/dm-*/gc_urgent
Bug: 214430685
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I9774ae52765527f77f9c78af75fd6e29cd4ea572
---
 powerhint.json | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/powerhint.json b/powerhint.json
index be24abc..0733537 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -217,15 +217,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "F2fsRecessModeEnable",
-      "Path": "/dev/sys/fs/by-name/userdata/gc_urgent",
-      "Values": [
-        "2",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "TAPreferHighCap",
       "Path": "/sys/kernel/vendor_sched/ta_prefer_high_cap",
@@ -386,12 +377,6 @@
       "Duration": 5000,
       "Value": "65"
     },
-    {
-      "PowerHint": "DEVICE_IDLE",
-      "Node": "F2fsRecessModeEnable",
-      "Duration": 0,
-      "Value": "2"
-    },
     {
       "PowerHint": "LAUNCH_120FPS",
       "Node": "SFUClampBoost",
@@ -439,12 +424,6 @@
       "Duration": 5000,
       "Value": "3172000"
     },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "F2fsRecessModeEnable",
-      "Duration": 0,
-      "Value": "2"
-    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "MemFreq",