From 06531768aebb32852da1c9de6098bb4600c0c5e8 Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Fri, 24 May 2024 15:52:26 +0800
Subject: [PATCH 1/4] Switch makefile owners to MK_OWNERS

Bug: 278167548
Change-Id: Ie3cdbb8bbe9134b3acaa00ce6dc824327a859ded
---
 OWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OWNERS b/OWNERS
index 9456ca0..793417b 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,2 @@
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS

From 6df65cafac16062cf994855b05cd5d57cdc23bec Mon Sep 17 00:00:00 2001
From: Rios Kao <rioskao@google.com>
Date: Tue, 21 May 2024 03:16:13 +0000
Subject: [PATCH 2/4] comet: correct property name for gsenet.

Test: build pass.
Bug: 333497194
Change-Id: Iebeddc4d1ca3447278d31233bcd586aaf8fa0638
---
 device-comet.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-comet.mk b/device-comet.mk
index 66dc54c..32f611e 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -258,7 +258,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # HdMic Audio
 PRODUCT_SOONG_NAMESPACES += device/google/comet/audio/comet/prebuilt/libspeechenhancer
 PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.audio.hdmic.version=1
+    persist.vendor.app.audio.gsenet.version=1
 PRODUCT_PACKAGES += \
     libspeechenhancer
 

From beed8e1a34eb04f95e6d5114b5dd680b19fc52ac Mon Sep 17 00:00:00 2001
From: Minchan Kim <minchan@google.com>
Date: Thu, 30 May 2024 00:52:40 +0000
Subject: [PATCH 3/4] Revert "powerhint: add proactive kill hint for camera
 launch"

Revert submission 27473137-P24_PA_KILL_HINT_24Q4

Reason for revert: will merge after mid of June

Reverted changes: /q/submissionid:27473137-P24_PA_KILL_HINT_24Q4

Change-Id: Ic7a87141616ea44c30cf88493d2d46dbee8da014
Bug: 322916612
---
 powerhint-comet.json | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/powerhint-comet.json b/powerhint-comet.json
index 5e9284a..f35315c 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -476,16 +476,6 @@
       "Type": "Property",
       "ResetOnInit": true
     },
-    {
-      "Name": "PowerHALLaunch",
-      "Path": "vendor.powerhal.is_launch",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "Type": "Property",
-      "ResetOnInit": true
-    },
     {
       "Name": "BigTjOffset",
       "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled",
@@ -850,15 +840,6 @@
         "67000"
       ],
       "ResetOnInit": true
-    },
-    {
-      "Name": "PA_KILL",
-      "Path": "/sys/kernel/vendor_mm/pa_kill/reclaim_kb",
-      "Values": [
-        "102400",
-        "0"
-      ],
-      "ResetOnInit": false
     }
   ],
   "Actions": [
@@ -1152,12 +1133,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "PowerHALLaunch",
-      "Duration": 5000,
-      "Value": "1"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUSkipMask",
@@ -1331,13 +1306,6 @@
       "Duration": 0,
       "Value": "0x80"
     },
-    {
-      "PowerHint": "CAMERA_LAUNCH",
-      "Node": "PA_KILL",
-      "EnableProperty": "vendor.powerhal.is_launch",
-      "Duration": 0,
-      "Value": "102400"
-    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPUSkipMask",

From 8e0f9b8d1b6df9626ed4453db6d82d04938aee52 Mon Sep 17 00:00:00 2001
From: Wayne Lin <waynewhlin@google.com>
Date: Tue, 21 May 2024 10:03:05 +0000
Subject: [PATCH 4/4] Revert "gps: Disable NFW lock"

Revert submission 27263809-disable-nfw-lock

Reason for revert: enable NFW after LOCSW-21052 is reverted in b/326439267 and fix test case failure in b/343511469

Reverted changes: /q/submissionid:27263809-disable-nfw-lock

Change-Id: Id4eae6d381e18b4a696a184830332e603763ad2f
---
 location/user/gps.cfg      | 1 -
 location/userdebug/gps.cfg | 1 -
 2 files changed, 2 deletions(-)

diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index c75f395..03dc158 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -1,4 +1,3 @@
-GlueLayer_IsUseNfwLocAccess=0
 GlueLayer_ToolConfigSelection=3
 debug_console=0
 debug_enable=0
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 0168a82..ea11f2b 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -1,4 +1,3 @@
-GlueLayer_IsUseNfwLocAccess=0
 ############################################
 GlueLayer_ToolConfigSelection=3
 user_ports_tcp_name=Autotest