From c87c5cf3a7687a3f9a9cb5f226efb50adb68be23 Mon Sep 17 00:00:00 2001
From: Richard Chang <richardycc@google.com>
Date: Fri, 21 Jun 2024 06:53:06 +0000
Subject: [PATCH 1/2] Reapply "powerhint: add proactive kill hint for camera
 launch"

This reverts commit beed8e1a34eb04f95e6d5114b5dd680b19fc52ac.

Bug: 322916612
Test: local test
Flag: EXEMPT resource only update
Change-Id: Ia4d17cecb66551b7cc850f82a165a03d265f7507
---
 powerhint-comet.json | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/powerhint-comet.json b/powerhint-comet.json
index 6d439d7..f8446e6 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -477,6 +477,16 @@
       "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",
@@ -830,6 +840,15 @@
         "67000"
       ],
       "ResetOnInit": true
+    },
+    {
+      "Name": "PA_KILL",
+      "Path": "/sys/kernel/vendor_mm/pa_kill/reclaim_kb",
+      "Values": [
+        "102400",
+        "0"
+      ],
+      "ResetOnInit": false
     }
   ],
   "Actions": [
@@ -1123,6 +1142,12 @@
       "Duration": 5000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "PowerHALLaunch",
+      "Duration": 5000,
+      "Value": "1"
+    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUSkipMask",
@@ -1296,6 +1321,13 @@
       "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 daedf2051f2c5d5ed9e44c09fd0ff378a5bdb403 Mon Sep 17 00:00:00 2001
From: Ted Wang <tedwang@google.com>
Date: Mon, 24 Jun 2024 02:48:59 +0000
Subject: [PATCH 2/2] bt: enable vendor logging and update BQR event_mask

enable Vendor Specific Quality event as default.
set bqr event_mask to 295006 (0x4805e), vnd_quality_mask to 29 (0x1d)
for user debug or eng rom

Bug: 349003987
Test: manual test vendor specific masks
Change-Id: I96baccea7ba8337afd2035db60590b9fb8b073f5
---
 device-comet.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/device-comet.mk b/device-comet.mk
index 51807b2..0ae05f7 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -224,6 +224,21 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.hfp.swb.supported=true
 
+# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=29 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=true
+else
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=16 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=false
+endif
+
 # Support LE & Classic concurrent encryption (b/330704060)
 PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.ble.allow_enc_with_bredr=true