pantah: Initialize for Evolution X 10.x

Signed-off-by: AnierinB <anierin@evolution-x.org>

panthah: Fix status bar padding

BoardConfigEvolution.mk

@@ -0,0 +1,4 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#

BoardConfigLineage.mk

@@ -1,5 +1,11 @@
 #
-# Copyright (C) 2022 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #
+
+# Kernel modules
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_kernel_boot
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_kernel_boot))
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW)
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW)))

OWNERS

@@ -1,4 +1,4 @@
 per-file powerhint-*.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com
 
 # 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,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS

audio/cheetah/config/audio_policy_configuration.xml

@@ -135,10 +135,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
-                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -149,8 +145,6 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
-                </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
                 <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -158,8 +152,6 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
-                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
-                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml

@@ -135,10 +135,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
-                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -149,8 +145,6 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
-                </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
                 <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -158,8 +152,6 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
-                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
-                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml

@@ -131,10 +131,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
-                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -145,8 +141,6 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
-                </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
                 <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -154,8 +148,6 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
-                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
-                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml

@@ -135,10 +135,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
-                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -149,8 +145,6 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
-                </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
                 <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -158,8 +152,6 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
-                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
-                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

audio/cheetah/config/bluetooth_with_le_audio_policy_configuration_7_0.xml

@@ -11,6 +11,7 @@
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
         <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
         <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="44100 48000"
@@ -51,6 +52,7 @@
         <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
         <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
         <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
     </routes>
 </module>

audio/panther/config/audio_policy_configuration.xml

@@ -135,10 +135,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
-                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -149,8 +145,6 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
-                </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
                 <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -158,8 +152,6 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
-                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
-                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml

@@ -135,10 +135,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
-                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -149,8 +145,6 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
-                </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
                 <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -158,8 +152,6 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
-                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
-                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml

@@ -131,10 +131,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
-                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -145,8 +141,6 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
-                </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
                 <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -154,8 +148,6 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
-                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
-                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

audio/panther/config/audio_policy_configuration_le_offload_disabled.xml

@@ -135,10 +135,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
-                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -149,8 +145,6 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
-                </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
                 <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -158,8 +152,6 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
-                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
-                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

audio/panther/config/bluetooth_with_le_audio_policy_configuration_7_0.xml

@@ -11,6 +11,7 @@
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
         <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
         <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="44100 48000"
@@ -51,6 +52,7 @@
         <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
         <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
         <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
     </routes>
 </module>

cheetah/Android.bp

@@ -0,0 +1,11 @@
+//
+// SPDX-FileCopyrightText: 2024 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+prebuilt_etc {
+    name: "init.recovery.cheetah.touch.rc",
+    src: "init.recovery.touch.rc",
+    sub_dir: "init",
+    recovery: true,
+}

cheetah/BoardConfig.mk

@@ -17,16 +17,8 @@
 # Enable load module in parallel
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR)
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
-else
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
-endif
-
 # The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 
 TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
@@ -38,8 +30,18 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce
 
 include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/cheetah/proprietary/BoardConfigVendor.mk
 include device/google/pantah/sepolicy/cheetah-sepolicy.mk
 include device/google/pantah/wifi/BoardConfig-wifi.mk
 
-include device/google/pantah/cheetah/BoardConfigLineage.mk
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
+
+DEVICE_PATH := device/google/pantah
+VENDOR_PATH := vendor/google/cheetah
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk

cheetah/BoardConfigEvolution.mk

@@ -0,0 +1,6 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigEvolution.mk

cheetah/BoardConfigLineage.mk

@@ -1,9 +1,9 @@
 #
-# Copyright (C) 2022 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include device/google/pantah/BoardConfigLineage.mk
+include $(DEVICE_PATH)/BoardConfigLineage.mk
 
-include vendor/google/cheetah/BoardConfigVendor.mk
+include $(VENDOR_PATH)/BoardConfigVendor.mk

cheetah/device-evolution.mk

@@ -1,9 +1,8 @@
 #
-# Copyright (C) 2024 The Evolution X Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The Evolution X Project
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/cheetah/overlay-evolution
+$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk)
 
-$(call inherit-product, $(LOCAL_PATH)/device-evolution.mk)
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution

cheetah/device-lineage.mk

@@ -1,9 +1,13 @@
 #
-# Copyright (C) 2022 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/cheetah/overlay-lineage
+$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
 
-$(call inherit-product, $(LOCAL_PATH)/device-lineage.mk)
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
+
+# Init
+PRODUCT_PACKAGES += \
+    init.recovery.cheetah.touch.rc

cheetah/extract-files.py

@@ -0,0 +1,107 @@
+#!/usr/bin/env -S PYTHONPATH=../../../../tools/extract-utils python3
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+from extract_utils.extract import extract_fns_user_type
+from extract_utils.extract_pixel import (
+    extract_pixel_factory_image,
+    extract_pixel_firmware,
+    pixel_factory_image_regex,
+    pixel_firmware_regex,
+)
+from extract_utils.file import FileArgs, FileList
+from extract_utils.fixups_blob import (
+    blob_fixup,
+    blob_fixups_user_type,
+)
+from extract_utils.fixups_lib import (
+    lib_fixup_remove,
+    lib_fixups,
+    lib_fixups_user_type,
+)
+from extract_utils.main import (
+    ExtractUtils,
+    ExtractUtilsModule,
+)
+
+namespace_imports = [
+    'device/google/pantah',
+    'hardware/google/av',
+    'hardware/google/gchips',
+    'hardware/google/graphics/common',
+    'hardware/google/interfaces',
+    'hardware/google/pixel',
+]
+
+
+def lib_fixup_vendor_suffix(lib: str, partition: str, *args, **kwargs):
+    return f'{lib}_{partition}' if partition == 'vendor' else None
+
+
+lib_fixups: lib_fixups_user_type = {
+    **lib_fixups,
+    (
+        'com.google.edgetpu_app_service-V3-ndk',
+        'com.google.edgetpu_vendor_service-V2-ndk',
+    ): lib_fixup_vendor_suffix,
+    'android.hardware.sensors-V2-ndk': lib_fixup_remove,
+}
+
+blob_fixups: blob_fixups_user_type = {
+    'product/etc/felica/common.cfg': blob_fixup()
+        .patch_file('osaifu-keitai.patch'),
+    'vendor/etc/init/init.modem_logging_control.rc': blob_fixup()
+        .regex_replace(' && property:ro.debuggable=0', ''),
+}  # fmt: skip
+
+extract_fns: extract_fns_user_type = {
+    pixel_factory_image_regex: extract_pixel_factory_image,
+    pixel_firmware_regex: extract_pixel_firmware,
+}
+
+module = ExtractUtilsModule(
+    'cheetah',
+    'google',
+    device_rel_path='device/google/pantah/cheetah',
+    blob_fixups=blob_fixups,
+    lib_fixups=lib_fixups,
+    namespace_imports=namespace_imports,
+    add_generated_carriersettings_file=True,
+    add_firmware_proprietary_file=True,
+    extract_fns=extract_fns,
+)
+
+
+def fix_vendor_file_list(file_list: FileList):
+    # flp.default & gps.default have incorrect SONAME
+    # gpsd depends on android.hardware.sensors-V2-ndk & android.hardware.sensors-V3-ndk
+    disable_checkelf_file_paths = [
+        'vendor/bin/hw/gpsd',
+        'vendor/lib64/hw/flp.default.so',
+        'vendor/lib64/hw/gps.default.so',
+    ]
+    for file_path in disable_checkelf_file_paths:
+        file_list.get_file(file_path).set_arg(FileArgs.DISABLE_CHECKELF, True)
+
+    module_suffix_file_paths = [
+        'vendor/lib/com.google.edgetpu_app_service-V3-ndk.so',
+        'vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so',
+        'vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so',
+    ]
+
+    for file_path in module_suffix_file_paths:
+        file_list.get_file(file_path).set_arg(FileArgs.MODULE_SUFFIX, '_vendor')
+
+
+module.add_generated_proprietary_file(
+    'proprietary-files-vendor.txt',
+    partition='vendor',
+    skip_file_list_name='skip-files-vendor.txt',
+    fix_file_list=fix_vendor_file_list,
+)
+
+if __name__ == '__main__':
+    utils = ExtractUtils.device(module)
+    utils.run()

cheetah/extract-files.sh

@@ -1,149 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-DEVICE=cheetah
-VENDOR=google
-
-# Load extract_utils and do some sanity checks
-MY_DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
-
-ANDROID_ROOT="${MY_DIR}/../../../.."
-
-export TARGET_ENABLE_CHECKELF=true
-
-# If XML files don't have comments before the XML header, use this flag
-# Can still be used with broken XML files by using blob_fixup
-export TARGET_DISABLE_XML_FIXING=true
-
-HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
-if [ ! -f "${HELPER}" ]; then
-    echo "Unable to find helper script at ${HELPER}"
-    exit 1
-fi
-source "${HELPER}"
-
-# Default to sanitizing the vendor folder before extraction
-CLEAN_VENDOR=true
-
-ONLY_FIRMWARE=
-KANG=
-SECTION=
-CARRIER_SKIP_FILES=()
-VENDOR_SKIP_FILES=()
-
-while [ "${#}" -gt 0 ]; do
-    case "${1}" in
-        --only-firmware)
-            ONLY_FIRMWARE=true
-            ;;
-        -n | --no-cleanup)
-            CLEAN_VENDOR=false
-            ;;
-        -k | --kang)
-            KANG="--kang"
-            ;;
-        -s | --section)
-            SECTION="${2}"
-            shift
-            CLEAN_VENDOR=false
-            ;;
-        *)
-            SRC="${1}"
-            ;;
-    esac
-    shift
-done
-
-if [ -z "${SRC}" ]; then
-    SRC="adb"
-fi
-
-function blob_fixup() {
-    case "${1}" in
-        product/etc/felica/common.cfg)
-            [ "$2" = "" ] && return 0
-            sed -i -e '$a00000018,1' -e '/^00000014/d' -e '/^00000015/d' "${2}"
-            ;;
-        vendor/etc/init/init.modem_logging_control.rc)
-            [ "$2" = "" ] && return 0
-            sed -i 's/ && property:ro.debuggable=0//' "${2}"
-            ;;
-        *)
-            return 1
-            ;;
-    esac
-
-    return 0
-}
-
-function blob_fixup_dry() {
-    blob_fixup "$1" ""
-}
-
-function prepare_firmware() {
-    if [ "${SRC}" != "adb" ]; then
-        bash "${ANDROID_ROOT}"/lineage/scripts/pixel/prepare-firmware.sh "${DEVICE}" "${SRC}"
-    fi
-}
-
-# Initialize the helper
-setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
-
-if [ -z "${ONLY_FIRMWARE}" ]; then
-    extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-
-    generate_prop_list_from_image "product.img" "${MY_DIR}/proprietary-files-carriersettings.txt" CARRIER_SKIP_FILES carriersettings
-    extract "${MY_DIR}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-
-    readarray -t VENDOR_SKIP_FILES < <(cat "${MY_DIR}/skip-files-vendor.txt" | sed -E "/^[[:blank:]]*(#|$)/d")
-    VENDOR_TXT="${MY_DIR}/proprietary-files-vendor.txt"
-    generate_prop_list_from_image "vendor.img" "${VENDOR_TXT}" VENDOR_SKIP_FILES
-
-    # flp.default & gps.default have incorrect SONAME
-    # libExynosC2*Dec & libExynosC2*Enc depend on libacryl & libexynosv4l2, which are gnu makefile targets
-    set_disable_checkelf "vendor/lib/libExynosC2H263Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2H263Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2H264Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2H264Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2HevcDec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/hw/flp.default.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/hw/gps.default.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H263Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H263Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H264Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H264Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2HevcDec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
-
-    set_module_suffix "vendor/lib/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
-    set_module_suffix "vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
-    set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}"
-
-    extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-fi
-
-if [ -z "${SECTION}" ]; then
-    extract_firmware "${MY_DIR}/proprietary-firmware.txt" "${SRC}"
-fi
-
-"${MY_DIR}/setup-makefiles.sh"

cheetah/init.recovery.touch.rc

@@ -0,0 +1,2 @@
+on init
+   insmod /lib/modules/syna_touch.ko

cheetah/osaifu-keitai.patch

@@ -0,0 +1,24 @@
+From aab255f2807cfc460c0dce40decd5554d49c0076 Mon Sep 17 00:00:00 2001
+From: jabashque <jabashque@gmail.com>
+Date: Mon, 5 Feb 2024 21:36:03 +0000
+Subject: [PATCH 1/1] Enable Osaifu-Keitai on non-Japanese SKUs
+
+---
+ common.cfg | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/common.cfg b/common.cfg
+index 3b78765..00f53cb 100644
+--- a/common.cfg
++++ b/common.cfg
+@@ -11,6 +11,5 @@
+ 02030001,0
+ 02030002,0
+ 02030003,intent:#Intent;action=android.settings.NFC_SETTINGS;end
+-00000014,content://com.google.android.pixelnfc.provider.DeviceInfoContentProvider/isJapanSku
+-00000015,is_japan_sku
+ 00000016,0001
++00000018,1
+-- 
+2.47.0
+

cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml

@@ -19,16 +19,17 @@
 
 <resources>
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">50px</dimen>
-    <dimen name="rounded_corner_radius_top">50px</dimen>
-    <dimen name="rounded_corner_radius_bottom">49px</dimen>
+    <dimen name="rounded_corner_radius">67px</dimen>
+    <dimen name="rounded_corner_radius_top">67px</dimen>
+    <dimen name="rounded_corner_radius_bottom">66px</dimen>
 
-    <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">50px</dimen>
+    <!-- Default paddings for content around the corners. -->
+    <dimen name="rounded_corner_content_padding">14dp</dimen>
 
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
+    <dimen name="status_bar_height">41.142857143dp</dimen>
     <dimen name="status_bar_height_default">28dp</dimen>
     <dimen name="status_bar_height_portrait">41.142857143dp</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>

cheetah/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2021, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+-->
+<resources>
+    <!-- the padding on the top of the statusbar (usually 0) -->
+    <dimen name="status_bar_padding_top">0dp</dimen>
+</resources>

cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml

@@ -16,19 +16,20 @@
 */
 -->
 <resources>
+    <!-- the padding on the start of the statusbar -->
+    <dimen name="status_bar_padding_start">0dp</dimen>
+
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_padding_top">1px</dimen>
 
     <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
+    <dimen name="status_bar_header_height_keyguard">28dp</dimen>
 
-    <!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
-    The icons always have a 4dp padding in the container so we only need 26 extra px of padding
-    for the corners -->
-    <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
+    <!-- Margin on the left side of the carrier text on Keyguard -->
+    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
 
-    <!-- Margin on the right side of the system icon group on Keyguard. -->
-    <dimen name="system_icons_keyguard_padding_end">6.5dp</dimen>
+    <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
+    <dimen name="ongoing_appops_dot_min_padding">14dp</dimen>
 
     <!-- Camera 1 is the front camera -->
     <string translatable="false" name="config_protectedCameraId">1</string>

cheetah/proprietary-files-carriersettings.txt

@@ -1,6 +1,8 @@
 # All blobs below are extracted from the release mentioned in proprietary-files.txt
 product/etc/CarrierSettings/1and1_de.pb
 product/etc/CarrierSettings/2degrees_nz.pb
+product/etc/CarrierSettings/321communications_us.pb
+product/etc/CarrierSettings/48_ie.pb
 product/etc/CarrierSettings/4ka_sk.pb
 product/etc/CarrierSettings/a1_at.pb
 product/etc/CarrierSettings/a1_bg.pb
@@ -8,9 +10,13 @@ product/etc/CarrierSettings/a1_hr.pb
 product/etc/CarrierSettings/a1_mk.pb
 product/etc/CarrierSettings/a1_si.pb
 product/etc/CarrierSettings/ahamo_jp.pb
+product/etc/CarrierSettings/airbus_de.pb
+product/etc/CarrierSettings/airbus_fr.pb
 product/etc/CarrierSettings/airtel_in.pb
 product/etc/CarrierSettings/ais_th.pb
+product/etc/CarrierSettings/alcom_fi.pb
 product/etc/CarrierSettings/altice_us.pb
+product/etc/CarrierSettings/alticeroaming_us.pb
 product/etc/CarrierSettings/andorratelecom_ad.pb
 product/etc/CarrierSettings/antel_uy.pb
 product/etc/CarrierSettings/appalachian_us.pb
@@ -18,12 +24,14 @@ product/etc/CarrierSettings/apt_tw.pb
 product/etc/CarrierSettings/asda_gb.pb
 product/etc/CarrierSettings/assurance_us.pb
 product/etc/CarrierSettings/astca_as.pb
+product/etc/CarrierSettings/astoundbroadband_us.pb
 product/etc/CarrierSettings/att5g_us.pb
 product/etc/CarrierSettings/att5gsa_us.pb
 product/etc/CarrierSettings/att_mx.pb
 product/etc/CarrierSettings/att_us.pb
 product/etc/CarrierSettings/attbootstrap_us.pb
 product/etc/CarrierSettings/attmvnos_us.pb
+product/etc/CarrierSettings/axis_id.pb
 product/etc/CarrierSettings/base_be.pb
 product/etc/CarrierSettings/batelco_bh.pb
 product/etc/CarrierSettings/bell_ca.pb
@@ -49,7 +57,11 @@ product/etc/CarrierSettings/chatr_ca.pb
 product/etc/CarrierSettings/chinamobile_hk.pb
 product/etc/CarrierSettings/cht_tw.pb
 product/etc/CarrierSettings/cityfone_ca.pb
+product/etc/CarrierSettings/claro_br.pb
+product/etc/CarrierSettings/claro_cl.pb
+product/etc/CarrierSettings/claro_co.pb
 product/etc/CarrierSettings/claro_pr.pb
+product/etc/CarrierSettings/commonmvnxatt_us.pb
 product/etc/CarrierSettings/congstar_de.pb
 product/etc/CarrierSettings/consumercellularatt_us.pb
 product/etc/CarrierSettings/consumercellulartmo_us.pb
@@ -64,6 +76,7 @@ product/etc/CarrierSettings/cspire_us.pb
 product/etc/CarrierSettings/default.pb
 product/etc/CarrierSettings/digi_hu.pb
 product/etc/CarrierSettings/digi_my.pb
+product/etc/CarrierSettings/digi_pt.pb
 product/etc/CarrierSettings/digi_ro.pb
 product/etc/CarrierSettings/digimobil_es.pb
 product/etc/CarrierSettings/dish5gsa_us.pb
@@ -72,15 +85,20 @@ product/etc/CarrierSettings/dito_ph.pb
 product/etc/CarrierSettings/dna_fi.pb
 product/etc/CarrierSettings/docomo_jp.pb
 product/etc/CarrierSettings/docomomvno_jp.pb
+product/etc/CarrierSettings/docomopacific_us.pb
 product/etc/CarrierSettings/dtac_th.pb
 product/etc/CarrierSettings/du_ae.pb
 product/etc/CarrierSettings/eastlink_ca.pb
 product/etc/CarrierSettings/ee_gb.pb
+product/etc/CarrierSettings/eeyoumobility_ca.pb
 product/etc/CarrierSettings/eir_ie.pb
 product/etc/CarrierSettings/elisa1_fi.pb
 product/etc/CarrierSettings/elisa2_fi.pb
 product/etc/CarrierSettings/elisa_ee.pb
+product/etc/CarrierSettings/enetworks_gy.pb
 product/etc/CarrierSettings/enreach_nl.pb
+product/etc/CarrierSettings/entel_cl.pb
+product/etc/CarrierSettings/epic_mt.pb
 product/etc/CarrierSettings/eplus_de.pb
 product/etc/CarrierSettings/erate_no.pb
 product/etc/CarrierSettings/esn_gb.pb
@@ -90,7 +108,7 @@ product/etc/CarrierSettings/evolve_us.pb
 product/etc/CarrierSettings/fastweb_it.pb
 product/etc/CarrierSettings/fet_tw.pb
 product/etc/CarrierSettings/fi_at.pb
-product/etc/CarrierSettings/fi_us.pb
+product/etc/CarrierSettings/fi_tmo_us.pb
 product/etc/CarrierSettings/fido_ca.pb
 product/etc/CarrierSettings/finetwork_es.pb
 product/etc/CarrierSettings/firstnet_us.pb
@@ -98,7 +116,10 @@ product/etc/CarrierSettings/firstnetpacific2_us.pb
 product/etc/CarrierSettings/firstnetpacific_us.pb
 product/etc/CarrierSettings/fizz_ca.pb
 product/etc/CarrierSettings/fl1_li.pb
+product/etc/CarrierSettings/foroyatele_fo.pb
 product/etc/CarrierSettings/free_fr.pb
+product/etc/CarrierSettings/free_gp.pb
+product/etc/CarrierSettings/free_mq.pb
 product/etc/CarrierSettings/free_re.pb
 product/etc/CarrierSettings/freedommobile_ca.pb
 product/etc/CarrierSettings/gamma_gb.pb
@@ -107,6 +128,8 @@ product/etc/CarrierSettings/gibtel_gi.pb
 product/etc/CarrierSettings/giffgaff_gb.pb
 product/etc/CarrierSettings/giga_sg.pb
 product/etc/CarrierSettings/globe_ph.pb
+product/etc/CarrierSettings/gomobile_mt.pb
+product/etc/CarrierSettings/grameenphone_bd.pb
 product/etc/CarrierSettings/guuk_es.pb
 product/etc/CarrierSettings/h3_at.pb
 product/etc/CarrierSettings/h3_gb.pb
@@ -114,6 +137,7 @@ product/etc/CarrierSettings/h3_ie.pb
 product/etc/CarrierSettings/h3_se.pb
 product/etc/CarrierSettings/h3g27202_ie.pb
 product/etc/CarrierSettings/halebop_se.pb
+product/etc/CarrierSettings/helium_us.pb
 product/etc/CarrierSettings/help_at.pb
 product/etc/CarrierSettings/homobile_it.pb
 product/etc/CarrierSettings/hotmobile_il.pb
@@ -121,9 +145,15 @@ product/etc/CarrierSettings/ice_no.pb
 product/etc/CarrierSettings/idea_in.pb
 product/etc/CarrierSettings/idmobile_gb.pb
 product/etc/CarrierSettings/iliad_it.pb
+product/etc/CarrierSettings/indosat_id.pb
 product/etc/CarrierSettings/inland_us.pb
+product/etc/CarrierSettings/iwireless_us.pb
+product/etc/CarrierSettings/jazz_pk.pb
 product/etc/CarrierSettings/jazztel_es.pb
+product/etc/CarrierSettings/jcommobile_jp.pb
+product/etc/CarrierSettings/kddi5gsa_jp.pb
 product/etc/CarrierSettings/kddi_jp.pb
+product/etc/CarrierSettings/kddimvno5gsa_jp.pb
 product/etc/CarrierSettings/kddimvno_jp.pb
 product/etc/CarrierSettings/kena_it.pb
 product/etc/CarrierSettings/koodo_ca.pb
@@ -131,6 +161,7 @@ product/etc/CarrierSettings/kpn_nl.pb
 product/etc/CarrierSettings/lebara_es.pb
 product/etc/CarrierSettings/lebara_fr.pb
 product/etc/CarrierSettings/lebara_gb.pb
+product/etc/CarrierSettings/lebara_nl.pb
 product/etc/CarrierSettings/liberty_pr.pb
 product/etc/CarrierSettings/lifecell_ua.pb
 product/etc/CarrierSettings/linemo_jp.pb
@@ -140,18 +171,33 @@ product/etc/CarrierSettings/lowi_es.pb
 product/etc/CarrierSettings/luckymobile_ca.pb
 product/etc/CarrierSettings/lum_ca.pb
 product/etc/CarrierSettings/lyca_es.pb
+product/etc/CarrierSettings/lyca_us.pb
+product/etc/CarrierSettings/lycamobile_gb.pb
+product/etc/CarrierSettings/lycamobile_pt.pb
+product/etc/CarrierSettings/lycamobile_se.pb
 product/etc/CarrierSettings/m1_sg.pb
+product/etc/CarrierSettings/magticom_ge.pb
 product/etc/CarrierSettings/manxcontract_im.pb
 product/etc/CarrierSettings/manxprepaid_im.pb
 product/etc/CarrierSettings/masmovil_es.pb
 product/etc/CarrierSettings/maxis_my.pb
+product/etc/CarrierSettings/mediacom_us.pb
+product/etc/CarrierSettings/melita_mt.pb
 product/etc/CarrierSettings/meo_pt.pb
 product/etc/CarrierSettings/metropcs_us.pb
+product/etc/CarrierSettings/mobifone_vn.pb
 product/etc/CarrierSettings/mobily_sa.pb
 product/etc/CarrierSettings/monacotelecom_mc.pb
+product/etc/CarrierSettings/movistar_co.pb
 product/etc/CarrierSettings/movistar_es.pb
 product/etc/CarrierSettings/movistar_mx.pb
+product/etc/CarrierSettings/mucho_ch.pb
+product/etc/CarrierSettings/mvnoconnect_us.pb
+product/etc/CarrierSettings/nema_fo.pb
+product/etc/CarrierSettings/netcomgroup_fr.pb
+product/etc/CarrierSettings/nexphone_ch.pb
 product/etc/CarrierSettings/nextech_us.pb
+product/etc/CarrierSettings/no_sim.pb
 product/etc/CarrierSettings/nos_pt.pb
 product/etc/CarrierSettings/nova_gr.pb
 product/etc/CarrierSettings/nova_is.pb
@@ -162,9 +208,12 @@ product/etc/CarrierSettings/o2postpaid_gb.pb
 product/etc/CarrierSettings/o2prepaid_de.pb
 product/etc/CarrierSettings/o2prepaid_gb.pb
 product/etc/CarrierSettings/omantel_om.pb
+product/etc/CarrierSettings/one_me.pb
 product/etc/CarrierSettings/onecall_no.pb
+product/etc/CarrierSettings/only_yt.pb
 product/etc/CarrierSettings/ooredoo_kw.pb
 product/etc/CarrierSettings/ooredoo_qa.pb
+product/etc/CarrierSettings/optimera_us.pb
 product/etc/CarrierSettings/optus_au.pb
 product/etc/CarrierSettings/orange_be.pb
 product/etc/CarrierSettings/orange_es.pb
@@ -182,18 +231,24 @@ product/etc/CarrierSettings/pcmobilebell_ca.pb
 product/etc/CarrierSettings/pelephone_il.pb
 product/etc/CarrierSettings/pepephone_es.pb
 product/etc/CarrierSettings/play_pl.pb
+product/etc/CarrierSettings/plintron_us.pb
 product/etc/CarrierSettings/plus_pl.pb
 product/etc/CarrierSettings/post_lu.pb
+product/etc/CarrierSettings/postemobile_it.pb
+product/etc/CarrierSettings/povo5gsa_jp.pb
 product/etc/CarrierSettings/povo_jp.pb
 product/etc/CarrierSettings/proximus_be.pb
 product/etc/CarrierSettings/publicmobile_ca.pb
+product/etc/CarrierSettings/pwg_us.pb
+product/etc/CarrierSettings/qlink_us.pb
 product/etc/CarrierSettings/r_es.pb
 product/etc/CarrierSettings/racc_es.pb
 product/etc/CarrierSettings/rakuten_jp.pb
-product/etc/CarrierSettings/reachmobileatt_us.pb
 product/etc/CarrierSettings/redpocketatt_us.pb
 product/etc/CarrierSettings/redpockettmo_us.pb
+product/etc/CarrierSettings/republicwireless_us.pb
 product/etc/CarrierSettings/rjio_in.pb
+product/etc/CarrierSettings/robi_bd.pb
 product/etc/CarrierSettings/rogers5g_ca.pb
 product/etc/CarrierSettings/rogers_ca.pb
 product/etc/CarrierSettings/rogerswpn_ca.pb
@@ -210,34 +265,47 @@ product/etc/CarrierSettings/singtel_sg.pb
 product/etc/CarrierSettings/skinny_nz.pb
 product/etc/CarrierSettings/skt_kr.pb
 product/etc/CarrierSettings/sky_gb.pb
+product/etc/CarrierSettings/sky_ie.pb
 product/etc/CarrierSettings/skylo_zz.pb
 product/etc/CarrierSettings/smart_ph.pb
+product/etc/CarrierSettings/smartfren_id.pb
 product/etc/CarrierSettings/smartone_hk.pb
 product/etc/CarrierSettings/smarty_gb.pb
 product/etc/CarrierSettings/softbank_jp.pb
 product/etc/CarrierSettings/solomobile_ca.pb
 product/etc/CarrierSettings/spark_nz.pb
 product/etc/CarrierSettings/spectrum_us.pb
+product/etc/CarrierSettings/spectrummso_us.pb
+product/etc/CarrierSettings/spectrummsotest_us.pb
 product/etc/CarrierSettings/spmtelecom_pm.pb
 product/etc/CarrierSettings/sprint_us.pb
 product/etc/CarrierSettings/sprintprepaid_us.pb
 product/etc/CarrierSettings/sprintwholesale_us.pb
 product/etc/CarrierSettings/spusu_at.pb
+product/etc/CarrierSettings/spusu_ch.pb
+product/etc/CarrierSettings/spusu_gb.pb
+product/etc/CarrierSettings/spusu_it.pb
+product/etc/CarrierSettings/ssimobile_ca.pb
 product/etc/CarrierSettings/starhub_sg.pb
 product/etc/CarrierSettings/stc_bh.pb
 product/etc/CarrierSettings/stc_kw.pb
 product/etc/CarrierSettings/stc_sa.pb
 product/etc/CarrierSettings/strata_us.pb
 product/etc/CarrierSettings/sunrise_ch.pb
+product/etc/CarrierSettings/superdrug_gb.pb
 product/etc/CarrierSettings/sweno_es.pb
 product/etc/CarrierSettings/swisscom_ch.pb
 product/etc/CarrierSettings/swisscom_li.pb
+product/etc/CarrierSettings/swisscommvno_ch.pb
 product/etc/CarrierSettings/talkmobile_gb.pb
 product/etc/CarrierSettings/tango_lu.pb
 product/etc/CarrierSettings/tango_us.pb
 product/etc/CarrierSettings/tbaytel_ca.pb
+product/etc/CarrierSettings/tchibo_at.pb
 product/etc/CarrierSettings/tchibo_de.pb
 product/etc/CarrierSettings/tdc_dk.pb
+product/etc/CarrierSettings/telavox_be.pb
+product/etc/CarrierSettings/telavox_se.pb
 product/etc/CarrierSettings/telcel_mx.pb
 product/etc/CarrierSettings/telco_re.pb
 product/etc/CarrierSettings/tele2_ee.pb
@@ -249,15 +317,18 @@ product/etc/CarrierSettings/telekom_de.pb
 product/etc/CarrierSettings/telekom_gr.pb
 product/etc/CarrierSettings/telekom_hr.pb
 product/etc/CarrierSettings/telekom_hu.pb
+product/etc/CarrierSettings/telekom_me.pb
 product/etc/CarrierSettings/telekom_mk.pb
 product/etc/CarrierSettings/telekom_pl.pb
 product/etc/CarrierSettings/telekom_ro.pb
 product/etc/CarrierSettings/telekom_si.pb
 product/etc/CarrierSettings/telekom_sk.pb
+product/etc/CarrierSettings/telemach_hr.pb
 product/etc/CarrierSettings/telemach_si.pb
 product/etc/CarrierSettings/telenet_be.pb
 product/etc/CarrierSettings/telenor_dk.pb
 product/etc/CarrierSettings/telenor_no.pb
+product/etc/CarrierSettings/telenor_pk.pb
 product/etc/CarrierSettings/telenor_se.pb
 product/etc/CarrierSettings/telia_dk.pb
 product/etc/CarrierSettings/telia_ee.pb
@@ -265,15 +336,21 @@ product/etc/CarrierSettings/telia_fi.pb
 product/etc/CarrierSettings/telia_lt.pb
 product/etc/CarrierSettings/telia_no.pb
 product/etc/CarrierSettings/telia_se.pb
+product/etc/CarrierSettings/telkomsel_id.pb
+product/etc/CarrierSettings/tello_us.pb
 product/etc/CarrierSettings/telstra_au.pb
 product/etc/CarrierSettings/telus_ca.pb
 product/etc/CarrierSettings/tesco_gb.pb
+product/etc/CarrierSettings/test001_zz.pb
 product/etc/CarrierSettings/three_dk.pb
+product/etc/CarrierSettings/tigo_co.pb
+product/etc/CarrierSettings/tim_br.pb
 product/etc/CarrierSettings/tim_it.pb
 product/etc/CarrierSettings/tmobile_at.pb
 product/etc/CarrierSettings/tmobile_cz.pb
 product/etc/CarrierSettings/tmobile_nl.pb
 product/etc/CarrierSettings/tmobile_us.pb
+product/etc/CarrierSettings/tmobileprivate_us.pb
 product/etc/CarrierSettings/tmomvno_nl.pb
 product/etc/CarrierSettings/tmomvno_us.pb
 product/etc/CarrierSettings/tracfoneatt_us.pb
@@ -295,6 +372,7 @@ product/etc/CarrierSettings/ultra_us.pb
 product/etc/CarrierSettings/umobile_my.pb
 product/etc/CarrierSettings/unifi_my.pb
 product/etc/CarrierSettings/unionwireless_us.pb
+product/etc/CarrierSettings/unitedwireless_us.pb
 product/etc/CarrierSettings/uqmobile5gsa_jp.pb
 product/etc/CarrierSettings/uqmobile_jp.pb
 product/etc/CarrierSettings/uscc_us.pb
@@ -302,6 +380,7 @@ product/etc/CarrierSettings/verizon_us.pb
 product/etc/CarrierSettings/verymobile_it.pb
 product/etc/CarrierSettings/viaero_us.pb
 product/etc/CarrierSettings/videotron_ca.pb
+product/etc/CarrierSettings/viettel_vn.pb
 product/etc/CarrierSettings/vimla_se.pb
 product/etc/CarrierSettings/vinaphone_vn.pb
 product/etc/CarrierSettings/virgin_ca.pb
@@ -311,6 +390,8 @@ product/etc/CarrierSettings/virgintelco_es.pb
 product/etc/CarrierSettings/visible_us.pb
 product/etc/CarrierSettings/visiblev_us.pb
 product/etc/CarrierSettings/viti_pf.pb
+product/etc/CarrierSettings/vivacom_bg.pb
+product/etc/CarrierSettings/vivo_br.pb
 product/etc/CarrierSettings/vodafone_au.pb
 product/etc/CarrierSettings/vodafone_cz.pb
 product/etc/CarrierSettings/vodafone_de.pb
@@ -320,6 +401,7 @@ product/etc/CarrierSettings/vodafone_gr.pb
 product/etc/CarrierSettings/vodafone_hu.pb
 product/etc/CarrierSettings/vodafone_ie.pb
 product/etc/CarrierSettings/vodafone_in.pb
+product/etc/CarrierSettings/vodafone_is.pb
 product/etc/CarrierSettings/vodafone_it.pb
 product/etc/CarrierSettings/vodafone_nl.pb
 product/etc/CarrierSettings/vodafone_nz.pb
@@ -328,10 +410,12 @@ product/etc/CarrierSettings/vodafone_pt.pb
 product/etc/CarrierSettings/vodafone_qa.pb
 product/etc/CarrierSettings/vodafone_ro.pb
 product/etc/CarrierSettings/vodafone_tr.pb
+product/etc/CarrierSettings/walmart_mx.pb
 product/etc/CarrierSettings/webbing_hk.pb
 product/etc/CarrierSettings/windtre_it.pb
 product/etc/CarrierSettings/xfinity2_us.pb
 product/etc/CarrierSettings/xfinity_us.pb
+product/etc/CarrierSettings/xfinitymso_us.pb
 product/etc/CarrierSettings/yes_my.pb
 product/etc/CarrierSettings/yesss_at.pb
 product/etc/CarrierSettings/yettel_bg.pb
@@ -341,3 +425,4 @@ product/etc/CarrierSettings/zain_bh.pb
 product/etc/CarrierSettings/zain_kw.pb
 product/etc/CarrierSettings/zain_sa.pb
 product/etc/CarrierSettings/zeop_re.pb
+product/etc/CarrierSettings/ztar_us.pb

cheetah/proprietary-files.txt

@@ -3,8 +3,8 @@
 # product partition
 
 # AiAi
-product/priv-app/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore.apk;PRESIGNED
-product/priv-app/DevicePersonalizationPrebuiltPixel2022-v.U.14.playstore/DevicePersonalizationPrebuiltPixel2022-v.U.14.playstore.apk;PRESIGNED
+product/priv-app/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01.apk;PRESIGNED
+product/priv-app/DevicePersonalizationPrebuiltPixel2022-U.32_V.7_playstore_aiai_20240725.00_RC08/DevicePersonalizationPrebuiltPixel2022-U.32_V.7_playstore_aiai_20240725.00_RC08.apk;PRESIGNED
 
 # Audio
 product/etc/ambient/matcher_tah.leveldb
@@ -20,6 +20,11 @@ product/priv-app/GoogleCamera/GoogleCamera.apk;OVERRIDES=Aperture,Camera2;PRESIG
 product/etc/permissions/androidx.camera.extensions.impl.xml
 product/priv-app/PixelCameraServices/PixelCameraServices.apk;PRESIGNED
 
+# Camera services
+product/etc/permissions/com.google.pixel.camera.connectivity.impl.xml
+product/etc/permissions/com.google.pixel.camera.services.cameraidremapper.impl.xml
+product/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.impl.xml
+
 # Felica
 product/etc/felica/common.cfg
 product/etc/felica/mfm.cfg
@@ -61,7 +66,7 @@ product/lib/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmengin
 product/lib/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmjavaplugin.so
 product/lib64/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmengine.so
 product/lib64/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmjavaplugin.so
-product/priv-app/CarrierSettings_signed_45.0.591154042/CarrierSettings_signed_45.0.591154042.apk;PRESIGNED
+product/priv-app/CarrierSettings_signed_51.0.707712815/CarrierSettings_signed_51.0.707712815.apk;PRESIGNED
 product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
 product/priv-app/ConnMO/ConnMO.apk
 product/priv-app/DCMO/DCMO.apk
@@ -82,6 +87,11 @@ product/priv-app/AppDirectedSMSService/AppDirectedSMSService.apk;PRESIGNED
 product/priv-app/OemDmTrigger/OemDmTrigger.apk
 product/priv-app/WfcActivation/WfcActivation.apk;PRESIGNED
 
+# system partition
+
+# IMS
+system/bin/oem-iptables-init.sh
+
 # system_ext partition
 
 # Camera extensions
@@ -92,15 +102,23 @@ system_ext/framework/com.google.android.camera.experimental2022_system.jar
 system_ext/framework/com.google.android.camera.extensions.jar
 system_ext/framework/com.google.android.camerax.extensions.jar
 
+# Camera services
+system_ext/app/PersistentBackgroundCameraServices/PersistentBackgroundCameraServices.apk
+system_ext/etc/permissions/com.google.pixel.camera.connectivity.xml
+system_ext/etc/permissions/com.google.pixel.camera.services.cameraidremapper.xml
+system_ext/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.xml
+system_ext/etc/vintf/manifest/com.google.pixel.camera.services@1.0-service-google.xml
+system_ext/framework/com.google.pixel.camera.connectivity.jar
+system_ext/framework/com.google.pixel.camera.services.cameraidremapper.jar
+system_ext/framework/com.google.pixel.camera.services.lyricconfigprovider.jar
+
 # Edge TPU
 system_ext/bin/hw/vendor.google.edgetpu_app_service@1.0-service
 system_ext/etc/init/vendor.google.edgetpu_app_service@1.0-service.rc
 system_ext/etc/public.libraries-google.txt
 system_ext/etc/vintf/manifest/vendor.google.edgetpu_app_service@1.0-service.xml
-system_ext/lib/libedgetpu_dba.google.so
 system_ext/lib64/com.google.edgetpu_app_service-V3-ndk.so
 system_ext/lib64/com.google.edgetpu_vendor_service-V2-ndk.so
-system_ext/lib64/libedgetpu_dba.google.so
 
 # HBM
 system_ext/lib64/libhbmsvmanager_jni.so;SYMLINK=system_ext/priv-app/HbmSVManager/lib/arm64/libhbmsvmanager_jni.so
@@ -120,6 +138,11 @@ system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.
 system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED
 system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED
 
+# IWLAN
+system_ext/etc/permissions/privapp-permlist_com.google.pixel.iwlan.xml
+system_ext/etc/sysconfig/sysconfig_com.google.pixel.iwlan.xml
+system_ext/priv-app/PixelIwlan/PixelIwlan.apk
+
 # Permissions
 system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-evolution.xml
 
@@ -143,6 +166,7 @@ system_ext/priv-app/EuiccSupportPixel/DKA_RC7_P22_EVT.in
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_P22_EVT.up
 system_ext/priv-app/EuiccSupportPixel/EuiccSupportPixel.apk;PRESIGNED
 system_ext/priv-app/EuiccSupportPixel/esim-full-ofl-v1.img
+system_ext/priv-app/EuiccSupportPixel/esim-full-v0-security.img
 system_ext/priv-app/EuiccSupportPixel/esim-full-v0.img
 system_ext/priv-app/EuiccSupportPixel/esim-full-v1.img
 system_ext/priv-app/EuiccSupportPixelPermissions/EuiccSupportPixelPermissions.apk;PRESIGNED

cheetah/rro_overlays/NfcOverlay/res/values/config.xml

@@ -30,7 +30,7 @@
     <item>38</item>
   </integer-array>
   <integer-array name="antenna_y">
-    <item>100</item>
+    <item>59</item>
   </integer-array>
   <bool name="nfc_observe_mode_supported">true</bool>
 </resources>

cheetah/rro_overlays/WifiOverlay/res/values/config.xml

@@ -167,4 +167,12 @@
          If equals to 0, it means there's no limit on the max number of channels to include per network.-->
     <integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>
 
+    <!-- Boolean indicating whether to disable firmware roaming when the device goes into idle mode.
+         true: firmware roaming will be disabled when the device goes into idle mode, and then
+               re-activated when the device exits idle mode.
+         false: firmware roaming will not be affected. -->
+    <bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
+
+    <!-- Boolean indicating whether to trigger bugreport for WiFi subsystem restart issue -->
+    <bool translatable="false" name ="config_wifi_subsystem_restart_bugreport_enabled">false</bool>
 </resources>

cheetah/setup-makefiles.py

@@ -0,0 +1 @@
+#!./extract-files.py --regenerate_makefiles

cheetah/setup-makefiles.sh

@@ -1,82 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-DEVICE=cheetah
-VENDOR=google
-
-# Load extract_utils and do some sanity checks
-MY_DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
-
-ANDROID_ROOT="${MY_DIR}/../../../.."
-
-export TARGET_ENABLE_CHECKELF=true
-
-HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
-if [ ! -f "${HELPER}" ]; then
-    echo "Unable to find helper script at ${HELPER}"
-    exit 1
-fi
-source "${HELPER}"
-
-function vendor_imports() {
-    cat <<EOF >>"$1"
-		"device/google/pantah",
-		"hardware/google/av",
-		"hardware/google/gchips",
-		"hardware/google/graphics/common",
-		"hardware/google/interfaces",
-		"hardware/google/pixel",
-EOF
-}
-
-function lib_to_package_fixup_vendor_variants() {
-    if [ "$2" != "vendor" ]; then
-        return 1
-    fi
-
-    case "$1" in
-        com.google.edgetpu_app_service-V3-ndk | \
-            com.google.edgetpu_vendor_service-V2-ndk)
-            echo "$1-vendor"
-            ;;
-        libprotobuf-cpp-full-21.12)
-            echo "libprotobuf-cpp-full"
-            ;;
-        libprotobuf-cpp-lite-21.12)
-            echo "libprotobuf-cpp-lite"
-            ;;
-        libacryl | \
-            libexynosv4l2) ;;
-        *)
-            return 1
-            ;;
-    esac
-}
-
-function lib_to_package_fixup() {
-    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
-        lib_to_package_fixup_proto_3_9_1 "$1" ||
-        lib_to_package_fixup_vendor_variants "$@"
-}
-
-# Initialize the helper
-setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
-
-# Warning headers and guards
-write_headers
-
-write_makefiles "${MY_DIR}/proprietary-files.txt"
-write_makefiles "${MY_DIR}/proprietary-files-carriersettings.txt"
-write_makefiles "${MY_DIR}/proprietary-files-vendor.txt"
-
-append_firmware_calls_to_makefiles "${MY_DIR}/proprietary-firmware.txt"
-
-# Finish
-write_footers

cheetah/skip-files-vendor.txt

@@ -1,11 +1,10 @@
 # Standard build output with vendor image build enabled
-apex/com.android.hardware.cas.apex
-apex/com.android.vndk.current.on_vendor.apex
 bin/[
 bin/acpi
 bin/awk
 bin/base64
 bin/basename
+bin/blkdiscard
 bin/blockdev
 bin/boringssl_self_test32
 bin/boringssl_self_test64
@@ -39,11 +38,12 @@ bin/du
 bin/dump/dump_aoc
 bin/dump/dump_devfreq
 bin/dump/dump_display
-bin/dump/dump_modem.sh
+bin/dump/dump_fingerprint
+bin/dump/dump_modem
 bin/dump/dump_modemlog
 bin/dump/dump_perf
 bin/dump/dump_pixel_metrics
-bin/dump/dump_power_gs201.sh
+bin/dump/dump_power
 bin/dump/dump_sensors
 bin/dump/dump_soc
 bin/dump/dump_storage
@@ -70,6 +70,7 @@ bin/getconf
 bin/getenforce
 bin/getevent
 bin/getfattr
+bin/getopt
 bin/getprop
 bin/gpiodetect
 bin/gpiofind
@@ -90,7 +91,7 @@ bin/hw/android.hardware.composer.hwc3-service.pixel
 bin/hw/android.hardware.drm-service.clearkey
 bin/hw/android.hardware.dumpstate-service
 bin/hw/android.hardware.gatekeeper-service.trusty
-bin/hw/android.hardware.graphics.allocator-V1-service
+bin/hw/android.hardware.graphics.allocator-V2-service
 bin/hw/android.hardware.health-service.gs201
 bin/hw/android.hardware.health.storage-service.default
 bin/hw/android.hardware.memtrack-service.pixel
@@ -100,11 +101,11 @@ bin/hw/android.hardware.power.stats-service.pixel
 bin/hw/android.hardware.secure_element@1.2-service-gto
 bin/hw/android.hardware.secure_element@1.2-service-gto-ese2
 bin/hw/android.hardware.security.keymint-service.trusty
+bin/hw/android.hardware.security.secretkeeper.trusty
 bin/hw/android.hardware.sensors-service.multihal
 bin/hw/android.hardware.thermal-service.pixel
 bin/hw/android.hardware.usb-service
 bin/hw/android.hardware.usb.gadget-service
-bin/hw/android.hardware.vibrator-service.cs40l26
 bin/hw/android.hardware.wifi-service
 bin/hw/disable_contaminant_detection.sh
 bin/hw/hostapd
@@ -263,10 +264,11 @@ etc/NOTICE.xml.gz
 etc/a2dp_audio_policy_configuration_7_0.xml
 etc/a2dp_in_audio_policy_configuration_7_0.xml
 etc/aconfig_flags.pb
+etc/aidl/hfp/hfp_codec_capabilities.xml
 etc/aidl/le_audio/aidl_audio_set_configurations.bfbs
-etc/aidl/le_audio/aidl_audio_set_configurations.json
 etc/aidl/le_audio/aidl_audio_set_scenarios.bfbs
-etc/aidl/le_audio/aidl_audio_set_scenarios.json
+etc/aidl/le_audio/aidl_default_audio_set_configurations.json
+etc/aidl/le_audio/aidl_default_audio_set_scenarios.json
 etc/aoc/BLUETOOTH.dat
 etc/aoc/HANDSET.dat
 etc/aoc/HANDSFREE.dat
@@ -295,6 +297,7 @@ etc/boringssl_self_test.no_zygote.rc
 etc/boringssl_self_test.zygote32.rc
 etc/boringssl_self_test.zygote64.rc
 etc/boringssl_self_test.zygote64_32.rc
+etc/bpf/filterPowerSupplyEvents.o
 etc/build_flags.json
 etc/default_volume_tables.xml
 etc/display_colordata_boe-nt37290_cal0.pb
@@ -327,25 +330,24 @@ etc/gnss/scd.conf
 etc/group
 etc/hearing_aid_audio_policy_configuration_7_0.xml
 etc/init.common.cfg
-etc/init.insmod.cheetah.cfg
 etc/init/android.hardware.audio.service.rc
 etc/init/android.hardware.boot-service.default-pixel.rc
 etc/init/android.hardware.cas@1.2-service.rc
 etc/init/android.hardware.drm-service.clearkey.rc
 etc/init/android.hardware.dumpstate-service.rc
 etc/init/android.hardware.gatekeeper-service.trusty.rc
-etc/init/android.hardware.graphics.allocator-aidl-service.rc
+etc/init/android.hardware.graphics.allocator2-aidl-service.rc
 etc/init/android.hardware.health-service.gs201.rc
 etc/init/android.hardware.power-service.pixel-libperfmgr.rc
 etc/init/android.hardware.power.stats-service.pixel.rc
 etc/init/android.hardware.secure_element@1.2-service-gto-ese2.rc
 etc/init/android.hardware.secure_element@1.2-service-gto.rc
 etc/init/android.hardware.security.keymint-service.trusty.rc
+etc/init/android.hardware.security.secretkeeper.trusty.rc
 etc/init/android.hardware.sensors-service-multihal.rc
 etc/init/android.hardware.thermal-service.pixel.rc
 etc/init/android.hardware.usb-service.rc
 etc/init/android.hardware.usb.gadget-service.rc
-etc/init/android.hardware.vibrator-service.cs40l26.rc
 etc/init/android.hardware.wifi-service.rc
 etc/init/android.hardware.wifi.supplicant-service.rc
 etc/init/atrace_categories.rc
@@ -355,15 +357,22 @@ etc/init/health-storage-default.rc
 etc/init/hostapd.android.rc
 etc/init/hw/init.cheetah.rc
 etc/init/hw/init.gs201.rc
+etc/init/hw/init.gs201.storage.rc
 etc/init/hw/init.gs201.usb.rc
 etc/init/hw/init.pantah.rc
 etc/init/hwc3-pixel.rc
 etc/init/init.aoc.rc
+etc/init/init.fingerprint.dump.rc
 etc/init/init.modem.rc
 etc/init/init.module.rc
+etc/init/init.pixel-mm-gs.rc
+etc/init/init.pixel-perf.rc
 etc/init/init.pixel.rc
 etc/init/init.storage.rc
 etc/init/init.touch.syna.rc
+etc/init/libg3a_gabc.rc
+etc/init/libg3a_gaf.rc
+etc/init/libg3a_ghawb.rc
 etc/init/memtrack.rc
 etc/init/nfc-service-default.rc
 etc/init/pixel-mm-gki.rc
@@ -373,6 +382,9 @@ etc/init/rebalance_interrupts-vendor.gs101.rc
 etc/init/storage.gs201.rc
 etc/init/vndservicemanager.rc
 etc/le_audio_codec_capabilities.xml
+etc/libg3a_standalone_gabc_rc
+etc/libg3a_standalone_gaf_rc
+etc/libg3a_standalone_ghawb_rc
 etc/libnfc-hal-st-proto1.conf
 etc/libnfc-hal-st.conf
 etc/libse-gto-hal.conf
@@ -408,7 +420,7 @@ etc/permissions/android.hardware.camera.full.xml
 etc/permissions/android.hardware.camera.raw.xml
 etc/permissions/android.hardware.context_hub.xml
 etc/permissions/android.hardware.device_unique_attestation.xml
-etc/permissions/android.hardware.hardware_keystore.xml
+etc/permissions/android.hardware.hardware_keystore_V3.xml
 etc/permissions/android.hardware.keystore.app_attest_key.xml
 etc/permissions/android.hardware.location.gps.prebuilt.xml
 etc/permissions/android.hardware.nfc.ese.xml
@@ -441,7 +453,6 @@ etc/permissions/android.hardware.wifi.direct.xml
 etc/permissions/android.hardware.wifi.passpoint.xml
 etc/permissions/android.hardware.wifi.rtt.xml
 etc/permissions/android.hardware.wifi.xml
-etc/permissions/android.software.contextualsearch.xml
 etc/permissions/android.software.device_id_attestation.xml
 etc/permissions/android.software.ipsec_tunnel_migration.xml
 etc/permissions/android.software.ipsec_tunnels.xml
@@ -451,11 +462,13 @@ etc/permissions/android.software.verified_boot.xml
 etc/permissions/android.software.vulkan.deqp.level.xml
 etc/permissions/aosp_excluded_hardware.xml
 etc/permissions/com.nxp.mifare.xml
+etc/permissions/features_com.android.virt.xml
 etc/permissions/handheld_core_hardware.xml
 etc/permissions/vendor.android.hardware.camera.preview-dis.xml
 etc/powerhint-a0.json
 etc/powerhint.json
 etc/r_submix_audio_policy_configuration.xml
+etc/selinux/genfs_labels_version.txt
 etc/selinux/plat_pub_versioned.cil
 etc/selinux/plat_sepolicy_vers.txt
 etc/selinux/precompiled_sepolicy
@@ -465,6 +478,7 @@ etc/selinux/precompiled_sepolicy.system_ext_sepolicy_and_mapping.sha256
 etc/selinux/selinux_denial_metadata
 etc/selinux/vendor_file_contexts
 etc/selinux/vendor_hwservice_contexts
+etc/selinux/vendor_keystore2_key_contexts
 etc/selinux/vendor_mac_permissions.xml
 etc/selinux/vendor_property_contexts
 etc/selinux/vendor_seapp_contexts
@@ -545,18 +559,19 @@ etc/vintf/manifest/android.hardware.health-service.gs201.xml
 etc/vintf/manifest/android.hardware.power-service.pixel.xml
 etc/vintf/manifest/android.hardware.power.stats-service.pixel.xml
 etc/vintf/manifest/android.hardware.security.keymint-service.trusty.xml
+etc/vintf/manifest/android.hardware.security.secretkeeper.trusty.xml
 etc/vintf/manifest/android.hardware.sensors-multihal.xml
 etc/vintf/manifest/android.hardware.thermal-service.pixel.xml
 etc/vintf/manifest/android.hardware.usb-service.xml
 etc/vintf/manifest/android.hardware.usb.gadget-service.xml
-etc/vintf/manifest/android.hardware.vibrator-service.cs40l26.xml
 etc/vintf/manifest/android.hardware.wifi-service.xml
 etc/vintf/manifest/android.hardware.wifi.hostapd.xml
 etc/vintf/manifest/android.hardware.wifi.supplicant.xml
 etc/vintf/manifest/bluetooth_audio.xml
 etc/vintf/manifest/health-storage-default.xml
 etc/vintf/manifest/hwc3-default.xml
-etc/vintf/manifest/manifest_gralloc_aidl.xml
+etc/vintf/manifest/manifest.xml
+etc/vintf/manifest/manifest_gralloc_aidl2.xml
 etc/vintf/manifest/memtrack.xml
 etc/vintf/manifest/nfc-service-default.xml
 etc/vintf/manifest/pixel-display-default.xml
@@ -579,7 +594,7 @@ firmware/fast_switch1.txt
 firmware/fast_switch2.txt
 firmware/fast_switch3.txt
 firmware/fast_switch4.txt
-lib/android.hardware.audio.common-V3-ndk.so
+lib/android.hardware.audio.common-V4-ndk.so
 lib/android.hardware.audio.common-util.so
 lib/android.hardware.audio.common@2.0.so
 lib/android.hardware.audio.common@5.0.so
@@ -593,13 +608,13 @@ lib/android.hardware.audio.effect@7.0.so
 lib/android.hardware.audio@7.0.so
 lib/android.hardware.audio@7.1-util.so
 lib/android.hardware.audio@7.1.so
-lib/android.hardware.bluetooth.audio-V4-ndk.so
+lib/android.hardware.bluetooth.audio-V5-ndk.so
 lib/android.hardware.bluetooth.audio-impl.so
 lib/android.hardware.bluetooth.audio@2.0.so
 lib/android.hardware.bluetooth.audio@2.1.so
 lib/android.hardware.common-V2-ndk.so
 lib/android.hardware.common.fmq-V1-ndk.so
-lib/android.hardware.graphics.common-V5-ndk.so
+lib/android.hardware.graphics.common-V6-ndk.so
 lib/android.hardware.graphics.common@1.0.so
 lib/android.hardware.graphics.common@1.1.so
 lib/android.hardware.graphics.common@1.2.so
@@ -615,12 +630,11 @@ lib/android.hidl.allocator@1.0.so
 lib/android.hidl.memory.token@1.0.so
 lib/android.hidl.memory@1.0.so
 lib/android.hidl.safe_union@1.0.so
-lib/android.media.audio.common.types-V3-ndk.so
+lib/android.media.audio.common.types-V4-ndk.so
 lib/android.system.suspend-V1-ndk.so
 lib/arm.graphics-V1-ndk.so
 lib/hw/android.hardware.audio.effect@7.0-impl.so
 lib/hw/android.hardware.audio@7.1-impl.so
-lib/hw/android.hardware.graphics.mapper@4.0-impl.so
 lib/hw/android.hardware.soundtrigger@2.3-impl.so
 lib/hw/android.hidl.memory@1.0-impl.so
 lib/hw/audio.bluetooth.default.so
@@ -630,8 +644,11 @@ lib/hw/audio.usb.default.so
 lib/hw/audio.usbv2.default.so
 lib/hw/gralloc.default.so
 lib/hw/local_time.default.so
+lib/hw/mapper.pixel.so
 lib/hw/power.default.so
 lib/hw/vibrator.default.so
+lib/libOpenCL.so
+lib/libaconfig_storage_read_api_cc.so
 lib/libalsautils.so
 lib/libalsautilsv2.so
 lib/libaudioutils.so
@@ -675,6 +692,8 @@ lib/libxml2.so
 lib/libz.so
 lib/mediacas/libclearkeycasplugin.so
 lib/mediadrm/libdrmclearkeyplugin.so
+lib/modules/6lowpan.ko
+lib/modules/8021q.ko
 lib/modules/acpm_flexpmu_dbg.ko
 lib/modules/acpm_mbox_test.ko
 lib/modules/aoc_alsa_dev.ko
@@ -683,41 +702,61 @@ lib/modules/aoc_channel_dev.ko
 lib/modules/aoc_char_dev.ko
 lib/modules/aoc_control_dev.ko
 lib/modules/aoc_core.ko
+lib/modules/aoc_tbn_service_dev.ko
+lib/modules/aoc_unit_test_dev.ko
 lib/modules/aoc_usb_driver.ko
 lib/modules/aoc_uwb_platform_drv.ko
 lib/modules/aoc_uwb_service_dev.ko
-lib/modules/arm-memlat-mon.ko
+lib/modules/aqc111.ko
 lib/modules/arm_dsu_pmu.ko
+lib/modules/asix.ko
 lib/modules/at24.ko
 lib/modules/audiometrics.ko
+lib/modules/ax88179_178a.ko
+lib/modules/bbd_pps_gpio.ko
 lib/modules/bc_max77759.ko
 lib/modules/bcm47765.ko
 lib/modules/bcm_dbg.ko
 lib/modules/bcmdhd4389.ko
-lib/modules/bigocean.ko
-lib/modules/boot_device_spi.ko
+lib/modules/bigwave.ko
+lib/modules/bluetooth.ko
+lib/modules/bsd_comp.ko
+lib/modules/btbcm.ko
+lib/modules/btpower.ko
+lib/modules/btqca.ko
 lib/modules/bts.ko
+lib/modules/btsdio.ko
+lib/modules/can-bcm.ko
+lib/modules/can-dev.ko
+lib/modules/can-gw.ko
+lib/modules/can-raw.ko
+lib/modules/can.ko
+lib/modules/cdc-acm.ko
+lib/modules/cdc_eem.ko
+lib/modules/cdc_ether.ko
+lib/modules/cdc_ncm.ko
+lib/modules/cfg80211.ko
 lib/modules/cl_dsp-core.ko
-lib/modules/clk_exynos.ko
+lib/modules/clk_exynos_gs.ko
 lib/modules/cmupmucal.ko
-lib/modules/coresight-etm4x.ko
-lib/modules/coresight-funnel.ko
-lib/modules/coresight-replicator.ko
-lib/modules/coresight-tmc.ko
-lib/modules/coresight.ko
+lib/modules/cnss2.ko
+lib/modules/cnss_nl.ko
+lib/modules/cnss_plat_ipc_qmi_svc.ko
+lib/modules/cnss_prealloc.ko
+lib/modules/cnss_utils.ko
 lib/modules/cp_thermal_zone.ko
 lib/modules/cpif.ko
 lib/modules/cpif_page.ko
-lib/modules/crc-t10dif.ko
-lib/modules/crct10dif_common.ko
-lib/modules/crct10dif_generic.ko
+lib/modules/cs35l45-cs-dsp.ko
 lib/modules/cs40l26-core.ko
 lib/modules/cs40l26-i2c.ko
 lib/modules/dbgcore-dump.ko
 lib/modules/debug-reboot.ko
 lib/modules/debug-snapshot-debug-kinfo.ko
-lib/modules/drv2624.ko
+lib/modules/diag.ko
+lib/modules/drm_display_helper.ko
 lib/modules/dss.ko
+lib/modules/dw3000-core-tests.ko
 lib/modules/dw3000.ko
 lib/modules/dwc3-exynos-usb.ko
 lib/modules/ect_parser.ko
@@ -734,6 +773,7 @@ lib/modules/exynos-cpuhp.ko
 lib/modules/exynos-cpupm.ko
 lib/modules/exynos-debug-test.ko
 lib/modules/exynos-dm.ko
+lib/modules/exynos-drm-audio.ko
 lib/modules/exynos-drm.ko
 lib/modules/exynos-ecc-handler.ko
 lib/modules/exynos-pcie-iommu.ko
@@ -743,7 +783,6 @@ lib/modules/exynos-pd_el3.ko
 lib/modules/exynos-pd_hsi0.ko
 lib/modules/exynos-pm.ko
 lib/modules/exynos-pmu-if.ko
-lib/modules/exynos-reboot.ko
 lib/modules/exynos-seclog.ko
 lib/modules/exynos_devfreq.ko
 lib/modules/exynos_mct.ko
@@ -752,7 +791,9 @@ lib/modules/exynos_pm_qos.ko
 lib/modules/exynos_tty.ko
 lib/modules/fips140.ko
 lib/modules/focal_touch.ko
+lib/modules/ftdi_sio.ko
 lib/modules/g2d.ko
+lib/modules/goodix_brl_touch.ko
 lib/modules/goodixfp.ko
 lib/modules/goog_touch_interface.ko
 lib/modules/google-battery.ko
@@ -760,32 +801,50 @@ lib/modules/google-bms.ko
 lib/modules/google-charger.ko
 lib/modules/google-cpm.ko
 lib/modules/google_bcl.ko
+lib/modules/google_ccd.ko
 lib/modules/google_dock.ko
 lib/modules/google_dual_batt_gauge.ko
-lib/modules/governor_memlat.ko
+lib/modules/google_tcpci_shim.ko
+lib/modules/google_wlan_mac.ko
 lib/modules/gpu_cooling.ko
 lib/modules/gs-chipid.ko
+lib/modules/gs-drm-connector.ko
+lib/modules/gs-panel.ko
 lib/modules/gs_acpm.ko
+lib/modules/gs_governor_memlat.ko
+lib/modules/gs_governor_utils.ko
+lib/modules/gs_perf_mon.ko
 lib/modules/gs_thermal.ko
 lib/modules/gsa.ko
 lib/modules/gsa_gsc.ko
 lib/modules/gvotable.ko
 lib/modules/gxp.ko
+lib/modules/gzvm.ko
 lib/modules/hardlockup-debug.ko
 lib/modules/hardlockup-watchdog.ko
+lib/modules/hci_uart.ko
 lib/modules/heatmap.ko
+lib/modules/hidp.ko
 lib/modules/i2c-acpm.ko
 lib/modules/i2c-dev.ko
 lib/modules/i2c-exynos5.ko
+lib/modules/ieee802154.ko
+lib/modules/ieee802154_6lowpan.ko
+lib/modules/ieee802154_socket.ko
 lib/modules/itmon.ko
 lib/modules/janeiro.ko
 lib/modules/kernel-top.ko
 lib/modules/keycombo.ko
 lib/modules/keydebug.ko
+lib/modules/kheaders.ko
+lib/modules/l2tp_core.ko
+lib/modules/l2tp_ppp.ko
+lib/modules/libarc4.ko
+lib/modules/ln8411.ko
 lib/modules/logbuffer.ko
 lib/modules/lwis.ko
-lib/modules/lzo-rle.ko
-lib/modules/lzo.ko
+lib/modules/mac80211.ko
+lib/modules/mac802154.ko
 lib/modules/mailbox-wc.ko
 lib/modules/mali_kbase.ko
 lib/modules/mali_kutf.ko
@@ -796,45 +855,74 @@ lib/modules/max20339.ko
 lib/modules/max77729-pmic.ko
 lib/modules/max77729_charger.ko
 lib/modules/max77729_uic.ko
-lib/modules/max77759_charger.ko
+lib/modules/max77759-charger.ko
 lib/modules/max77759_contaminant.ko
 lib/modules/max77759_helper.ko
+lib/modules/max77779-charger-i2c.ko
+lib/modules/max77779-charger.ko
+lib/modules/max77779-fg-i2c.ko
+lib/modules/max77779-fg.ko
+lib/modules/max77779-fwupdate.ko
+lib/modules/max77779-sp-i2c.ko
+lib/modules/max77779-sp.ko
+lib/modules/max77779-vimon-i2c.ko
+lib/modules/max77779-vimon.ko
+lib/modules/max77779_contaminant.ko
+lib/modules/max77779_i2cm.ko
+lib/modules/max77779_i2cm_i2c.ko
+lib/modules/max77779_pmic.ko
+lib/modules/max77779_pmic_i2c.ko
+lib/modules/max77779_pmic_irq.ko
+lib/modules/max77779_pmic_pinctrl.ko
+lib/modules/max77779_pmic_sgpio.ko
+lib/modules/max777x9_contaminant.ko
 lib/modules/mcps802154.ko
 lib/modules/mcps802154_region_fira.ko
 lib/modules/mcps802154_region_nfcc_coex.ko
 lib/modules/mcps802154_region_pctt.ko
-lib/modules/memlat-devfreq.ko
+lib/modules/mhi.ko
+lib/modules/mii.ko
 lib/modules/modules.alias
 lib/modules/modules.blocklist
 lib/modules/modules.dep
 lib/modules/modules.load
 lib/modules/modules.softdep
+lib/modules/nfc.ko
+lib/modules/nhc_dest.ko
+lib/modules/nhc_fragment.ko
+lib/modules/nhc_hop.ko
+lib/modules/nhc_ipv6.ko
+lib/modules/nhc_mobility.ko
+lib/modules/nhc_routing.ko
+lib/modules/nhc_udp.ko
 lib/modules/nitrous.ko
-lib/modules/null_blk.ko
-lib/modules/odpm.ko
-lib/modules/overheat_mitigation.ko
+lib/modules/odpm-whi.ko
 lib/modules/p9221.ko
 lib/modules/panel-boe-nt37290.ko
+lib/modules/panel-common.ko
 lib/modules/panel-samsung-drv.ko
 lib/modules/panel-samsung-emul.ko
+lib/modules/panel-samsung-s6e3fc3-l10.ko
 lib/modules/panel-samsung-s6e3fc3-p10.ko
 lib/modules/panel-samsung-s6e3fc3.ko
+lib/modules/panel-samsung-s6e3fc5.ko
 lib/modules/panel-samsung-s6e3hc2.ko
 lib/modules/panel-samsung-s6e3hc3-c10.ko
 lib/modules/panel-samsung-s6e3hc3.ko
 lib/modules/panel-samsung-s6e3hc4.ko
 lib/modules/panel-samsung-sofef01.ko
 lib/modules/pca9468.ko
-lib/modules/pcie-exynos-core.ko
+lib/modules/pcie-exynos-gs.ko
 lib/modules/pcie-exynos-gs201-rc-cal.ko
 lib/modules/phy-exynos-mipi-dsim.ko
 lib/modules/phy-exynos-mipi.ko
 lib/modules/phy-exynos-usbdrd-super.ko
-lib/modules/pinctrl-samsung-core.ko
+lib/modules/pinctrl-exynos-gs.ko
 lib/modules/pinctrl-slg51000.ko
 lib/modules/pinctrl-slg51002.ko
 lib/modules/pixel-boot-metrics.ko
 lib/modules/pixel-debug-test.ko
+lib/modules/pixel-reboot.ko
 lib/modules/pixel-suspend-diag.ko
 lib/modules/pixel_em.ko
 lib/modules/pixel_metrics.ko
@@ -844,9 +932,23 @@ lib/modules/pkvm-s2mpu.ko
 lib/modules/pl330.ko
 lib/modules/pmic_class.ko
 lib/modules/power_stats.ko
-lib/modules/pps-gpio.ko
-lib/modules/pps_core.ko
+lib/modules/ppp_deflate.ko
+lib/modules/ppp_generic.ko
+lib/modules/ppp_mppe.ko
+lib/modules/pppox.ko
+lib/modules/pptp.ko
+lib/modules/pwm-exynos.ko
+lib/modules/qmi_helpers.ko
+lib/modules/qrtr-mhi.ko
+lib/modules/qrtr.ko
+lib/modules/r8152.ko
+lib/modules/r8153_ecm.ko
+lib/modules/rfcomm.ko
+lib/modules/rfkill.ko
+lib/modules/rt4539_bl.ko
+lib/modules/rt9471_charger.ko
 lib/modules/rtc-s2mpg12.ko
+lib/modules/rtl8150.ko
 lib/modules/s2mpg12-key.ko
 lib/modules/s2mpg12-mfd.ko
 lib/modules/s2mpg12-powermeter.ko
@@ -855,7 +957,7 @@ lib/modules/s2mpg13-mfd.ko
 lib/modules/s2mpg13-powermeter.ko
 lib/modules/s2mpg13-regulator.ko
 lib/modules/s2mpg13_spmic_thermal.ko
-lib/modules/s2mpg1x-gpio-gs201.ko
+lib/modules/s2mpg1x-gpio.ko
 lib/modules/s3c2410_wdt.ko
 lib/modules/samsung-dma.ko
 lib/modules/samsung-iommu-group.ko
@@ -864,7 +966,6 @@ lib/modules/samsung_dma_heap.ko
 lib/modules/samsung_iommu.ko
 lib/modules/sbb-mux.ko
 lib/modules/sched_tp.ko
-lib/modules/scsi_debug.ko
 lib/modules/sec_touch.ko
 lib/modules/sg.ko
 lib/modules/shm_ipc.ko
@@ -873,16 +974,19 @@ lib/modules/slc_acpm.ko
 lib/modules/slc_dummy.ko
 lib/modules/slc_pmon.ko
 lib/modules/slc_pt.ko
+lib/modules/slcan.ko
 lib/modules/slg51000-core.ko
 lib/modules/slg51000-regulator.ko
 lib/modules/slg51002-core.ko
 lib/modules/slg51002-regulator.ko
+lib/modules/slhc.ko
 lib/modules/smfc.ko
 lib/modules/snd-soc-cs35l41-i2c.ko
 lib/modules/snd-soc-cs35l41-spi.ko
 lib/modules/snd-soc-cs35l41.ko
 lib/modules/snd-soc-cs35l45-i2c.ko
 lib/modules/snd-soc-cs35l45-spi.ko
+lib/modules/snd-soc-cs35l45-wm-adsp.ko
 lib/modules/snd-soc-cs35l45.ko
 lib/modules/snd-soc-cs40l26.ko
 lib/modules/snd-soc-wm-adsp.ko
@@ -890,6 +994,8 @@ lib/modules/softdog.ko
 lib/modules/spi-s3c64xx.ko
 lib/modules/spidev.ko
 lib/modules/sscoredump.ko
+lib/modules/sscoredump_sample_test.ko
+lib/modules/sscoredump_test.ko
 lib/modules/st21nfc.ko
 lib/modules/st33spi.ko
 lib/modules/st54spi.ko
@@ -898,6 +1004,7 @@ lib/modules/syna_touch.ko
 lib/modules/sysrq-hook.ko
 lib/modules/systrace.ko
 lib/modules/tcpci_max77759.ko
+lib/modules/tipc.ko
 lib/modules/touch_bus_negotiator.ko
 lib/modules/touch_offload.ko
 lib/modules/trusty-core.ko
@@ -905,25 +1012,30 @@ lib/modules/trusty-ipc.ko
 lib/modules/trusty-log.ko
 lib/modules/trusty-test.ko
 lib/modules/trusty-virtio.ko
-lib/modules/ufs-exynos-core.ko
+lib/modules/ufs-exynos-gs.ko
 lib/modules/ufs-pixel-fips140.ko
 lib/modules/usb_f_dm.ko
 lib/modules/usb_f_dm1.ko
 lib/modules/usb_f_etr_miu.ko
-lib/modules/usb_f_rndis.ko
 lib/modules/usb_psy.ko
 lib/modules/usbc_cooling_dev.ko
+lib/modules/usbnet.ko
+lib/modules/usbserial.ko
+lib/modules/vcan.ko
 lib/modules/vh_cgroup.ko
 lib/modules/vh_fs.ko
 lib/modules/vh_mm.ko
 lib/modules/vh_preemptirq_long.ko
 lib/modules/vh_sched.ko
 lib/modules/vh_thermal.ko
-lib/modules/wlan_ptracker.ko
+lib/modules/wlan.ko
+lib/modules/wlan_firmware_service.ko
+lib/modules/wwan.ko
 lib/modules/xhci-exynos.ko
 lib/modules/zcomp_cpu.ko
 lib/modules/zcomp_eh.ko
 lib/modules/zram.ko
+lib/modules/zram_gs.ko
 lib/modules/zsmalloc.ko
 lib/server_configurable_flags.so
 lib/soundfx/libaudiopreprocessing.so
@@ -935,12 +1047,10 @@ lib/soundfx/libhapticgenerator.so
 lib/soundfx/libldnhncr.so
 lib/soundfx/libreverbwrapper.so
 lib/soundfx/libvisualizer.so
-lib64/PixelVibratorFlagsL26.so
-lib64/PixelVibratorStats.so
 lib64/android.frameworks.sensorservice-V1-ndk.so
 lib64/android.frameworks.stats-V1-ndk.so
 lib64/android.frameworks.stats-V2-ndk.so
-lib64/android.hardware.audio.common-V3-ndk.so
+lib64/android.hardware.audio.common-V4-ndk.so
 lib64/android.hardware.audio.common-util.so
 lib64/android.hardware.audio.common@2.0.so
 lib64/android.hardware.audio.common@5.0.so
@@ -954,7 +1064,7 @@ lib64/android.hardware.audio.effect@7.0.so
 lib64/android.hardware.audio@7.0.so
 lib64/android.hardware.audio@7.1-util.so
 lib64/android.hardware.audio@7.1.so
-lib64/android.hardware.bluetooth.audio-V4-ndk.so
+lib64/android.hardware.bluetooth.audio-V5-ndk.so
 lib64/android.hardware.bluetooth.audio-impl.so
 lib64/android.hardware.bluetooth.audio@2.0.so
 lib64/android.hardware.bluetooth.audio@2.1.so
@@ -968,19 +1078,18 @@ lib64/android.hardware.cas@1.2.so
 lib64/android.hardware.common-V2-ndk.so
 lib64/android.hardware.common.fmq-V1-ndk.so
 lib64/android.hardware.drm-V1-ndk.so
+lib64/android.hardware.drm.common-V1-ndk.so
 lib64/android.hardware.dumpstate-V1-ndk.so
 lib64/android.hardware.gatekeeper-V1-ndk.so
-lib64/android.hardware.graphics.allocator-V1-ndk.so
 lib64/android.hardware.graphics.allocator-V2-ndk.so
 lib64/android.hardware.graphics.allocator@2.0.so
 lib64/android.hardware.graphics.allocator@3.0.so
 lib64/android.hardware.graphics.allocator@4.0.so
-lib64/android.hardware.graphics.common-V3-ndk.so
-lib64/android.hardware.graphics.common-V5-ndk.so
+lib64/android.hardware.graphics.common-V6-ndk.so
 lib64/android.hardware.graphics.common@1.0.so
 lib64/android.hardware.graphics.common@1.1.so
 lib64/android.hardware.graphics.common@1.2.so
-lib64/android.hardware.graphics.composer3-V3-ndk.so
+lib64/android.hardware.graphics.composer3-V4-ndk.so
 lib64/android.hardware.graphics.composer@2.1-resources.so
 lib64/android.hardware.graphics.composer@2.1.so
 lib64/android.hardware.graphics.composer@2.2-resources.so
@@ -991,13 +1100,13 @@ lib64/android.hardware.graphics.mapper@2.0.so
 lib64/android.hardware.graphics.mapper@2.1.so
 lib64/android.hardware.graphics.mapper@3.0.so
 lib64/android.hardware.graphics.mapper@4.0.so
-lib64/android.hardware.health-V3-ndk.so
+lib64/android.hardware.health-V4-ndk.so
 lib64/android.hardware.health.storage-V1-ndk.so
 lib64/android.hardware.memtrack-V1-ndk.so
 lib64/android.hardware.nfc-V1-ndk.so
 lib64/android.hardware.power-V1-ndk.so
 lib64/android.hardware.power-V2-ndk.so
-lib64/android.hardware.power-V5-ndk.so
+lib64/android.hardware.power-V6-ndk.so
 lib64/android.hardware.power.stats-V2-ndk.so
 lib64/android.hardware.power.stats-impl.gs-common.so
 lib64/android.hardware.power.stats-impl.gs201.so
@@ -1009,11 +1118,11 @@ lib64/android.hardware.secure_element@1.0.so
 lib64/android.hardware.secure_element@1.1.so
 lib64/android.hardware.secure_element@1.2.so
 lib64/android.hardware.security.keymint-V1-ndk.so
-lib64/android.hardware.security.keymint-V3-ndk.so
+lib64/android.hardware.security.keymint-V4-ndk.so
 lib64/android.hardware.security.rkp-V3-ndk.so
 lib64/android.hardware.security.secureclock-V1-ndk.so
 lib64/android.hardware.security.sharedsecret-V1-ndk.so
-lib64/android.hardware.sensors-V2-ndk.so
+lib64/android.hardware.sensors-V3-ndk.so
 lib64/android.hardware.sensors@1.0.so
 lib64/android.hardware.sensors@2.0-ScopedWakelock.so
 lib64/android.hardware.sensors@2.0.so
@@ -1024,32 +1133,29 @@ lib64/android.hardware.soundtrigger@2.1.so
 lib64/android.hardware.soundtrigger@2.2.so
 lib64/android.hardware.soundtrigger@2.3.so
 lib64/android.hardware.thermal-V1-ndk.so
-lib64/android.hardware.thermal-V2-ndk.so
+lib64/android.hardware.thermal-V3-ndk.so
 lib64/android.hardware.thermal@1.0.so
 lib64/android.hardware.thermal@2.0.so
 lib64/android.hardware.usb-V3-ndk.so
 lib64/android.hardware.usb.gadget-V1-ndk.so
 lib64/android.hardware.usb.gadget@1.0.so
-lib64/android.hardware.vibrator-V2-ndk.so
-lib64/android.hardware.wifi-V2-ndk.so
-lib64/android.hardware.wifi.common-V1-ndk.so
-lib64/android.hardware.wifi.hostapd-V2-ndk.so
-lib64/android.hardware.wifi.supplicant-V3-ndk.so
+lib64/android.hardware.wifi-V3-ndk.so
+lib64/android.hardware.wifi.common-V2-ndk.so
+lib64/android.hardware.wifi.hostapd-V3-ndk.so
+lib64/android.hardware.wifi.supplicant-V4-ndk.so
 lib64/android.hidl.allocator@1.0.so
 lib64/android.hidl.memory.token@1.0.so
 lib64/android.hidl.memory@1.0.so
 lib64/android.hidl.safe_union@1.0.so
-lib64/android.media.audio.common.types-V3-ndk.so
+lib64/android.media.audio.common.types-V4-ndk.so
 lib64/android.system.keystore2-V1-ndk.so
 lib64/android.system.suspend-V1-ndk.so
 lib64/arm.graphics-V1-ndk.so
-lib64/com.google.hardware.pixel.display-V10-ndk.so
+lib64/com.google.hardware.pixel.display-V13-ndk.so
 lib64/hw/android.hardware.audio.effect@7.0-impl.so
 lib64/hw/android.hardware.audio@7.1-impl.so
 lib64/hw/android.hardware.graphics.allocator-aidl-impl.so
-lib64/hw/android.hardware.graphics.mapper@4.0-impl.so
 lib64/hw/android.hardware.soundtrigger@2.3-impl.so
-lib64/hw/android.hardware.vibrator-impl.cs40l26.so
 lib64/hw/android.hidl.memory@1.0-impl.so
 lib64/hw/audio.bluetooth.default.so
 lib64/hw/audio.primary.default.so
@@ -1058,10 +1164,13 @@ lib64/hw/audio.usb.default.so
 lib64/hw/audio.usbv2.default.so
 lib64/hw/gralloc.default.so
 lib64/hw/local_time.default.so
+lib64/hw/mapper.pixel.so
 lib64/hw/power.default.so
 lib64/hw/vibrator.default.so
 lib64/libExynosHWCService.so
+lib64/libOpenCL.so
 lib64/lib_android_keymaster_keymint_utils.so
+lib64/libaconfig_storage_read_api_cc.so
 lib64/libacryl.so
 lib64/libacryl_hdr_plugin.so
 lib64/libalsautils.so
@@ -1077,8 +1186,6 @@ lib64/libbluetooth_audio_session_aidl.so
 lib64/libc++.so
 lib64/libcfg_if.dylib.so
 lib64/libclang_rt.ubsan_standalone-aarch64-android.so
-lib64/libcppbor_external.so
-lib64/libcppcose_rkp.so
 lib64/libcrypto.so
 lib64/libcutils.so
 lib64/libdisppower-pixel.so
@@ -1103,8 +1210,7 @@ lib64/libhwjpeg.so
 lib64/libion_google.so
 lib64/libjsoncpp.so
 lib64/libkeymaster_messages.so
-lib64/libkeymaster_portable.so
-lib64/libkeymint.so
+lib64/libkeymasterconfig.so
 lib64/libkeystore-engine-wifi-hidl.so
 lib64/liblibloading.dylib.so
 lib64/liblog_rust.dylib.so
@@ -1124,12 +1230,10 @@ lib64/libpower.so
 lib64/libprocessgroup.so
 lib64/libprotobuf-cpp-full-21.12.so
 lib64/libprotobuf-cpp-lite-21.12.so
-lib64/libpuresoftkeymasterdevice.so
 lib64/libreference-ril.so
 lib64/libril.so
 lib64/librilutils.so
 lib64/libsensorndkbridge.so
-lib64/libsoft_attestation_cert.so
 lib64/libspeexresampler.so
 lib64/libssl.so
 lib64/libstagefright_foundation.so
@@ -1171,27 +1275,62 @@ lib64/soundfx/libvisualizer.so
 odm/etc/build.prop
 odm/etc/group
 odm/etc/passwd
+odm/etc/selinux/odm_file_contexts
+odm/etc/selinux/odm_hwservice_contexts
+odm/etc/selinux/odm_mac_permissions.xml
+odm/etc/selinux/odm_property_contexts
+odm/etc/selinux/odm_seapp_contexts
+odm/etc/selinux/odm_sepolicy.cil
+odm/etc/selinux/odm_service_contexts
 odm_dlkm/etc/build.prop
-overlay/EmergencyInfo__cheetah__auto_generated_rro_vendor.apk
-overlay/NfcNci__cheetah__auto_generated_rro_vendor.apk
-overlay/ONS__cheetah__auto_generated_rro_vendor.apk
-overlay/Settings__cheetah__auto_generated_rro_vendor.apk
-overlay/StorageManager__cheetah__auto_generated_rro_vendor.apk
-overlay/SystemUI__cheetah__auto_generated_rro_vendor.apk
-overlay/TeleService__cheetah__auto_generated_rro_vendor.apk
-overlay/Traceur__cheetah__auto_generated_rro_vendor.apk
-overlay/framework-res__cheetah__auto_generated_rro_vendor.apk
 vendor_dlkm/etc/build.prop
+vendor_dlkm/etc/debug_api/init.insmod.cheetah.cfg
+vendor_dlkm/etc/debug_api/init.insmod.lynx.cfg
+vendor_dlkm/etc/debug_api/init.insmod.panther.cfg
+vendor_dlkm/etc/debug_kmemleak/init.insmod.cheetah.cfg
+vendor_dlkm/etc/debug_kmemleak/init.insmod.lynx.cfg
+vendor_dlkm/etc/debug_kmemleak/init.insmod.panther.cfg
+vendor_dlkm/etc/debug_locking/init.insmod.cheetah.cfg
+vendor_dlkm/etc/debug_locking/init.insmod.lynx.cfg
+vendor_dlkm/etc/debug_locking/init.insmod.panther.cfg
+vendor_dlkm/etc/debug_memory/init.insmod.cheetah.cfg
+vendor_dlkm/etc/debug_memory/init.insmod.lynx.cfg
+vendor_dlkm/etc/debug_memory/init.insmod.panther.cfg
+vendor_dlkm/etc/debug_memory_accounting/init.insmod.cheetah.cfg
+vendor_dlkm/etc/debug_memory_accounting/init.insmod.lynx.cfg
+vendor_dlkm/etc/debug_memory_accounting/init.insmod.panther.cfg
+vendor_dlkm/etc/init.insmod.cheetah.cfg
+vendor_dlkm/etc/init.insmod.lynx.cfg
+vendor_dlkm/etc/init.insmod.panther.cfg
+vendor_dlkm/etc/kasan/init.insmod.cheetah.cfg
+vendor_dlkm/etc/kasan/init.insmod.lynx.cfg
+vendor_dlkm/etc/kasan/init.insmod.panther.cfg
 
 # Exclude overlays, symlinks and extra files that we override
 
 # Overlays
-overlay/DeviceDiagnostics__cheetah__auto_generated_rro_vendor.apk
 overlay/DMService__cheetah__auto_generated_rro_vendor.apk
+overlay/DeviceDiagnostics__cheetah__auto_generated_rro_vendor.apk
 overlay/Flipendo__cheetah__auto_generated_rro_vendor.apk
+overlay/ONS__cheetah__auto_generated_rro_vendor.apk
 overlay/SettingsGoogle__cheetah__auto_generated_rro_vendor.apk
 overlay/StorageManagerGoogle__cheetah__auto_generated_rro_vendor.apk
 overlay/SystemUIGoogle__cheetah__auto_generated_rro_vendor.apk
+overlay/TeleService__cheetah__auto_generated_rro_vendor.apk
+overlay/Traceur__cheetah__auto_generated_rro_vendor.apk
+overlay/framework-res__cheetah__auto_generated_rro_vendor.apk
+
+# beta
+overlay/DMService__cheetah_beta__auto_generated_rro_vendor.apk
+overlay/DeviceDiagnostics__cheetah_beta__auto_generated_rro_vendor.apk
+overlay/Flipendo__cheetah_beta__auto_generated_rro_vendor.apk
+overlay/ONS__cheetah_beta__auto_generated_rro_vendor.apk
+overlay/SettingsGoogle__cheetah_beta__auto_generated_rro_vendor.apk
+overlay/StorageManagerGoogle__cheetah_beta__auto_generated_rro_vendor.apk
+overlay/SystemUIGoogle__cheetah_beta__auto_generated_rro_vendor.apk
+overlay/TeleService__cheetah_beta__auto_generated_rro_vendor.apk
+overlay/Traceur__cheetah_beta__auto_generated_rro_vendor.apk
+overlay/framework-res__cheetah_beta__auto_generated_rro_vendor.apk
 
 # Symlinks
 lib/modules
@@ -1210,14 +1349,13 @@ lib64/libtinycompress.so
 
 # Bluetooth
 lib64/android.hardware.bluetooth-V1-ndk.so
+lib64/android.hardware.bluetooth.finder-V1-ndk.so
+lib64/android.hardware.bluetooth.ranging-V1-ndk.so
 lib64/hardware.google.bluetooth.bt_channel_avoidance@1.0.so
 
 # Camera
-lib/libGralloc4Wrapper.so
 lib/libdrm.so
 lib/pixel-power-ext-V1-ndk.so
-lib64/libGralloc4Wrapper.so
-lib64/libcamera2ndk_vendor.so
 
 # Charger
 etc/res/images/charger/battery_fail.png
@@ -1226,7 +1364,6 @@ etc/res/images/charger/main_font.png
 etc/res/values/charger/animation.txt
 
 # Codec2
-lib/android.hardware.media.bufferpool2-V1-ndk.so
 lib/android.hardware.media.bufferpool2-V2-ndk.so
 lib/android.hardware.media.bufferpool@2.0.so
 lib/android.hardware.media.c2-V1-ndk.so
@@ -1251,7 +1388,6 @@ lib/libstagefright_bufferqueue_helper.so
 lib/libstagefright_omx_utils.so
 lib/libstagefright_xmlparser.so
 lib/libvendorgraphicbuffer.so
-lib64/android.hardware.media.bufferpool2-V1-ndk.so
 lib64/android.hardware.media.bufferpool2-V2-ndk.so
 lib64/android.hardware.media.bufferpool@2.0.so
 lib64/android.hardware.media.c2-V1-ndk.so
@@ -1263,6 +1399,7 @@ lib64/android.hardware.media@1.0.so
 lib64/libavservices_minijail.so
 lib64/libcap.so
 lib64/libcodec2.so
+lib64/libcodec2_aidl.so
 lib64/libcodec2_hal_common.so
 lib64/libcodec2_hidl@1.0.so
 lib64/libcodec2_hidl@1.1.so
@@ -1290,9 +1427,10 @@ lib64/android.hardware.confirmationui@1.0.so
 lib64/libteeui_hal_support.so
 
 # Contexthub
+lib/android.hardware.contexthub-V3-ndk.so
 lib64/android.hardware.contexthub-V3-ndk.so
+lib64/android.hardware.contexthub-V4-ndk.so
 lib64/chre_atoms_log.so
-lib64/chre_metrics_reporter.so
 lib64/chremetrics-cpp.so
 
 # Fingerprint
@@ -1308,18 +1446,18 @@ lib/libhwbinder.so
 lib64/libhidltransport.so
 lib64/libhwbinder.so
 
-# Identity credential
-etc/permissions/android.hardware.identity_credential.xml
-lib64/android.hardware.identity-V5-ndk.so
-lib64/android.hardware.identity-support-lib.so
-
 # Json
 lib/libjsoncpp.so
 lib64/libjson.so
 
 # Nos
+lib64/android.hardware.security.keymint-V3-ndk.so
+lib64/libcppbor.so
+lib64/libcppcose_rkp.so
+lib64/libkeymaster_portable.so
 lib64/libkeymaster4support.so
 lib64/libkeymint_support.so
+lib64/libkeymint_support_V3.so
 lib64/libnos.so
 lib64/libnos_client_citadel.so
 lib64/libnos_datagram.so
@@ -1328,9 +1466,7 @@ lib64/libnos_feature.so
 lib64/libnos_transport.so
 lib64/libnosprotos.so
 lib64/nos_app_avb.so
-lib64/nos_app_identity.so
 lib64/nos_app_keymaster.so
-lib64/nos_app_keymaster_ctdl.so
 lib64/nos_app_weaver.so
 lib64/pixelpowerstats_provider_aidl_interface-cpp.so
 
@@ -1351,7 +1487,7 @@ lib64/modem_clock_manager_impl.so
 
 # Sensors
 lib/android.frameworks.sensorservice-V1-ndk.so
-lib/android.hardware.sensors-V2-ndk.so
+lib/android.hardware.sensors-V3-ndk.so
 lib/android.hardware.sensors@1.0.so
 lib/android.hardware.sensors@2.0-ScopedWakelock.so
 lib/android.hardware.sensors@2.0.so
@@ -1359,17 +1495,18 @@ lib/android.hardware.sensors@2.1.so
 lib/hw/sensors.dynamic_sensor_hal.so
 lib/libhidparser.so
 lib/libsensorndkbridge.so
+lib64/android.hardware.sensors-V2-ndk.so
 lib64/hw/sensors.dynamic_sensor_hal.so
 lib64/libhidparser.so
 
 # Trusty
 lib64/android.trusty.stats.nw.setter-cpp.so
-lib64/lib_sensor_listener.so
 lib64/libbinder_trusty.so
 lib64/libtrusty_metrics.so
 
 # Misc interfaces
 lib/android.frameworks.stats-V1-ndk.so
+lib/android.frameworks.stats-V2-ndk.so
 lib/android.hardware.graphics.allocator-V2-ndk.so
 lib/android.hardware.graphics.allocator@2.0.so
 lib/android.hardware.graphics.allocator@3.0.so
@@ -1404,12 +1541,9 @@ lib/android.hardware.thermal@2.0.so
 lib/android.hidl.token@1.0-utils.so
 lib/android.hidl.token@1.0.so
 lib/com.google.hardware.pixel.display-V9-ndk.so
-lib64/android.frameworks.sensorservice@1.0.so
 lib64/android.frameworks.stats-V1-cpp.so
 lib64/android.hardware.authsecret-V1-ndk.so
 lib64/android.hardware.biometrics.common-V3-ndk.so
-lib64/android.hardware.biometrics.face-V3-ndk.so
-lib64/android.hardware.biometrics.face@1.0.so
 lib64/android.hardware.biometrics.fingerprint-V3-ndk.so
 lib64/android.hardware.gnss-V3-ndk.so
 lib64/android.hardware.graphics.bufferqueue@1.0.so
@@ -1417,11 +1551,9 @@ lib64/android.hardware.graphics.bufferqueue@2.0.so
 lib64/android.hardware.health-V1-ndk.so
 lib64/android.hardware.input.common-V1-ndk.so
 lib64/android.hardware.input.processor-V1-ndk.so
-lib64/android.hardware.keymaster-V3-ndk.so
 lib64/android.hardware.keymaster-V4-ndk.so
 lib64/android.hardware.keymaster@3.0.so
 lib64/android.hardware.keymaster@4.0.so
-lib64/android.hardware.keymaster@4.1.so
 lib64/android.hardware.neuralnetworks-V4-ndk.so
 lib64/android.hardware.neuralnetworks@1.0.so
 lib64/android.hardware.neuralnetworks@1.1.so
@@ -1448,8 +1580,8 @@ lib64/android.hardware.radio@1.3.so
 lib64/android.hardware.radio@1.4.so
 lib64/android.hardware.radio@1.5.so
 lib64/android.hardware.radio@1.6.so
+lib64/android.hardware.vibrator-V3-ndk.so
 lib64/android.hardware.weaver-V2-ndk.so
-lib64/android.hardware.wifi-V1-ndk.so
 lib64/android.hidl.token@1.0-utils.so
 lib64/android.hidl.token@1.0.so
 lib64/com.google.hardware.pixel.display-V4-ndk.so
@@ -1465,6 +1597,12 @@ lib/libui.so
 lib64/libevent.so
 lib64/libion.so
 
+# Odex
+framework/oat/arm/com.google.android.camera.experimental2022.odex
+framework/oat/arm/com.google.android.camera.experimental2022.vdex
+framework/oat/arm64/com.google.android.camera.experimental2022.odex
+framework/oat/arm64/com.google.android.camera.experimental2022.vdex
+
 # Completely skip files that are not required
 
 # Edge TPU

cheetah/vendor.prop

@@ -12,8 +12,5 @@ persist.vendor.ril.use_radio_hal=2.0
 ro.vendor.config.build_carrier=europen
 vendor.rild.libpath=libsitril.so
 
-# SSR
-vendor.debug.ssrdump.type=sscoredump
-
 # UWB
 ro.vendor.uwb.calibration.calibrationpaths=/vendor/etc/uwb/calib_paths

cloudripper/BoardConfig.mk

@@ -15,18 +15,12 @@
 #
 TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := cloudripper
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
-else
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
-endif
 TARGET_SCREEN_DENSITY := 440
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_CLOUDRIPPER := true
 
 include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 include device/google/pantah-sepolicy/cloudripper-sepolicy.mk
 include device/google/pantah/wifi/BoardConfig-wifi.mk

conf/init.cloudripper.rc

@@ -15,7 +15,7 @@ on early-boot
     wait_for_prop vendor.common.modules.ready 1
     start insmod_sh_cloudripper
 
-service insmod_sh_cloudripper /vendor/bin/insmod.sh /vendor/etc/init.insmod.cloudripper.cfg
+service insmod_sh_cloudripper /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.cloudripper.cfg
     class main
     user root
     group root system

conf/init.pantah.rc

@@ -13,7 +13,7 @@ on early-boot
     wait_for_prop vendor.common.modules.ready 1
     start insmod_sh_pantah
 
-service insmod_sh_pantah /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
+service insmod_sh_pantah /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg
     class main
     user root
     group root system
@@ -83,6 +83,9 @@ on property:vendor.all.modules.ready=1
     chown system system /sys/bus/i2c/devices/8-0043/calibration/redc_stored
     chown system system /sys/bus/i2c/devices/8-0043/default/vibe_state
     chown system system /sys/bus/i2c/devices/8-0043/default/num_waves
+    chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_bank
+    chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_index
+    chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_ms
     chown system system /sys/bus/i2c/devices/8-0043/default/f0_offset
     chown system system /sys/bus/i2c/devices/8-0043/default/owt_free_space
     chown system system /sys/bus/i2c/devices/8-0043/default/f0_comp_enable

conf/init.ravenclaw.rc

@@ -15,7 +15,7 @@ on early-boot
     wait_for_prop vendor.common.modules.ready 1
     start insmod_sh_ravenclaw
 
-service insmod_sh_ravenclaw /vendor/bin/insmod.sh /vendor/etc/init.insmod.ravenclaw.cfg
+service insmod_sh_ravenclaw /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.ravenclaw.cfg
     class main
     user root
     group root system

device-cheetah.mk

@@ -17,17 +17,23 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
-TARGET_KERNEL_DIR ?= device/google/pantah-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers
-
-ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION
-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION)
+ifdef RELEASE_GOOGLE_CHEETAH_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)
+$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
+ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),)
+$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
+else
+$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
 endif
 
-ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)/kernel-headers
-endif
+
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CHEETAH_VERSION)
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers
 
 $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cheetah.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
@@ -42,7 +48,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/cheetah/overlay
 
 include device/google/pantah/audio/cheetah/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
-include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/syna/syna0.mk
 
@@ -67,9 +72,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
         device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.cheetah.rc
 
-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
 PRODUCT_COPY_FILES += \
-	device/google/pantah/init.insmod.cheetah.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cheetah.cfg
+	device/google/pantah/init.insmod.cheetah.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.cheetah.cfg
+endif
 
 # MIPI Coex Configs
 PRODUCT_COPY_FILES += \
@@ -125,6 +134,12 @@ PRODUCT_PACKAGES += \
 	android.hardware.nfc-service.st \
 	NfcOverlayCheetah
 
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
+
 # SecureElement
 PRODUCT_PACKAGES += \
 	android.hardware.secure_element@1.2-service-gto \
@@ -159,11 +174,13 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.bluetooth.a2dp_offload.disabled=false \
     persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
 
+# Enable Bluetooth AutoOn feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.server.automatic_turn_on=true
+
 # Bluetooth hci_inject test tool
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     hci_inject
-endif
 
 # Bluetooth OPUS codec
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -180,10 +197,8 @@ PRODUCT_COPY_FILES += \
     device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GP4BC_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_US.csv
 
 # Bluetooth SAR test tool
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     sar_test
-endif
 
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.firmware.selection=BCM.hcd
@@ -229,14 +244,15 @@ PRODUCT_COPY_FILES += \
 
 # LE Audio Unicast Allowlist
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.leaudio.allow_list=SM-R510
+    persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630
+
+# Support LE & Classic concurrent encryption (b/330704060)
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.ble.allow_enc_with_bredr=true
 
 # Bluetooth EWP test tool
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     ewp_tool
-endif
-
 # default BDADDR for EVB only
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
@@ -290,13 +306,6 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk
-endif
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
 ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
@@ -312,25 +321,30 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk
-endif
 
 # Location
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+    PRODUCT_COPY_FILES += \
+        device/google/pantah/location/lhd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/pantah/location/scd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-                device/google/pantah/location/lhd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-                device/google/pantah/location/scd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+            device/google/pantah/location/gps.6.1.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
+        PRODUCT_COPY_FILES += \
+            device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 else
+    PRODUCT_COPY_FILES += \
+        device/google/pantah/location/lhd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/pantah/location/scd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps_user.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-                device/google/pantah/location/lhd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-                device/google/pantah/location/scd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+            device/google/pantah/location/gps_user.6.1.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
+        PRODUCT_COPY_FILES += \
+            device/google/pantah/location/gps_user.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 endif
 
 # Set support one-handed mode
@@ -352,6 +366,24 @@ endif
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=$(TARGET_SVN)
 
+# Set device family property for SMR
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.build.device_family=P10C10L10
+
+# Set build properties for SMR builds
+ifeq ($(RELEASE_IS_SMR), true)
+    ifneq (,$(RELEASE_BASE_OS_CHEETAH))
+        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_CHEETAH)
+    endif
+endif
+
+# Set build properties for EMR builds
+ifeq ($(RELEASE_IS_EMR), true)
+    ifneq (,$(RELEASE_BASE_OS_CHEETAH))
+        PRODUCT_PROPERTY_OVERRIDES += \
+        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_CHEETAH)
+    endif
+endif
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.eligible_wcc=3 \
@@ -383,6 +415,7 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
 # Vibrator HAL
+$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 ACTUATOR_MODEL := luxshare_ict_081545
 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
 PRODUCT_VENDOR_PROPERTIES += \
@@ -395,6 +428,10 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.vibrator.hal.context.cooldowntime=1600 \
     persist.vendor.vibrator.hal.context.settlingtime=5000
 
+# Override Output Distortion Gain
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.audio.hapticgenerator.distortion.output.gain=0.38
+
 # Keyboard bottom and side padding in dp for portrait mode and height ratio
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.com.google.ime.kb_pad_port_b=8 \
@@ -436,3 +473,15 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.quick_start.oem_id=00e0 \
     ro.quick_start.device_id=cheetah
+
+# Bluetooth device id
+# Cheetah: 0x410A
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.device_id.product_id=16650
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif

device-cloudripper.mk

@@ -17,8 +17,19 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
-TARGET_KERNEL_DIR ?= device/google/pantah-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers
+RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)
+$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
+ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),)
+$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
+else
+$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
+endif
+
+
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers
 
 $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cloudripper.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
@@ -27,7 +38,6 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cloud
 
 include device/google/gs201/device-shipping-common.mk
 include device/google/pantah/audio/cloudripper/audio-tables.mk
-include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/gps/brcm/cbd_gps.mk
 include device/google/gs-common/touch/syna/syna0.mk
@@ -45,9 +55,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
         device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.cloudripper.rc
 
-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
 PRODUCT_COPY_FILES += \
-	device/google/pantah/init.insmod.cloudripper.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cloudripper.cfg
+	device/google/pantah/init.insmod.cloudripper.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.cloudripper.cfg
+endif
 
 # Camera
 PRODUCT_COPY_FILES += \
@@ -69,6 +83,12 @@ PRODUCT_PACKAGES += \
 	Tag \
 	android.hardware.nfc-service.st
 
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
+
 # SecureElement
 PRODUCT_PACKAGES += \
 	android.hardware.secure_element@1.2-service-gto \
@@ -155,13 +175,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk
-endif
 
 # Location
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
@@ -188,3 +201,6 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Device features
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
+
+# Vibrator HAL
+$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))

device-evolution.mk

@@ -1,8 +1,8 @@
 #
-# Copyright (C) 2024 The Evolution X Project
-#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Udfps
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-evolution
+
 TARGET_HAS_UDFPS += true

device-lineage.mk

@@ -1,11 +1,10 @@
 #
-# Copyright (C) 2022 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Overlays
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-lineage
 
 # ANGLE - Almost Native Graphics Layer Engine
 PRODUCT_PACKAGES += \
@@ -18,8 +17,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     EuiccSupportPixelOverlay
 
-# Kernel
-TARGET_PREBUILT_KERNEL := device/google/pantah-kernel/Image.lz4
+# IWLAN
+PRODUCT_PACKAGES += \
+    Iwlan
 
 # PowerShare
 include hardware/google/pixel/powershare/device.mk
@@ -39,16 +39,16 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
 
+# GNSS
+PRODUCT_PACKAGES += \
+    android.hardware.sensors-V2-ndk.vendor:64
+
 # Graphics
 PRODUCT_PACKAGES += \
     libEGL_angle \
     libGLESv1_CM_angle \
     libGLESv2_angle
 
-# Identity credential
-PRODUCT_PACKAGES += \
-    android.hardware.identity_credential.xml
-
 # Sensors
 PRODUCT_PACKAGES += \
     sensors.dynamic_sensor_hal

device-panther.mk

@@ -17,17 +17,23 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
-TARGET_KERNEL_DIR ?= device/google/pantah-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers
-
-ifdef RELEASE_GOOGLE_PANTHER_KERNEL_VERSION
-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_PANTHER_KERNEL_VERSION)
+ifdef RELEASE_GOOGLE_PANTHER_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)
+$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR))
+ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)),)
+$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
+else
+$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR))
 endif
 
-ifdef RELEASE_GOOGLE_PANTHER_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)/kernel-headers
-endif
+
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_PANTHER_VERSION)
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_PANTHER_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_PANTHER_DIR)/kernel-headers
 
 $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-panther.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
@@ -40,7 +46,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/panther/overlay
 
 include device/google/pantah/audio/panther/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
-include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/focaltech/focaltech.mk
 
@@ -58,9 +63,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
         device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.panther.rc
 
-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
 PRODUCT_COPY_FILES += \
-	device/google/pantah/init.insmod.panther.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.panther.cfg
+	device/google/pantah/init.insmod.panther.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.panther.cfg
+endif
 
 # MIPI Coex Configs
 PRODUCT_COPY_FILES += \
@@ -104,6 +113,12 @@ PRODUCT_PACKAGES += \
 	android.hardware.nfc-service.st \
 	NfcOverlayPanther
 
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
+
 # SecureElement
 PRODUCT_PACKAGES += \
 	android.hardware.secure_element@1.2-service-gto \
@@ -142,11 +157,13 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.bluetooth.a2dp_offload.disabled=false \
     persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
 
+# Enable Bluetooth AutoOn feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.server.automatic_turn_on=true
+
 # Bluetooth hci_inject test tool
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     hci_inject
-endif
 
 # Bluetooth OPUS codec
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -163,11 +180,8 @@ PRODUCT_COPY_FILES += \
     device/google/pantah/bluetooth/bluetooth_power_limits_panther_GVU6C_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_US.csv
 
 # Bluetooth SAR test tool
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     sar_test
-endif
-
 # default BDADDR for EVB only
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
@@ -200,14 +214,15 @@ PRODUCT_COPY_FILES += \
 
 # LE Audio Unicast Allowlist
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.leaudio.allow_list=SM-R510
+    persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630
 
+# Support LE & Classic concurrent encryption (b/330704060)
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.ble.allow_enc_with_bredr=true
 
 # Bluetooth EWP test tool
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     ewp_tool
-endif
 
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.firmware.selection=BCM.hcd
@@ -270,13 +285,6 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk
-endif
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
 ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
@@ -296,25 +304,30 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/panther/
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk
-endif
 
 # Location
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+    PRODUCT_COPY_FILES += \
+        device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/pantah/location/scd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-                device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-                device/google/pantah/location/scd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+            device/google/pantah/location/gps.6.1.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
+        PRODUCT_COPY_FILES += \
+            device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 else
+    PRODUCT_COPY_FILES += \
+        device/google/pantah/location/lhd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/pantah/location/scd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-                device/google/pantah/location/lhd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-                device/google/pantah/location/scd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+            device/google/pantah/location/gps_user.6.1.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
+        PRODUCT_COPY_FILES += \
+            device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 endif
 
 # Set support one-handed mode
@@ -336,6 +349,24 @@ endif
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=$(TARGET_SVN)
 
+# Set device family property for SMR
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.build.device_family=P10C10L10
+
+# Set build properties for SMR builds
+ifeq ($(RELEASE_IS_SMR), true)
+    ifneq (,$(RELEASE_BASE_OS_PANTHER))
+        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_PANTHER)
+    endif
+endif
+
+# Set build properties for EMR builds
+ifeq ($(RELEASE_IS_EMR), true)
+    ifneq (,$(RELEASE_BASE_OS_PANTHER))
+        PRODUCT_PROPERTY_OVERRIDES += \
+        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_PANTHER)
+    endif
+endif
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.eligible_wcc=2 \
@@ -369,6 +400,7 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
 # Vibrator HAL
+$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 ACTUATOR_MODEL := luxshare_ict_081545
 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
 PRODUCT_VENDOR_PROPERTIES += \
@@ -381,6 +413,10 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.vibrator.hal.context.cooldowntime=1600 \
     persist.vendor.vibrator.hal.context.settlingtime=5000
 
+# Override Output Distortion Gain
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.audio.hapticgenerator.distortion.output.gain=0.38
+
 # Keyboard bottom padding in dp for portrait mode and height ratio
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.com.google.ime.kb_pad_port_b=8 \
@@ -421,6 +457,14 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.quick_start.oem_id=00e0 \
     ro.quick_start.device_id=panther
 
-# HBM
-PRODUCT_PACKAGES += \
-    HbmSVManagerOverlayPanther
+# Bluetooth device id
+# Panther: 0x4109
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.device_id.product_id=16649
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif

device-ravenclaw.mk

@@ -17,8 +17,19 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
-TARGET_KERNEL_DIR ?= device/google/pantah-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers
+RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)
+$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
+ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),)
+$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
+else
+$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
+endif
+
+
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers
 
 $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-ravenclaw.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
@@ -27,7 +38,6 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/raven
 
 include device/google/gs201/device-shipping-common.mk
 include device/google/pantah/audio/ravenclaw/audio-tables.mk
-include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/lsi/lsi.mk
 
@@ -49,9 +59,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
         device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.ravenclaw.rc
 
-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
 PRODUCT_COPY_FILES += \
-	device/google/pantah/init.insmod.ravenclaw.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.ravenclaw.cfg
+	device/google/pantah/init.insmod.ravenclaw.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.ravenclaw.cfg
+endif
 
 # Camera
 PRODUCT_COPY_FILES += \
@@ -145,13 +159,6 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g6_trusty
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk
-endif
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
 ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
@@ -168,13 +175,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk
-endif
 
 # Location
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))

evolution.dependencies

@@ -4,8 +4,8 @@
     "target_path": "device/google/gs201"
   },
   {
-    "repository": "device/google/pantah-kernel",
-    "target_path": "device/google/pantah-kernel",
+    "repository": "device/google/pantah-kernels/6.1",
+    "target_path": "device/google/pantah-kernels/6.1",
     "remote": "aosp-pantah"
   }
 ]

factory_ravenclaw.mk

@@ -29,3 +29,9 @@ PRODUCT_MANUFACTURER := Google
 # default BDADDR for EVB only
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
+
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk

lineage_cheetah.mk

@@ -1,34 +1,35 @@
 #
-# Copyright (C) 2022 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit some common Evolution X stuff.
+# Inherit some common Evolution X stuff
 TARGET_DISABLE_EPPE := true
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 # Inherit device configuration
-$(call inherit-product, device/google/pantah/aosp_cheetah.mk)
+DEVICE_CODENAME := cheetah
+DEVICE_PATH := device/google/pantah
+VENDOR_PATH := vendor/google/cheetah
+$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 $(call inherit-product, device/google/gs201/lineage_common.mk)
 $(call inherit-product, device/google/gs201/evolution_common.mk)
-
-include device/google/pantah/cheetah/device-lineage.mk
-include device/google/pantah/cheetah/device-evolution.mk
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-evolution.mk)
 
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 7 Pro
-PRODUCT_NAME := lineage_cheetah
+PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 3120
 TARGET_SCREEN_WIDTH := 1440
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    TARGET_PRODUCT=cheetah \
-    PRIVATE_BUILD_DESC="cheetah-user 14 AP2A.240905.003 12231197 release-keys"
+    BuildDesc="cheetah-user 15 BP1A.250505.005.B1 13277630 release-keys" \
+    BuildFingerprint=google/cheetah/cheetah:15/BP1A.250505.005.B1/13277630:user/release-keys \
+    DeviceProduct=$(DEVICE_CODENAME)
 
-BUILD_FINGERPRINT := google/cheetah/cheetah:14/AP2A.240905.003/12231197:user/release-keys
-
-$(call inherit-product, vendor/google/cheetah/cheetah-vendor.mk)
+$(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)

lineage_panther.mk

@@ -1,34 +1,35 @@
 #
-# Copyright (C) 2022 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit some common Evolution X stuff.
+# Inherit some common Evolution X stuff
 TARGET_DISABLE_EPPE := true
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 # Inherit device configuration
-$(call inherit-product, device/google/pantah/aosp_panther.mk)
+DEVICE_CODENAME := panther
+DEVICE_PATH := device/google/pantah
+VENDOR_PATH := vendor/google/panther
+$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 $(call inherit-product, device/google/gs201/lineage_common.mk)
 $(call inherit-product, device/google/gs201/evolution_common.mk)
-
-include device/google/pantah/panther/device-lineage.mk
-include device/google/pantah/panther/device-evolution.mk
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-evolution.mk)
 
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 7
-PRODUCT_NAME := lineage_panther
+PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 2400
 TARGET_SCREEN_WIDTH := 1080
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    TARGET_PRODUCT=panther \
-    PRIVATE_BUILD_DESC="panther-user 14 AP2A.240905.003 12231197 release-keys"
+    BuildDesc="panther-user 15 BP1A.250505.005.B1 13277630 release-keys" \
+    BuildFingerprint=google/panther/panther:15/BP1A.250505.005.B1/13277630:user/release-keys \
+    DeviceProduct=$(DEVICE_CODENAME)
 
-BUILD_FINGERPRINT := google/panther/panther:14/AP2A.240905.003/12231197:user/release-keys
-
-$(call inherit-product, vendor/google/panther/panther-vendor.mk)
+$(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)

location/gps.6.1.xml.c10

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="true"
+       Log="JAVA"
+       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="true"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="true"
+       ExitOnComFailure="true"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="20.1"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.91"
+       RfPathLossDb_Cp="3.91"
+       RfPathLossDb_Ap_L5="3.76"
+       RfPathLossDb_Cp_L5="3.76"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="2"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+

location/gps.6.1.xml.p10

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="true"
+       Log="JAVA"
+       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="true"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="true"
+       ExitOnComFailure="true"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="21.2"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.6"
+       RfPathLossDb_Cp="3.6"
+       RfPathLossDb_Ap_L5="3.6"
+       RfPathLossDb_Cp_L5="3.6"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="2"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+

location/gps.xml

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -56,6 +57,7 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
+       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
@@ -70,7 +72,7 @@
   <gll
        PpsEnable="true"
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
@@ -98,6 +100,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

location/gps.xml.c10

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -56,6 +57,7 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
+       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
@@ -70,7 +72,7 @@
   <gll
        PpsEnable="true"
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
@@ -98,8 +100,11 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

location/gps.xml.p10

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -56,6 +57,7 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
+       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
@@ -70,7 +72,7 @@
   <gll
        PpsEnable="true"
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
@@ -98,8 +100,11 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

location/gps_user.6.1.xml.c10

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="20.1"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.91"
+       RfPathLossDb_Cp="3.91"
+       RfPathLossDb_Ap_L5="3.76"
+       RfPathLossDb_Cp_L5="3.76"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="0"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+

location/gps_user.6.1.xml.p10

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="21.2"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.6"
+       RfPathLossDb_Cp="3.6"
+       RfPathLossDb_Ap_L5="3.6"
+       RfPathLossDb_Cp_L5="3.6"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="0"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+

location/gps_user.xml

@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -97,6 +98,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

location/gps_user.xml.c10

@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -97,8 +98,11 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

location/gps_user.xml.p10

@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -97,8 +98,11 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

manifest.xml

@@ -48,15 +48,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>

modules.blocklist.vendor_kernel_boot

@@ -0,0 +1,2 @@
+blocklist focal_touch.ko
+blocklist syna_touch.ko

modules.load.vendor_kernel_boot

@@ -0,0 +1,2 @@
+extra/focal_touch.ko
+extra/syna_touch.ko

nfc/libnfc-hal-st.conf

@@ -135,7 +135,7 @@ OFFHOST_ROUTE_ESE={86}
 # host  0x00
 # eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
 # UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_ISODEP_ROUTE=0x81
+DEFAULT_ISODEP_ROUTE=0x00
 
 ###############################################################################
 # Configure the HAL Clock control

panther/Android.bp

@@ -0,0 +1,11 @@
+//
+// SPDX-FileCopyrightText: 2024 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+prebuilt_etc {
+    name: "init.recovery.panther.touch.rc",
+    src: "init.recovery.touch.rc",
+    sub_dir: "init",
+    recovery: true,
+}

panther/BoardConfig.mk

@@ -18,17 +18,9 @@
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 
 # The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR)
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
-else
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
-endif
-
 ifdef PHONE_CAR_BOARD_PRODUCT
     include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
 else
@@ -43,8 +35,18 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce
 
 include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/panther/proprietary/BoardConfigVendor.mk
 include device/google/pantah/sepolicy/panther-sepolicy.mk
 include device/google/pantah/wifi/BoardConfig-wifi.mk
 
-include device/google/pantah/panther/BoardConfigLineage.mk
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
+
+DEVICE_PATH := device/google/pantah
+VENDOR_PATH := vendor/google/panther
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk

panther/BoardConfigEvolution.mk

@@ -0,0 +1,6 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigEvolution.mk

panther/BoardConfigLineage.mk

@@ -1,9 +1,9 @@
 #
-# Copyright (C) 2022 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include device/google/pantah/BoardConfigLineage.mk
+include $(DEVICE_PATH)/BoardConfigLineage.mk
 
-include vendor/google/panther/BoardConfigVendor.mk
+include $(VENDOR_PATH)/BoardConfigVendor.mk

panther/device-evolution.mk

@@ -1,9 +1,8 @@
 #
-# Copyright (C) 2024 The Evolution X Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The Evolution X Project
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/panther/overlay-evolution
+$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk)
 
-$(call inherit-product, $(LOCAL_PATH)/device-evolution.mk)
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution

panther/device-lineage.mk

@@ -1,9 +1,17 @@
 #
-# Copyright (C) 2022 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/panther/overlay-lineage
+$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
 
-$(call inherit-product, $(LOCAL_PATH)/device-lineage.mk)
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
+
+# HBM
+PRODUCT_PACKAGES += \
+    HbmSVManagerOverlayPanther
+
+# Init
+PRODUCT_PACKAGES += \
+    init.recovery.panther.touch.rc

panther/extract-files.py

@@ -0,0 +1,107 @@
+#!/usr/bin/env -S PYTHONPATH=../../../../tools/extract-utils python3
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+from extract_utils.extract import extract_fns_user_type
+from extract_utils.extract_pixel import (
+    extract_pixel_factory_image,
+    extract_pixel_firmware,
+    pixel_factory_image_regex,
+    pixel_firmware_regex,
+)
+from extract_utils.file import FileArgs, FileList
+from extract_utils.fixups_blob import (
+    blob_fixup,
+    blob_fixups_user_type,
+)
+from extract_utils.fixups_lib import (
+    lib_fixup_remove,
+    lib_fixups,
+    lib_fixups_user_type,
+)
+from extract_utils.main import (
+    ExtractUtils,
+    ExtractUtilsModule,
+)
+
+namespace_imports = [
+    'device/google/pantah',
+    'hardware/google/av',
+    'hardware/google/gchips',
+    'hardware/google/graphics/common',
+    'hardware/google/interfaces',
+    'hardware/google/pixel',
+]
+
+
+def lib_fixup_vendor_suffix(lib: str, partition: str, *args, **kwargs):
+    return f'{lib}_{partition}' if partition == 'vendor' else None
+
+
+lib_fixups: lib_fixups_user_type = {
+    **lib_fixups,
+    (
+        'com.google.edgetpu_app_service-V3-ndk',
+        'com.google.edgetpu_vendor_service-V2-ndk',
+    ): lib_fixup_vendor_suffix,
+    'android.hardware.sensors-V2-ndk': lib_fixup_remove,
+}
+
+blob_fixups: blob_fixups_user_type = {
+    'product/etc/felica/common.cfg': blob_fixup()
+        .patch_file('osaifu-keitai.patch'),
+    'vendor/etc/init/init.modem_logging_control.rc': blob_fixup()
+        .regex_replace(' && property:ro.debuggable=0', ''),
+}  # fmt: skip
+
+extract_fns: extract_fns_user_type = {
+    pixel_factory_image_regex: extract_pixel_factory_image,
+    pixel_firmware_regex: extract_pixel_firmware,
+}
+
+module = ExtractUtilsModule(
+    'panther',
+    'google',
+    device_rel_path='device/google/pantah/panther',
+    blob_fixups=blob_fixups,
+    lib_fixups=lib_fixups,
+    namespace_imports=namespace_imports,
+    add_generated_carriersettings_file=True,
+    add_firmware_proprietary_file=True,
+    extract_fns=extract_fns,
+)
+
+
+def fix_vendor_file_list(file_list: FileList):
+    # flp.default & gps.default have incorrect SONAME
+    # gpsd depends on android.hardware.sensors-V2-ndk & android.hardware.sensors-V3-ndk
+    disable_checkelf_file_paths = [
+        'vendor/bin/hw/gpsd',
+        'vendor/lib64/hw/flp.default.so',
+        'vendor/lib64/hw/gps.default.so',
+    ]
+    for file_path in disable_checkelf_file_paths:
+        file_list.get_file(file_path).set_arg(FileArgs.DISABLE_CHECKELF, True)
+
+    module_suffix_file_paths = [
+        'vendor/lib/com.google.edgetpu_app_service-V3-ndk.so',
+        'vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so',
+        'vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so',
+    ]
+
+    for file_path in module_suffix_file_paths:
+        file_list.get_file(file_path).set_arg(FileArgs.MODULE_SUFFIX, '_vendor')
+
+
+module.add_generated_proprietary_file(
+    'proprietary-files-vendor.txt',
+    partition='vendor',
+    skip_file_list_name='skip-files-vendor.txt',
+    fix_file_list=fix_vendor_file_list,
+)
+
+if __name__ == '__main__':
+    utils = ExtractUtils.device(module)
+    utils.run()

panther/extract-files.sh

@@ -1,149 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-DEVICE=panther
-VENDOR=google
-
-# Load extract_utils and do some sanity checks
-MY_DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
-
-ANDROID_ROOT="${MY_DIR}/../../../.."
-
-export TARGET_ENABLE_CHECKELF=true
-
-# If XML files don't have comments before the XML header, use this flag
-# Can still be used with broken XML files by using blob_fixup
-export TARGET_DISABLE_XML_FIXING=true
-
-HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
-if [ ! -f "${HELPER}" ]; then
-    echo "Unable to find helper script at ${HELPER}"
-    exit 1
-fi
-source "${HELPER}"
-
-# Default to sanitizing the vendor folder before extraction
-CLEAN_VENDOR=true
-
-ONLY_FIRMWARE=
-KANG=
-SECTION=
-CARRIER_SKIP_FILES=()
-VENDOR_SKIP_FILES=()
-
-while [ "${#}" -gt 0 ]; do
-    case "${1}" in
-        --only-firmware)
-            ONLY_FIRMWARE=true
-            ;;
-        -n | --no-cleanup)
-            CLEAN_VENDOR=false
-            ;;
-        -k | --kang)
-            KANG="--kang"
-            ;;
-        -s | --section)
-            SECTION="${2}"
-            shift
-            CLEAN_VENDOR=false
-            ;;
-        *)
-            SRC="${1}"
-            ;;
-    esac
-    shift
-done
-
-if [ -z "${SRC}" ]; then
-    SRC="adb"
-fi
-
-function blob_fixup() {
-    case "${1}" in
-        product/etc/felica/common.cfg)
-            [ "$2" = "" ] && return 0
-            sed -i -e '$a00000018,1' -e '/^00000014/d' -e '/^00000015/d' "${2}"
-            ;;
-        vendor/etc/init/init.modem_logging_control.rc)
-            [ "$2" = "" ] && return 0
-            sed -i 's/ && property:ro.debuggable=0//' "${2}"
-            ;;
-        *)
-            return 1
-            ;;
-    esac
-
-    return 0
-}
-
-function blob_fixup_dry() {
-    blob_fixup "$1" ""
-}
-
-function prepare_firmware() {
-    if [ "${SRC}" != "adb" ]; then
-        bash "${ANDROID_ROOT}"/lineage/scripts/pixel/prepare-firmware.sh "${DEVICE}" "${SRC}"
-    fi
-}
-
-# Initialize the helper
-setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
-
-if [ -z "${ONLY_FIRMWARE}" ]; then
-    extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-
-    generate_prop_list_from_image "product.img" "${MY_DIR}/proprietary-files-carriersettings.txt" CARRIER_SKIP_FILES carriersettings
-    extract "${MY_DIR}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-
-    readarray -t VENDOR_SKIP_FILES < <(cat "${MY_DIR}/skip-files-vendor.txt" | sed -E "/^[[:blank:]]*(#|$)/d")
-    VENDOR_TXT="${MY_DIR}/proprietary-files-vendor.txt"
-    generate_prop_list_from_image "vendor.img" "${VENDOR_TXT}" VENDOR_SKIP_FILES
-
-    # flp.default & gps.default have incorrect SONAME
-    # libExynosC2*Dec & libExynosC2*Enc depend on libacryl & libexynosv4l2, which are gnu makefile targets
-    set_disable_checkelf "vendor/lib/libExynosC2H263Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2H263Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2H264Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2H264Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2HevcDec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/hw/flp.default.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/hw/gps.default.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H263Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H263Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H264Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H264Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2HevcDec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
-
-    set_module_suffix "vendor/lib/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
-    set_module_suffix "vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
-    set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}"
-
-    extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-fi
-
-if [ -z "${SECTION}" ]; then
-    extract_firmware "${MY_DIR}/proprietary-firmware.txt" "${SRC}"
-fi
-
-"${MY_DIR}/setup-makefiles.sh"

panther/init.recovery.touch.rc

@@ -0,0 +1,2 @@
+on init
+   insmod /lib/modules/focal_touch.ko

panther/osaifu-keitai.patch

@@ -0,0 +1,24 @@
+From aab255f2807cfc460c0dce40decd5554d49c0076 Mon Sep 17 00:00:00 2001
+From: jabashque <jabashque@gmail.com>
+Date: Mon, 5 Feb 2024 21:36:03 +0000
+Subject: [PATCH 1/1] Enable Osaifu-Keitai on non-Japanese SKUs
+
+---
+ common.cfg | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/common.cfg b/common.cfg
+index 3b78765..00f53cb 100644
+--- a/common.cfg
++++ b/common.cfg
+@@ -11,6 +11,5 @@
+ 02030001,0
+ 02030002,0
+ 02030003,intent:#Intent;action=android.settings.NFC_SETTINGS;end
+-00000014,content://com.google.android.pixelnfc.provider.DeviceInfoContentProvider/isJapanSku
+-00000015,is_japan_sku
+ 00000016,0001
++00000018,1
+-- 
+2.47.0
+

panther/overlay/frameworks/base/core/res/res/values/dimens.xml

@@ -23,14 +23,15 @@
     <dimen name="rounded_corner_radius_top">47px</dimen>
     <dimen name="rounded_corner_radius_bottom">48px</dimen>
 
-   <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">47px</dimen>
+    <!-- Default paddings for content around the corners. -->
+    <dimen name="rounded_corner_content_padding">14dp</dimen>
 
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
+    <dimen name="status_bar_height">41.142857143dp</dimen>
     <dimen name="status_bar_height_default">28dp</dimen>
-    <dimen name="status_bar_height_portrait">136px</dimen>
+    <dimen name="status_bar_height_portrait">41.142857143dp</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->

panther/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml

@@ -16,10 +16,6 @@
 */
 -->
 <resources>
-    <!-- Landscape, just use the regular values -->
-    <dimen name="status_bar_padding_start">8dp</dimen>
-    <dimen name="status_bar_padding_end">8dp</dimen>
-
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_padding_top">0dp</dimen>
 </resources>

panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml

@@ -16,24 +16,20 @@
 */
 -->
 <resources>
-    <!-- Don't need the left side padding due to being inset from the cutout -->
+    <!-- the padding on the start of the statusbar -->
     <dimen name="status_bar_padding_start">0dp</dimen>
 
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_padding_top">1px</dimen>
 
     <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
+    <dimen name="status_bar_header_height_keyguard">28dp</dimen>
 
-    <!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
-    The icons always have a 4dp padding in the container so we only need 56 extra px of padding
-    for the corners -->
-    <dimen name="system_icons_super_container_avatarless_margin_end">11px</dimen>
+    <!-- Margin on the left side of the carrier text on Keyguard -->
+    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
 
-    <!-- Multi user switch has some intrinsic padding to it -->
-    <dimen name="multi_user_switch_keyguard_margin">6dp</dimen>
-
-    <dimen name="keyguard_carrier_text_margin">0px</dimen>
+    <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
+    <dimen name="ongoing_appops_dot_min_padding">14dp</dimen>
 
     <dimen name="config_rounded_mask_size">47px</dimen>
     <dimen name="config_rounded_mask_size_top">47px</dimen>

panther/proprietary-files-carriersettings.txt

@@ -1,6 +1,8 @@
 # All blobs below are extracted from the release mentioned in proprietary-files.txt
 product/etc/CarrierSettings/1and1_de.pb
 product/etc/CarrierSettings/2degrees_nz.pb
+product/etc/CarrierSettings/321communications_us.pb
+product/etc/CarrierSettings/48_ie.pb
 product/etc/CarrierSettings/4ka_sk.pb
 product/etc/CarrierSettings/a1_at.pb
 product/etc/CarrierSettings/a1_bg.pb
@@ -8,9 +10,13 @@ product/etc/CarrierSettings/a1_hr.pb
 product/etc/CarrierSettings/a1_mk.pb
 product/etc/CarrierSettings/a1_si.pb
 product/etc/CarrierSettings/ahamo_jp.pb
+product/etc/CarrierSettings/airbus_de.pb
+product/etc/CarrierSettings/airbus_fr.pb
 product/etc/CarrierSettings/airtel_in.pb
 product/etc/CarrierSettings/ais_th.pb
+product/etc/CarrierSettings/alcom_fi.pb
 product/etc/CarrierSettings/altice_us.pb
+product/etc/CarrierSettings/alticeroaming_us.pb
 product/etc/CarrierSettings/andorratelecom_ad.pb
 product/etc/CarrierSettings/antel_uy.pb
 product/etc/CarrierSettings/appalachian_us.pb
@@ -18,12 +24,14 @@ product/etc/CarrierSettings/apt_tw.pb
 product/etc/CarrierSettings/asda_gb.pb
 product/etc/CarrierSettings/assurance_us.pb
 product/etc/CarrierSettings/astca_as.pb
+product/etc/CarrierSettings/astoundbroadband_us.pb
 product/etc/CarrierSettings/att5g_us.pb
 product/etc/CarrierSettings/att5gsa_us.pb
 product/etc/CarrierSettings/att_mx.pb
 product/etc/CarrierSettings/att_us.pb
 product/etc/CarrierSettings/attbootstrap_us.pb
 product/etc/CarrierSettings/attmvnos_us.pb
+product/etc/CarrierSettings/axis_id.pb
 product/etc/CarrierSettings/base_be.pb
 product/etc/CarrierSettings/batelco_bh.pb
 product/etc/CarrierSettings/bell_ca.pb
@@ -49,7 +57,11 @@ product/etc/CarrierSettings/chatr_ca.pb
 product/etc/CarrierSettings/chinamobile_hk.pb
 product/etc/CarrierSettings/cht_tw.pb
 product/etc/CarrierSettings/cityfone_ca.pb
+product/etc/CarrierSettings/claro_br.pb
+product/etc/CarrierSettings/claro_cl.pb
+product/etc/CarrierSettings/claro_co.pb
 product/etc/CarrierSettings/claro_pr.pb
+product/etc/CarrierSettings/commonmvnxatt_us.pb
 product/etc/CarrierSettings/congstar_de.pb
 product/etc/CarrierSettings/consumercellularatt_us.pb
 product/etc/CarrierSettings/consumercellulartmo_us.pb
@@ -64,6 +76,7 @@ product/etc/CarrierSettings/cspire_us.pb
 product/etc/CarrierSettings/default.pb
 product/etc/CarrierSettings/digi_hu.pb
 product/etc/CarrierSettings/digi_my.pb
+product/etc/CarrierSettings/digi_pt.pb
 product/etc/CarrierSettings/digi_ro.pb
 product/etc/CarrierSettings/digimobil_es.pb
 product/etc/CarrierSettings/dish5gsa_us.pb
@@ -72,15 +85,20 @@ product/etc/CarrierSettings/dito_ph.pb
 product/etc/CarrierSettings/dna_fi.pb
 product/etc/CarrierSettings/docomo_jp.pb
 product/etc/CarrierSettings/docomomvno_jp.pb
+product/etc/CarrierSettings/docomopacific_us.pb
 product/etc/CarrierSettings/dtac_th.pb
 product/etc/CarrierSettings/du_ae.pb
 product/etc/CarrierSettings/eastlink_ca.pb
 product/etc/CarrierSettings/ee_gb.pb
+product/etc/CarrierSettings/eeyoumobility_ca.pb
 product/etc/CarrierSettings/eir_ie.pb
 product/etc/CarrierSettings/elisa1_fi.pb
 product/etc/CarrierSettings/elisa2_fi.pb
 product/etc/CarrierSettings/elisa_ee.pb
+product/etc/CarrierSettings/enetworks_gy.pb
 product/etc/CarrierSettings/enreach_nl.pb
+product/etc/CarrierSettings/entel_cl.pb
+product/etc/CarrierSettings/epic_mt.pb
 product/etc/CarrierSettings/eplus_de.pb
 product/etc/CarrierSettings/erate_no.pb
 product/etc/CarrierSettings/esn_gb.pb
@@ -90,7 +108,7 @@ product/etc/CarrierSettings/evolve_us.pb
 product/etc/CarrierSettings/fastweb_it.pb
 product/etc/CarrierSettings/fet_tw.pb
 product/etc/CarrierSettings/fi_at.pb
-product/etc/CarrierSettings/fi_us.pb
+product/etc/CarrierSettings/fi_tmo_us.pb
 product/etc/CarrierSettings/fido_ca.pb
 product/etc/CarrierSettings/finetwork_es.pb
 product/etc/CarrierSettings/firstnet_us.pb
@@ -98,7 +116,10 @@ product/etc/CarrierSettings/firstnetpacific2_us.pb
 product/etc/CarrierSettings/firstnetpacific_us.pb
 product/etc/CarrierSettings/fizz_ca.pb
 product/etc/CarrierSettings/fl1_li.pb
+product/etc/CarrierSettings/foroyatele_fo.pb
 product/etc/CarrierSettings/free_fr.pb
+product/etc/CarrierSettings/free_gp.pb
+product/etc/CarrierSettings/free_mq.pb
 product/etc/CarrierSettings/free_re.pb
 product/etc/CarrierSettings/freedommobile_ca.pb
 product/etc/CarrierSettings/gamma_gb.pb
@@ -107,6 +128,8 @@ product/etc/CarrierSettings/gibtel_gi.pb
 product/etc/CarrierSettings/giffgaff_gb.pb
 product/etc/CarrierSettings/giga_sg.pb
 product/etc/CarrierSettings/globe_ph.pb
+product/etc/CarrierSettings/gomobile_mt.pb
+product/etc/CarrierSettings/grameenphone_bd.pb
 product/etc/CarrierSettings/guuk_es.pb
 product/etc/CarrierSettings/h3_at.pb
 product/etc/CarrierSettings/h3_gb.pb
@@ -114,6 +137,7 @@ product/etc/CarrierSettings/h3_ie.pb
 product/etc/CarrierSettings/h3_se.pb
 product/etc/CarrierSettings/h3g27202_ie.pb
 product/etc/CarrierSettings/halebop_se.pb
+product/etc/CarrierSettings/helium_us.pb
 product/etc/CarrierSettings/help_at.pb
 product/etc/CarrierSettings/homobile_it.pb
 product/etc/CarrierSettings/hotmobile_il.pb
@@ -121,9 +145,15 @@ product/etc/CarrierSettings/ice_no.pb
 product/etc/CarrierSettings/idea_in.pb
 product/etc/CarrierSettings/idmobile_gb.pb
 product/etc/CarrierSettings/iliad_it.pb
+product/etc/CarrierSettings/indosat_id.pb
 product/etc/CarrierSettings/inland_us.pb
+product/etc/CarrierSettings/iwireless_us.pb
+product/etc/CarrierSettings/jazz_pk.pb
 product/etc/CarrierSettings/jazztel_es.pb
+product/etc/CarrierSettings/jcommobile_jp.pb
+product/etc/CarrierSettings/kddi5gsa_jp.pb
 product/etc/CarrierSettings/kddi_jp.pb
+product/etc/CarrierSettings/kddimvno5gsa_jp.pb
 product/etc/CarrierSettings/kddimvno_jp.pb
 product/etc/CarrierSettings/kena_it.pb
 product/etc/CarrierSettings/koodo_ca.pb
@@ -131,6 +161,7 @@ product/etc/CarrierSettings/kpn_nl.pb
 product/etc/CarrierSettings/lebara_es.pb
 product/etc/CarrierSettings/lebara_fr.pb
 product/etc/CarrierSettings/lebara_gb.pb
+product/etc/CarrierSettings/lebara_nl.pb
 product/etc/CarrierSettings/liberty_pr.pb
 product/etc/CarrierSettings/lifecell_ua.pb
 product/etc/CarrierSettings/linemo_jp.pb
@@ -140,18 +171,33 @@ product/etc/CarrierSettings/lowi_es.pb
 product/etc/CarrierSettings/luckymobile_ca.pb
 product/etc/CarrierSettings/lum_ca.pb
 product/etc/CarrierSettings/lyca_es.pb
+product/etc/CarrierSettings/lyca_us.pb
+product/etc/CarrierSettings/lycamobile_gb.pb
+product/etc/CarrierSettings/lycamobile_pt.pb
+product/etc/CarrierSettings/lycamobile_se.pb
 product/etc/CarrierSettings/m1_sg.pb
+product/etc/CarrierSettings/magticom_ge.pb
 product/etc/CarrierSettings/manxcontract_im.pb
 product/etc/CarrierSettings/manxprepaid_im.pb
 product/etc/CarrierSettings/masmovil_es.pb
 product/etc/CarrierSettings/maxis_my.pb
+product/etc/CarrierSettings/mediacom_us.pb
+product/etc/CarrierSettings/melita_mt.pb
 product/etc/CarrierSettings/meo_pt.pb
 product/etc/CarrierSettings/metropcs_us.pb
+product/etc/CarrierSettings/mobifone_vn.pb
 product/etc/CarrierSettings/mobily_sa.pb
 product/etc/CarrierSettings/monacotelecom_mc.pb
+product/etc/CarrierSettings/movistar_co.pb
 product/etc/CarrierSettings/movistar_es.pb
 product/etc/CarrierSettings/movistar_mx.pb
+product/etc/CarrierSettings/mucho_ch.pb
+product/etc/CarrierSettings/mvnoconnect_us.pb
+product/etc/CarrierSettings/nema_fo.pb
+product/etc/CarrierSettings/netcomgroup_fr.pb
+product/etc/CarrierSettings/nexphone_ch.pb
 product/etc/CarrierSettings/nextech_us.pb
+product/etc/CarrierSettings/no_sim.pb
 product/etc/CarrierSettings/nos_pt.pb
 product/etc/CarrierSettings/nova_gr.pb
 product/etc/CarrierSettings/nova_is.pb
@@ -162,9 +208,12 @@ product/etc/CarrierSettings/o2postpaid_gb.pb
 product/etc/CarrierSettings/o2prepaid_de.pb
 product/etc/CarrierSettings/o2prepaid_gb.pb
 product/etc/CarrierSettings/omantel_om.pb
+product/etc/CarrierSettings/one_me.pb
 product/etc/CarrierSettings/onecall_no.pb
+product/etc/CarrierSettings/only_yt.pb
 product/etc/CarrierSettings/ooredoo_kw.pb
 product/etc/CarrierSettings/ooredoo_qa.pb
+product/etc/CarrierSettings/optimera_us.pb
 product/etc/CarrierSettings/optus_au.pb
 product/etc/CarrierSettings/orange_be.pb
 product/etc/CarrierSettings/orange_es.pb
@@ -182,18 +231,24 @@ product/etc/CarrierSettings/pcmobilebell_ca.pb
 product/etc/CarrierSettings/pelephone_il.pb
 product/etc/CarrierSettings/pepephone_es.pb
 product/etc/CarrierSettings/play_pl.pb
+product/etc/CarrierSettings/plintron_us.pb
 product/etc/CarrierSettings/plus_pl.pb
 product/etc/CarrierSettings/post_lu.pb
+product/etc/CarrierSettings/postemobile_it.pb
+product/etc/CarrierSettings/povo5gsa_jp.pb
 product/etc/CarrierSettings/povo_jp.pb
 product/etc/CarrierSettings/proximus_be.pb
 product/etc/CarrierSettings/publicmobile_ca.pb
+product/etc/CarrierSettings/pwg_us.pb
+product/etc/CarrierSettings/qlink_us.pb
 product/etc/CarrierSettings/r_es.pb
 product/etc/CarrierSettings/racc_es.pb
 product/etc/CarrierSettings/rakuten_jp.pb
-product/etc/CarrierSettings/reachmobileatt_us.pb
 product/etc/CarrierSettings/redpocketatt_us.pb
 product/etc/CarrierSettings/redpockettmo_us.pb
+product/etc/CarrierSettings/republicwireless_us.pb
 product/etc/CarrierSettings/rjio_in.pb
+product/etc/CarrierSettings/robi_bd.pb
 product/etc/CarrierSettings/rogers5g_ca.pb
 product/etc/CarrierSettings/rogers_ca.pb
 product/etc/CarrierSettings/rogerswpn_ca.pb
@@ -210,34 +265,47 @@ product/etc/CarrierSettings/singtel_sg.pb
 product/etc/CarrierSettings/skinny_nz.pb
 product/etc/CarrierSettings/skt_kr.pb
 product/etc/CarrierSettings/sky_gb.pb
+product/etc/CarrierSettings/sky_ie.pb
 product/etc/CarrierSettings/skylo_zz.pb
 product/etc/CarrierSettings/smart_ph.pb
+product/etc/CarrierSettings/smartfren_id.pb
 product/etc/CarrierSettings/smartone_hk.pb
 product/etc/CarrierSettings/smarty_gb.pb
 product/etc/CarrierSettings/softbank_jp.pb
 product/etc/CarrierSettings/solomobile_ca.pb
 product/etc/CarrierSettings/spark_nz.pb
 product/etc/CarrierSettings/spectrum_us.pb
+product/etc/CarrierSettings/spectrummso_us.pb
+product/etc/CarrierSettings/spectrummsotest_us.pb
 product/etc/CarrierSettings/spmtelecom_pm.pb
 product/etc/CarrierSettings/sprint_us.pb
 product/etc/CarrierSettings/sprintprepaid_us.pb
 product/etc/CarrierSettings/sprintwholesale_us.pb
 product/etc/CarrierSettings/spusu_at.pb
+product/etc/CarrierSettings/spusu_ch.pb
+product/etc/CarrierSettings/spusu_gb.pb
+product/etc/CarrierSettings/spusu_it.pb
+product/etc/CarrierSettings/ssimobile_ca.pb
 product/etc/CarrierSettings/starhub_sg.pb
 product/etc/CarrierSettings/stc_bh.pb
 product/etc/CarrierSettings/stc_kw.pb
 product/etc/CarrierSettings/stc_sa.pb
 product/etc/CarrierSettings/strata_us.pb
 product/etc/CarrierSettings/sunrise_ch.pb
+product/etc/CarrierSettings/superdrug_gb.pb
 product/etc/CarrierSettings/sweno_es.pb
 product/etc/CarrierSettings/swisscom_ch.pb
 product/etc/CarrierSettings/swisscom_li.pb
+product/etc/CarrierSettings/swisscommvno_ch.pb
 product/etc/CarrierSettings/talkmobile_gb.pb
 product/etc/CarrierSettings/tango_lu.pb
 product/etc/CarrierSettings/tango_us.pb
 product/etc/CarrierSettings/tbaytel_ca.pb
+product/etc/CarrierSettings/tchibo_at.pb
 product/etc/CarrierSettings/tchibo_de.pb
 product/etc/CarrierSettings/tdc_dk.pb
+product/etc/CarrierSettings/telavox_be.pb
+product/etc/CarrierSettings/telavox_se.pb
 product/etc/CarrierSettings/telcel_mx.pb
 product/etc/CarrierSettings/telco_re.pb
 product/etc/CarrierSettings/tele2_ee.pb
@@ -249,15 +317,18 @@ product/etc/CarrierSettings/telekom_de.pb
 product/etc/CarrierSettings/telekom_gr.pb
 product/etc/CarrierSettings/telekom_hr.pb
 product/etc/CarrierSettings/telekom_hu.pb
+product/etc/CarrierSettings/telekom_me.pb
 product/etc/CarrierSettings/telekom_mk.pb
 product/etc/CarrierSettings/telekom_pl.pb
 product/etc/CarrierSettings/telekom_ro.pb
 product/etc/CarrierSettings/telekom_si.pb
 product/etc/CarrierSettings/telekom_sk.pb
+product/etc/CarrierSettings/telemach_hr.pb
 product/etc/CarrierSettings/telemach_si.pb
 product/etc/CarrierSettings/telenet_be.pb
 product/etc/CarrierSettings/telenor_dk.pb
 product/etc/CarrierSettings/telenor_no.pb
+product/etc/CarrierSettings/telenor_pk.pb
 product/etc/CarrierSettings/telenor_se.pb
 product/etc/CarrierSettings/telia_dk.pb
 product/etc/CarrierSettings/telia_ee.pb
@@ -265,15 +336,21 @@ product/etc/CarrierSettings/telia_fi.pb
 product/etc/CarrierSettings/telia_lt.pb
 product/etc/CarrierSettings/telia_no.pb
 product/etc/CarrierSettings/telia_se.pb
+product/etc/CarrierSettings/telkomsel_id.pb
+product/etc/CarrierSettings/tello_us.pb
 product/etc/CarrierSettings/telstra_au.pb
 product/etc/CarrierSettings/telus_ca.pb
 product/etc/CarrierSettings/tesco_gb.pb
+product/etc/CarrierSettings/test001_zz.pb
 product/etc/CarrierSettings/three_dk.pb
+product/etc/CarrierSettings/tigo_co.pb
+product/etc/CarrierSettings/tim_br.pb
 product/etc/CarrierSettings/tim_it.pb
 product/etc/CarrierSettings/tmobile_at.pb
 product/etc/CarrierSettings/tmobile_cz.pb
 product/etc/CarrierSettings/tmobile_nl.pb
 product/etc/CarrierSettings/tmobile_us.pb
+product/etc/CarrierSettings/tmobileprivate_us.pb
 product/etc/CarrierSettings/tmomvno_nl.pb
 product/etc/CarrierSettings/tmomvno_us.pb
 product/etc/CarrierSettings/tracfoneatt_us.pb
@@ -295,6 +372,7 @@ product/etc/CarrierSettings/ultra_us.pb
 product/etc/CarrierSettings/umobile_my.pb
 product/etc/CarrierSettings/unifi_my.pb
 product/etc/CarrierSettings/unionwireless_us.pb
+product/etc/CarrierSettings/unitedwireless_us.pb
 product/etc/CarrierSettings/uqmobile5gsa_jp.pb
 product/etc/CarrierSettings/uqmobile_jp.pb
 product/etc/CarrierSettings/uscc_us.pb
@@ -302,6 +380,7 @@ product/etc/CarrierSettings/verizon_us.pb
 product/etc/CarrierSettings/verymobile_it.pb
 product/etc/CarrierSettings/viaero_us.pb
 product/etc/CarrierSettings/videotron_ca.pb
+product/etc/CarrierSettings/viettel_vn.pb
 product/etc/CarrierSettings/vimla_se.pb
 product/etc/CarrierSettings/vinaphone_vn.pb
 product/etc/CarrierSettings/virgin_ca.pb
@@ -311,6 +390,8 @@ product/etc/CarrierSettings/virgintelco_es.pb
 product/etc/CarrierSettings/visible_us.pb
 product/etc/CarrierSettings/visiblev_us.pb
 product/etc/CarrierSettings/viti_pf.pb
+product/etc/CarrierSettings/vivacom_bg.pb
+product/etc/CarrierSettings/vivo_br.pb
 product/etc/CarrierSettings/vodafone_au.pb
 product/etc/CarrierSettings/vodafone_cz.pb
 product/etc/CarrierSettings/vodafone_de.pb
@@ -320,6 +401,7 @@ product/etc/CarrierSettings/vodafone_gr.pb
 product/etc/CarrierSettings/vodafone_hu.pb
 product/etc/CarrierSettings/vodafone_ie.pb
 product/etc/CarrierSettings/vodafone_in.pb
+product/etc/CarrierSettings/vodafone_is.pb
 product/etc/CarrierSettings/vodafone_it.pb
 product/etc/CarrierSettings/vodafone_nl.pb
 product/etc/CarrierSettings/vodafone_nz.pb
@@ -328,10 +410,12 @@ product/etc/CarrierSettings/vodafone_pt.pb
 product/etc/CarrierSettings/vodafone_qa.pb
 product/etc/CarrierSettings/vodafone_ro.pb
 product/etc/CarrierSettings/vodafone_tr.pb
+product/etc/CarrierSettings/walmart_mx.pb
 product/etc/CarrierSettings/webbing_hk.pb
 product/etc/CarrierSettings/windtre_it.pb
 product/etc/CarrierSettings/xfinity2_us.pb
 product/etc/CarrierSettings/xfinity_us.pb
+product/etc/CarrierSettings/xfinitymso_us.pb
 product/etc/CarrierSettings/yes_my.pb
 product/etc/CarrierSettings/yesss_at.pb
 product/etc/CarrierSettings/yettel_bg.pb
@@ -341,3 +425,4 @@ product/etc/CarrierSettings/zain_bh.pb
 product/etc/CarrierSettings/zain_kw.pb
 product/etc/CarrierSettings/zain_sa.pb
 product/etc/CarrierSettings/zeop_re.pb
+product/etc/CarrierSettings/ztar_us.pb

panther/proprietary-files.txt

@@ -3,8 +3,8 @@
 # product partition
 
 # AiAi
-product/priv-app/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore.apk;PRESIGNED
-product/priv-app/DevicePersonalizationPrebuiltPixel2022-v.U.14.playstore/DevicePersonalizationPrebuiltPixel2022-v.U.14.playstore.apk;PRESIGNED
+product/priv-app/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01.apk;PRESIGNED
+product/priv-app/DevicePersonalizationPrebuiltPixel2022-U.32_V.7_playstore_aiai_20240725.00_RC08/DevicePersonalizationPrebuiltPixel2022-U.32_V.7_playstore_aiai_20240725.00_RC08.apk;PRESIGNED
 
 # Audio
 product/etc/ambient/matcher_tah.leveldb
@@ -20,6 +20,11 @@ product/priv-app/GoogleCamera/GoogleCamera.apk;OVERRIDES=Aperture,Camera2;PRESIG
 product/etc/permissions/androidx.camera.extensions.impl.xml
 product/priv-app/PixelCameraServices/PixelCameraServices.apk;PRESIGNED
 
+# Camera services
+product/etc/permissions/com.google.pixel.camera.connectivity.impl.xml
+product/etc/permissions/com.google.pixel.camera.services.cameraidremapper.impl.xml
+product/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.impl.xml
+
 # Felica
 product/etc/felica/common.cfg
 product/etc/felica/mfm.cfg
@@ -61,7 +66,7 @@ product/lib/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmengin
 product/lib/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmjavaplugin.so
 product/lib64/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmengine.so
 product/lib64/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmjavaplugin.so
-product/priv-app/CarrierSettings_signed_45.0.591154042/CarrierSettings_signed_45.0.591154042.apk;PRESIGNED
+product/priv-app/CarrierSettings_signed_51.0.707712815/CarrierSettings_signed_51.0.707712815.apk;PRESIGNED
 product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
 product/priv-app/ConnMO/ConnMO.apk
 product/priv-app/DCMO/DCMO.apk
@@ -82,6 +87,11 @@ product/priv-app/AppDirectedSMSService/AppDirectedSMSService.apk;PRESIGNED
 product/priv-app/OemDmTrigger/OemDmTrigger.apk
 product/priv-app/WfcActivation/WfcActivation.apk;PRESIGNED
 
+# system partition
+
+# IMS
+system/bin/oem-iptables-init.sh
+
 # system_ext partition
 
 # Camera extensions
@@ -92,15 +102,23 @@ system_ext/framework/com.google.android.camera.experimental2022_system.jar
 system_ext/framework/com.google.android.camera.extensions.jar
 system_ext/framework/com.google.android.camerax.extensions.jar
 
+# Camera services
+system_ext/app/PersistentBackgroundCameraServices/PersistentBackgroundCameraServices.apk
+system_ext/etc/permissions/com.google.pixel.camera.connectivity.xml
+system_ext/etc/permissions/com.google.pixel.camera.services.cameraidremapper.xml
+system_ext/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.xml
+system_ext/etc/vintf/manifest/com.google.pixel.camera.services@1.0-service-google.xml
+system_ext/framework/com.google.pixel.camera.connectivity.jar
+system_ext/framework/com.google.pixel.camera.services.cameraidremapper.jar
+system_ext/framework/com.google.pixel.camera.services.lyricconfigprovider.jar
+
 # Edge TPU
 system_ext/bin/hw/vendor.google.edgetpu_app_service@1.0-service
 system_ext/etc/init/vendor.google.edgetpu_app_service@1.0-service.rc
 system_ext/etc/public.libraries-google.txt
 system_ext/etc/vintf/manifest/vendor.google.edgetpu_app_service@1.0-service.xml
-system_ext/lib/libedgetpu_dba.google.so
 system_ext/lib64/com.google.edgetpu_app_service-V3-ndk.so
 system_ext/lib64/com.google.edgetpu_vendor_service-V2-ndk.so
-system_ext/lib64/libedgetpu_dba.google.so
 
 # HBM
 system_ext/lib64/libhbmsvmanager_jni.so;SYMLINK=system_ext/priv-app/HbmSVManager/lib/arm64/libhbmsvmanager_jni.so
@@ -120,6 +138,11 @@ system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.
 system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED
 system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED
 
+# IWLAN
+system_ext/etc/permissions/privapp-permlist_com.google.pixel.iwlan.xml
+system_ext/etc/sysconfig/sysconfig_com.google.pixel.iwlan.xml
+system_ext/priv-app/PixelIwlan/PixelIwlan.apk
+
 # Permissions
 system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-evolution.xml
 
@@ -143,6 +166,7 @@ system_ext/priv-app/EuiccSupportPixel/DKA_RC7_P22_EVT.in
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_P22_EVT.up
 system_ext/priv-app/EuiccSupportPixel/EuiccSupportPixel.apk;PRESIGNED
 system_ext/priv-app/EuiccSupportPixel/esim-full-ofl-v1.img
+system_ext/priv-app/EuiccSupportPixel/esim-full-v0-security.img
 system_ext/priv-app/EuiccSupportPixel/esim-full-v0.img
 system_ext/priv-app/EuiccSupportPixel/esim-full-v1.img
 system_ext/priv-app/EuiccSupportPixelPermissions/EuiccSupportPixelPermissions.apk;PRESIGNED

panther/rro_overlays/NfcOverlay/res/values/config.xml

@@ -30,7 +30,7 @@
     <item>38</item>
   </integer-array>
   <integer-array name="antenna_y">
-    <item>97</item>
+    <item>53</item>
   </integer-array>
   <bool name="nfc_observe_mode_supported">true</bool>
 </resources>

panther/rro_overlays/WifiOverlay/res/values/config.xml

@@ -167,4 +167,12 @@
          If equals to 0, it means there's no limit on the max number of channels to include per network.-->
     <integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>
 
+    <!-- Boolean indicating whether to disable firmware roaming when the device goes into idle mode.
+         true: firmware roaming will be disabled when the device goes into idle mode, and then
+               re-activated when the device exits idle mode.
+         false: firmware roaming will not be affected. -->
+    <bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
+
+    <!-- Boolean indicating whether to trigger bugreport for WiFi subsystem restart issue -->
+    <bool translatable="false" name ="config_wifi_subsystem_restart_bugreport_enabled">false</bool>
 </resources>

panther/setup-makefiles.py

@@ -0,0 +1 @@
+#!./extract-files.py --regenerate_makefiles

panther/setup-makefiles.sh

@@ -1,82 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-DEVICE=panther
-VENDOR=google
-
-# Load extract_utils and do some sanity checks
-MY_DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
-
-ANDROID_ROOT="${MY_DIR}/../../../.."
-
-export TARGET_ENABLE_CHECKELF=true
-
-HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
-if [ ! -f "${HELPER}" ]; then
-    echo "Unable to find helper script at ${HELPER}"
-    exit 1
-fi
-source "${HELPER}"
-
-function vendor_imports() {
-    cat <<EOF >>"$1"
-		"device/google/pantah",
-		"hardware/google/av",
-		"hardware/google/gchips",
-		"hardware/google/graphics/common",
-		"hardware/google/interfaces",
-		"hardware/google/pixel",
-EOF
-}
-
-function lib_to_package_fixup_vendor_variants() {
-    if [ "$2" != "vendor" ]; then
-        return 1
-    fi
-
-    case "$1" in
-        com.google.edgetpu_app_service-V3-ndk | \
-            com.google.edgetpu_vendor_service-V2-ndk)
-            echo "$1-vendor"
-            ;;
-        libprotobuf-cpp-full-21.12)
-            echo "libprotobuf-cpp-full"
-            ;;
-        libprotobuf-cpp-lite-21.12)
-            echo "libprotobuf-cpp-lite"
-            ;;
-        libacryl | \
-            libexynosv4l2) ;;
-        *)
-            return 1
-            ;;
-    esac
-}
-
-function lib_to_package_fixup() {
-    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
-        lib_to_package_fixup_proto_3_9_1 "$1" ||
-        lib_to_package_fixup_vendor_variants "$@"
-}
-
-# Initialize the helper
-setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
-
-# Warning headers and guards
-write_headers
-
-write_makefiles "${MY_DIR}/proprietary-files.txt"
-write_makefiles "${MY_DIR}/proprietary-files-carriersettings.txt"
-write_makefiles "${MY_DIR}/proprietary-files-vendor.txt"
-
-append_firmware_calls_to_makefiles "${MY_DIR}/proprietary-firmware.txt"
-
-# Finish
-write_footers

panther/skip-files-vendor.txt

@@ -1,11 +1,10 @@
 # Standard build output with vendor image build enabled
-apex/com.android.hardware.cas.apex
-apex/com.android.vndk.current.on_vendor.apex
 bin/[
 bin/acpi
 bin/awk
 bin/base64
 bin/basename
+bin/blkdiscard
 bin/blockdev
 bin/boringssl_self_test32
 bin/boringssl_self_test64
@@ -39,12 +38,13 @@ bin/du
 bin/dump/dump_aoc
 bin/dump/dump_devfreq
 bin/dump/dump_display
+bin/dump/dump_fingerprint
 bin/dump/dump_focaltech.sh
-bin/dump/dump_modem.sh
+bin/dump/dump_modem
 bin/dump/dump_modemlog
 bin/dump/dump_perf
 bin/dump/dump_pixel_metrics
-bin/dump/dump_power_gs201.sh
+bin/dump/dump_power
 bin/dump/dump_sensors
 bin/dump/dump_soc
 bin/dump/dump_storage
@@ -70,6 +70,7 @@ bin/getconf
 bin/getenforce
 bin/getevent
 bin/getfattr
+bin/getopt
 bin/getprop
 bin/gpiodetect
 bin/gpiofind
@@ -90,7 +91,7 @@ bin/hw/android.hardware.composer.hwc3-service.pixel
 bin/hw/android.hardware.drm-service.clearkey
 bin/hw/android.hardware.dumpstate-service
 bin/hw/android.hardware.gatekeeper-service.trusty
-bin/hw/android.hardware.graphics.allocator-V1-service
+bin/hw/android.hardware.graphics.allocator-V2-service
 bin/hw/android.hardware.health-service.gs201
 bin/hw/android.hardware.health.storage-service.default
 bin/hw/android.hardware.memtrack-service.pixel
@@ -100,11 +101,11 @@ bin/hw/android.hardware.power.stats-service.pixel
 bin/hw/android.hardware.secure_element@1.2-service-gto
 bin/hw/android.hardware.secure_element@1.2-service-gto-ese2
 bin/hw/android.hardware.security.keymint-service.trusty
+bin/hw/android.hardware.security.secretkeeper.trusty
 bin/hw/android.hardware.sensors-service.multihal
 bin/hw/android.hardware.thermal-service.pixel
 bin/hw/android.hardware.usb-service
 bin/hw/android.hardware.usb.gadget-service
-bin/hw/android.hardware.vibrator-service.cs40l26
 bin/hw/android.hardware.wifi-service
 bin/hw/disable_contaminant_detection.sh
 bin/hw/hostapd
@@ -262,10 +263,11 @@ etc/NOTICE.xml.gz
 etc/a2dp_audio_policy_configuration_7_0.xml
 etc/a2dp_in_audio_policy_configuration_7_0.xml
 etc/aconfig_flags.pb
+etc/aidl/hfp/hfp_codec_capabilities.xml
 etc/aidl/le_audio/aidl_audio_set_configurations.bfbs
-etc/aidl/le_audio/aidl_audio_set_configurations.json
 etc/aidl/le_audio/aidl_audio_set_scenarios.bfbs
-etc/aidl/le_audio/aidl_audio_set_scenarios.json
+etc/aidl/le_audio/aidl_default_audio_set_configurations.json
+etc/aidl/le_audio/aidl_default_audio_set_scenarios.json
 etc/aoc/BLUETOOTH.dat
 etc/aoc/HANDSET.dat
 etc/aoc/HANDSFREE.dat
@@ -294,6 +296,7 @@ etc/boringssl_self_test.no_zygote.rc
 etc/boringssl_self_test.zygote32.rc
 etc/boringssl_self_test.zygote64.rc
 etc/boringssl_self_test.zygote64_32.rc
+etc/bpf/filterPowerSupplyEvents.o
 etc/build_flags.json
 etc/default_volume_tables.xml
 etc/display_colordata_cal0.pb
@@ -322,25 +325,24 @@ etc/gnss/scd.conf
 etc/group
 etc/hearing_aid_audio_policy_configuration_7_0.xml
 etc/init.common.cfg
-etc/init.insmod.panther.cfg
 etc/init/android.hardware.audio.service.rc
 etc/init/android.hardware.boot-service.default-pixel.rc
 etc/init/android.hardware.cas@1.2-service.rc
 etc/init/android.hardware.drm-service.clearkey.rc
 etc/init/android.hardware.dumpstate-service.rc
 etc/init/android.hardware.gatekeeper-service.trusty.rc
-etc/init/android.hardware.graphics.allocator-aidl-service.rc
+etc/init/android.hardware.graphics.allocator2-aidl-service.rc
 etc/init/android.hardware.health-service.gs201.rc
 etc/init/android.hardware.power-service.pixel-libperfmgr.rc
 etc/init/android.hardware.power.stats-service.pixel.rc
 etc/init/android.hardware.secure_element@1.2-service-gto-ese2.rc
 etc/init/android.hardware.secure_element@1.2-service-gto.rc
 etc/init/android.hardware.security.keymint-service.trusty.rc
+etc/init/android.hardware.security.secretkeeper.trusty.rc
 etc/init/android.hardware.sensors-service-multihal.rc
 etc/init/android.hardware.thermal-service.pixel.rc
 etc/init/android.hardware.usb-service.rc
 etc/init/android.hardware.usb.gadget-service.rc
-etc/init/android.hardware.vibrator-service.cs40l26.rc
 etc/init/android.hardware.wifi-service.rc
 etc/init/android.hardware.wifi.supplicant-service.rc
 etc/init/atrace_categories.rc
@@ -349,16 +351,23 @@ etc/init/gpu_probe.rc
 etc/init/health-storage-default.rc
 etc/init/hostapd.android.rc
 etc/init/hw/init.gs201.rc
+etc/init/hw/init.gs201.storage.rc
 etc/init/hw/init.gs201.usb.rc
 etc/init/hw/init.pantah.rc
 etc/init/hw/init.panther.rc
 etc/init/hwc3-pixel.rc
 etc/init/init.aoc.rc
+etc/init/init.fingerprint.dump.rc
 etc/init/init.modem.rc
 etc/init/init.module.rc
+etc/init/init.pixel-mm-gs.rc
+etc/init/init.pixel-perf.rc
 etc/init/init.pixel.rc
 etc/init/init.storage.rc
 etc/init/init.touch.rc
+etc/init/libg3a_gabc.rc
+etc/init/libg3a_gaf.rc
+etc/init/libg3a_ghawb.rc
 etc/init/memtrack.rc
 etc/init/nfc-service-default.rc
 etc/init/pixel-mm-gki.rc
@@ -368,6 +377,9 @@ etc/init/rebalance_interrupts-vendor.gs101.rc
 etc/init/storage.gs201.rc
 etc/init/vndservicemanager.rc
 etc/le_audio_codec_capabilities.xml
+etc/libg3a_standalone_gabc_rc
+etc/libg3a_standalone_gaf_rc
+etc/libg3a_standalone_ghawb_rc
 etc/libnfc-hal-st-proto1.conf
 etc/libnfc-hal-st.conf
 etc/libse-gto-hal.conf
@@ -403,7 +415,7 @@ etc/permissions/android.hardware.camera.full.xml
 etc/permissions/android.hardware.camera.raw.xml
 etc/permissions/android.hardware.context_hub.xml
 etc/permissions/android.hardware.device_unique_attestation.xml
-etc/permissions/android.hardware.hardware_keystore.xml
+etc/permissions/android.hardware.hardware_keystore_V3.xml
 etc/permissions/android.hardware.keystore.app_attest_key.xml
 etc/permissions/android.hardware.location.gps.prebuilt.xml
 etc/permissions/android.hardware.nfc.ese.xml
@@ -435,7 +447,6 @@ etc/permissions/android.hardware.wifi.direct.xml
 etc/permissions/android.hardware.wifi.passpoint.xml
 etc/permissions/android.hardware.wifi.rtt.xml
 etc/permissions/android.hardware.wifi.xml
-etc/permissions/android.software.contextualsearch.xml
 etc/permissions/android.software.device_id_attestation.xml
 etc/permissions/android.software.ipsec_tunnel_migration.xml
 etc/permissions/android.software.ipsec_tunnels.xml
@@ -445,11 +456,13 @@ etc/permissions/android.software.verified_boot.xml
 etc/permissions/android.software.vulkan.deqp.level.xml
 etc/permissions/aosp_excluded_hardware.xml
 etc/permissions/com.nxp.mifare.xml
+etc/permissions/features_com.android.virt.xml
 etc/permissions/handheld_core_hardware.xml
 etc/permissions/vendor.android.hardware.camera.preview-dis.xml
 etc/powerhint-a0.json
 etc/powerhint.json
 etc/r_submix_audio_policy_configuration.xml
+etc/selinux/genfs_labels_version.txt
 etc/selinux/plat_pub_versioned.cil
 etc/selinux/plat_sepolicy_vers.txt
 etc/selinux/precompiled_sepolicy
@@ -459,6 +472,7 @@ etc/selinux/precompiled_sepolicy.system_ext_sepolicy_and_mapping.sha256
 etc/selinux/selinux_denial_metadata
 etc/selinux/vendor_file_contexts
 etc/selinux/vendor_hwservice_contexts
+etc/selinux/vendor_keystore2_key_contexts
 etc/selinux/vendor_mac_permissions.xml
 etc/selinux/vendor_property_contexts
 etc/selinux/vendor_seapp_contexts
@@ -483,18 +497,19 @@ etc/vintf/manifest/android.hardware.health-service.gs201.xml
 etc/vintf/manifest/android.hardware.power-service.pixel.xml
 etc/vintf/manifest/android.hardware.power.stats-service.pixel.xml
 etc/vintf/manifest/android.hardware.security.keymint-service.trusty.xml
+etc/vintf/manifest/android.hardware.security.secretkeeper.trusty.xml
 etc/vintf/manifest/android.hardware.sensors-multihal.xml
 etc/vintf/manifest/android.hardware.thermal-service.pixel.xml
 etc/vintf/manifest/android.hardware.usb-service.xml
 etc/vintf/manifest/android.hardware.usb.gadget-service.xml
-etc/vintf/manifest/android.hardware.vibrator-service.cs40l26.xml
 etc/vintf/manifest/android.hardware.wifi-service.xml
 etc/vintf/manifest/android.hardware.wifi.hostapd.xml
 etc/vintf/manifest/android.hardware.wifi.supplicant.xml
 etc/vintf/manifest/bluetooth_audio.xml
 etc/vintf/manifest/health-storage-default.xml
 etc/vintf/manifest/hwc3-default.xml
-etc/vintf/manifest/manifest_gralloc_aidl.xml
+etc/vintf/manifest/manifest.xml
+etc/vintf/manifest/manifest_gralloc_aidl2.xml
 etc/vintf/manifest/memtrack.xml
 etc/vintf/manifest/nfc-service-default.xml
 etc/vintf/manifest/pixel-display-default.xml
@@ -517,7 +532,7 @@ firmware/fast_switch1.txt
 firmware/fast_switch2.txt
 firmware/fast_switch3.txt
 firmware/fast_switch4.txt
-lib/android.hardware.audio.common-V3-ndk.so
+lib/android.hardware.audio.common-V4-ndk.so
 lib/android.hardware.audio.common-util.so
 lib/android.hardware.audio.common@2.0.so
 lib/android.hardware.audio.common@5.0.so
@@ -531,13 +546,13 @@ lib/android.hardware.audio.effect@7.0.so
 lib/android.hardware.audio@7.0.so
 lib/android.hardware.audio@7.1-util.so
 lib/android.hardware.audio@7.1.so
-lib/android.hardware.bluetooth.audio-V4-ndk.so
+lib/android.hardware.bluetooth.audio-V5-ndk.so
 lib/android.hardware.bluetooth.audio-impl.so
 lib/android.hardware.bluetooth.audio@2.0.so
 lib/android.hardware.bluetooth.audio@2.1.so
 lib/android.hardware.common-V2-ndk.so
 lib/android.hardware.common.fmq-V1-ndk.so
-lib/android.hardware.graphics.common-V5-ndk.so
+lib/android.hardware.graphics.common-V6-ndk.so
 lib/android.hardware.graphics.common@1.0.so
 lib/android.hardware.graphics.common@1.1.so
 lib/android.hardware.graphics.common@1.2.so
@@ -553,12 +568,11 @@ lib/android.hidl.allocator@1.0.so
 lib/android.hidl.memory.token@1.0.so
 lib/android.hidl.memory@1.0.so
 lib/android.hidl.safe_union@1.0.so
-lib/android.media.audio.common.types-V3-ndk.so
+lib/android.media.audio.common.types-V4-ndk.so
 lib/android.system.suspend-V1-ndk.so
 lib/arm.graphics-V1-ndk.so
 lib/hw/android.hardware.audio.effect@7.0-impl.so
 lib/hw/android.hardware.audio@7.1-impl.so
-lib/hw/android.hardware.graphics.mapper@4.0-impl.so
 lib/hw/android.hardware.soundtrigger@2.3-impl.so
 lib/hw/android.hidl.memory@1.0-impl.so
 lib/hw/audio.bluetooth.default.so
@@ -568,8 +582,11 @@ lib/hw/audio.usb.default.so
 lib/hw/audio.usbv2.default.so
 lib/hw/gralloc.default.so
 lib/hw/local_time.default.so
+lib/hw/mapper.pixel.so
 lib/hw/power.default.so
 lib/hw/vibrator.default.so
+lib/libOpenCL.so
+lib/libaconfig_storage_read_api_cc.so
 lib/libalsautils.so
 lib/libalsautilsv2.so
 lib/libaudioutils.so
@@ -613,6 +630,8 @@ lib/libxml2.so
 lib/libz.so
 lib/mediacas/libclearkeycasplugin.so
 lib/mediadrm/libdrmclearkeyplugin.so
+lib/modules/6lowpan.ko
+lib/modules/8021q.ko
 lib/modules/acpm_flexpmu_dbg.ko
 lib/modules/acpm_mbox_test.ko
 lib/modules/aoc_alsa_dev.ko
@@ -621,41 +640,61 @@ lib/modules/aoc_channel_dev.ko
 lib/modules/aoc_char_dev.ko
 lib/modules/aoc_control_dev.ko
 lib/modules/aoc_core.ko
+lib/modules/aoc_tbn_service_dev.ko
+lib/modules/aoc_unit_test_dev.ko
 lib/modules/aoc_usb_driver.ko
 lib/modules/aoc_uwb_platform_drv.ko
 lib/modules/aoc_uwb_service_dev.ko
-lib/modules/arm-memlat-mon.ko
+lib/modules/aqc111.ko
 lib/modules/arm_dsu_pmu.ko
+lib/modules/asix.ko
 lib/modules/at24.ko
 lib/modules/audiometrics.ko
+lib/modules/ax88179_178a.ko
+lib/modules/bbd_pps_gpio.ko
 lib/modules/bc_max77759.ko
 lib/modules/bcm47765.ko
 lib/modules/bcm_dbg.ko
 lib/modules/bcmdhd4389.ko
-lib/modules/bigocean.ko
-lib/modules/boot_device_spi.ko
+lib/modules/bigwave.ko
+lib/modules/bluetooth.ko
+lib/modules/bsd_comp.ko
+lib/modules/btbcm.ko
+lib/modules/btpower.ko
+lib/modules/btqca.ko
 lib/modules/bts.ko
+lib/modules/btsdio.ko
+lib/modules/can-bcm.ko
+lib/modules/can-dev.ko
+lib/modules/can-gw.ko
+lib/modules/can-raw.ko
+lib/modules/can.ko
+lib/modules/cdc-acm.ko
+lib/modules/cdc_eem.ko
+lib/modules/cdc_ether.ko
+lib/modules/cdc_ncm.ko
+lib/modules/cfg80211.ko
 lib/modules/cl_dsp-core.ko
-lib/modules/clk_exynos.ko
+lib/modules/clk_exynos_gs.ko
 lib/modules/cmupmucal.ko
-lib/modules/coresight-etm4x.ko
-lib/modules/coresight-funnel.ko
-lib/modules/coresight-replicator.ko
-lib/modules/coresight-tmc.ko
-lib/modules/coresight.ko
+lib/modules/cnss2.ko
+lib/modules/cnss_nl.ko
+lib/modules/cnss_plat_ipc_qmi_svc.ko
+lib/modules/cnss_prealloc.ko
+lib/modules/cnss_utils.ko
 lib/modules/cp_thermal_zone.ko
 lib/modules/cpif.ko
 lib/modules/cpif_page.ko
-lib/modules/crc-t10dif.ko
-lib/modules/crct10dif_common.ko
-lib/modules/crct10dif_generic.ko
+lib/modules/cs35l45-cs-dsp.ko
 lib/modules/cs40l26-core.ko
 lib/modules/cs40l26-i2c.ko
 lib/modules/dbgcore-dump.ko
 lib/modules/debug-reboot.ko
 lib/modules/debug-snapshot-debug-kinfo.ko
-lib/modules/drv2624.ko
+lib/modules/diag.ko
+lib/modules/drm_display_helper.ko
 lib/modules/dss.ko
+lib/modules/dw3000-core-tests.ko
 lib/modules/dw3000.ko
 lib/modules/dwc3-exynos-usb.ko
 lib/modules/ect_parser.ko
@@ -672,6 +711,7 @@ lib/modules/exynos-cpuhp.ko
 lib/modules/exynos-cpupm.ko
 lib/modules/exynos-debug-test.ko
 lib/modules/exynos-dm.ko
+lib/modules/exynos-drm-audio.ko
 lib/modules/exynos-drm.ko
 lib/modules/exynos-ecc-handler.ko
 lib/modules/exynos-pcie-iommu.ko
@@ -681,7 +721,6 @@ lib/modules/exynos-pd_el3.ko
 lib/modules/exynos-pd_hsi0.ko
 lib/modules/exynos-pm.ko
 lib/modules/exynos-pmu-if.ko
-lib/modules/exynos-reboot.ko
 lib/modules/exynos-seclog.ko
 lib/modules/exynos_devfreq.ko
 lib/modules/exynos_mct.ko
@@ -690,7 +729,9 @@ lib/modules/exynos_pm_qos.ko
 lib/modules/exynos_tty.ko
 lib/modules/fips140.ko
 lib/modules/focal_touch.ko
+lib/modules/ftdi_sio.ko
 lib/modules/g2d.ko
+lib/modules/goodix_brl_touch.ko
 lib/modules/goodixfp.ko
 lib/modules/goog_touch_interface.ko
 lib/modules/google-battery.ko
@@ -698,32 +739,50 @@ lib/modules/google-bms.ko
 lib/modules/google-charger.ko
 lib/modules/google-cpm.ko
 lib/modules/google_bcl.ko
+lib/modules/google_ccd.ko
 lib/modules/google_dock.ko
 lib/modules/google_dual_batt_gauge.ko
-lib/modules/governor_memlat.ko
+lib/modules/google_tcpci_shim.ko
+lib/modules/google_wlan_mac.ko
 lib/modules/gpu_cooling.ko
 lib/modules/gs-chipid.ko
+lib/modules/gs-drm-connector.ko
+lib/modules/gs-panel.ko
 lib/modules/gs_acpm.ko
+lib/modules/gs_governor_memlat.ko
+lib/modules/gs_governor_utils.ko
+lib/modules/gs_perf_mon.ko
 lib/modules/gs_thermal.ko
 lib/modules/gsa.ko
 lib/modules/gsa_gsc.ko
 lib/modules/gvotable.ko
 lib/modules/gxp.ko
+lib/modules/gzvm.ko
 lib/modules/hardlockup-debug.ko
 lib/modules/hardlockup-watchdog.ko
+lib/modules/hci_uart.ko
 lib/modules/heatmap.ko
+lib/modules/hidp.ko
 lib/modules/i2c-acpm.ko
 lib/modules/i2c-dev.ko
 lib/modules/i2c-exynos5.ko
+lib/modules/ieee802154.ko
+lib/modules/ieee802154_6lowpan.ko
+lib/modules/ieee802154_socket.ko
 lib/modules/itmon.ko
 lib/modules/janeiro.ko
 lib/modules/kernel-top.ko
 lib/modules/keycombo.ko
 lib/modules/keydebug.ko
+lib/modules/kheaders.ko
+lib/modules/l2tp_core.ko
+lib/modules/l2tp_ppp.ko
+lib/modules/libarc4.ko
+lib/modules/ln8411.ko
 lib/modules/logbuffer.ko
 lib/modules/lwis.ko
-lib/modules/lzo-rle.ko
-lib/modules/lzo.ko
+lib/modules/mac80211.ko
+lib/modules/mac802154.ko
 lib/modules/mailbox-wc.ko
 lib/modules/mali_kbase.ko
 lib/modules/mali_kutf.ko
@@ -734,45 +793,74 @@ lib/modules/max20339.ko
 lib/modules/max77729-pmic.ko
 lib/modules/max77729_charger.ko
 lib/modules/max77729_uic.ko
-lib/modules/max77759_charger.ko
+lib/modules/max77759-charger.ko
 lib/modules/max77759_contaminant.ko
 lib/modules/max77759_helper.ko
+lib/modules/max77779-charger-i2c.ko
+lib/modules/max77779-charger.ko
+lib/modules/max77779-fg-i2c.ko
+lib/modules/max77779-fg.ko
+lib/modules/max77779-fwupdate.ko
+lib/modules/max77779-sp-i2c.ko
+lib/modules/max77779-sp.ko
+lib/modules/max77779-vimon-i2c.ko
+lib/modules/max77779-vimon.ko
+lib/modules/max77779_contaminant.ko
+lib/modules/max77779_i2cm.ko
+lib/modules/max77779_i2cm_i2c.ko
+lib/modules/max77779_pmic.ko
+lib/modules/max77779_pmic_i2c.ko
+lib/modules/max77779_pmic_irq.ko
+lib/modules/max77779_pmic_pinctrl.ko
+lib/modules/max77779_pmic_sgpio.ko
+lib/modules/max777x9_contaminant.ko
 lib/modules/mcps802154.ko
 lib/modules/mcps802154_region_fira.ko
 lib/modules/mcps802154_region_nfcc_coex.ko
 lib/modules/mcps802154_region_pctt.ko
-lib/modules/memlat-devfreq.ko
+lib/modules/mhi.ko
+lib/modules/mii.ko
 lib/modules/modules.alias
 lib/modules/modules.blocklist
 lib/modules/modules.dep
 lib/modules/modules.load
 lib/modules/modules.softdep
+lib/modules/nfc.ko
+lib/modules/nhc_dest.ko
+lib/modules/nhc_fragment.ko
+lib/modules/nhc_hop.ko
+lib/modules/nhc_ipv6.ko
+lib/modules/nhc_mobility.ko
+lib/modules/nhc_routing.ko
+lib/modules/nhc_udp.ko
 lib/modules/nitrous.ko
-lib/modules/null_blk.ko
-lib/modules/odpm.ko
-lib/modules/overheat_mitigation.ko
+lib/modules/odpm-whi.ko
 lib/modules/p9221.ko
 lib/modules/panel-boe-nt37290.ko
+lib/modules/panel-common.ko
 lib/modules/panel-samsung-drv.ko
 lib/modules/panel-samsung-emul.ko
+lib/modules/panel-samsung-s6e3fc3-l10.ko
 lib/modules/panel-samsung-s6e3fc3-p10.ko
 lib/modules/panel-samsung-s6e3fc3.ko
+lib/modules/panel-samsung-s6e3fc5.ko
 lib/modules/panel-samsung-s6e3hc2.ko
 lib/modules/panel-samsung-s6e3hc3-c10.ko
 lib/modules/panel-samsung-s6e3hc3.ko
 lib/modules/panel-samsung-s6e3hc4.ko
 lib/modules/panel-samsung-sofef01.ko
 lib/modules/pca9468.ko
-lib/modules/pcie-exynos-core.ko
+lib/modules/pcie-exynos-gs.ko
 lib/modules/pcie-exynos-gs201-rc-cal.ko
 lib/modules/phy-exynos-mipi-dsim.ko
 lib/modules/phy-exynos-mipi.ko
 lib/modules/phy-exynos-usbdrd-super.ko
-lib/modules/pinctrl-samsung-core.ko
+lib/modules/pinctrl-exynos-gs.ko
 lib/modules/pinctrl-slg51000.ko
 lib/modules/pinctrl-slg51002.ko
 lib/modules/pixel-boot-metrics.ko
 lib/modules/pixel-debug-test.ko
+lib/modules/pixel-reboot.ko
 lib/modules/pixel-suspend-diag.ko
 lib/modules/pixel_em.ko
 lib/modules/pixel_metrics.ko
@@ -782,9 +870,23 @@ lib/modules/pkvm-s2mpu.ko
 lib/modules/pl330.ko
 lib/modules/pmic_class.ko
 lib/modules/power_stats.ko
-lib/modules/pps-gpio.ko
-lib/modules/pps_core.ko
+lib/modules/ppp_deflate.ko
+lib/modules/ppp_generic.ko
+lib/modules/ppp_mppe.ko
+lib/modules/pppox.ko
+lib/modules/pptp.ko
+lib/modules/pwm-exynos.ko
+lib/modules/qmi_helpers.ko
+lib/modules/qrtr-mhi.ko
+lib/modules/qrtr.ko
+lib/modules/r8152.ko
+lib/modules/r8153_ecm.ko
+lib/modules/rfcomm.ko
+lib/modules/rfkill.ko
+lib/modules/rt4539_bl.ko
+lib/modules/rt9471_charger.ko
 lib/modules/rtc-s2mpg12.ko
+lib/modules/rtl8150.ko
 lib/modules/s2mpg12-key.ko
 lib/modules/s2mpg12-mfd.ko
 lib/modules/s2mpg12-powermeter.ko
@@ -793,7 +895,7 @@ lib/modules/s2mpg13-mfd.ko
 lib/modules/s2mpg13-powermeter.ko
 lib/modules/s2mpg13-regulator.ko
 lib/modules/s2mpg13_spmic_thermal.ko
-lib/modules/s2mpg1x-gpio-gs201.ko
+lib/modules/s2mpg1x-gpio.ko
 lib/modules/s3c2410_wdt.ko
 lib/modules/samsung-dma.ko
 lib/modules/samsung-iommu-group.ko
@@ -802,7 +904,6 @@ lib/modules/samsung_dma_heap.ko
 lib/modules/samsung_iommu.ko
 lib/modules/sbb-mux.ko
 lib/modules/sched_tp.ko
-lib/modules/scsi_debug.ko
 lib/modules/sec_touch.ko
 lib/modules/sg.ko
 lib/modules/shm_ipc.ko
@@ -811,16 +912,19 @@ lib/modules/slc_acpm.ko
 lib/modules/slc_dummy.ko
 lib/modules/slc_pmon.ko
 lib/modules/slc_pt.ko
+lib/modules/slcan.ko
 lib/modules/slg51000-core.ko
 lib/modules/slg51000-regulator.ko
 lib/modules/slg51002-core.ko
 lib/modules/slg51002-regulator.ko
+lib/modules/slhc.ko
 lib/modules/smfc.ko
 lib/modules/snd-soc-cs35l41-i2c.ko
 lib/modules/snd-soc-cs35l41-spi.ko
 lib/modules/snd-soc-cs35l41.ko
 lib/modules/snd-soc-cs35l45-i2c.ko
 lib/modules/snd-soc-cs35l45-spi.ko
+lib/modules/snd-soc-cs35l45-wm-adsp.ko
 lib/modules/snd-soc-cs35l45.ko
 lib/modules/snd-soc-cs40l26.ko
 lib/modules/snd-soc-wm-adsp.ko
@@ -828,6 +932,8 @@ lib/modules/softdog.ko
 lib/modules/spi-s3c64xx.ko
 lib/modules/spidev.ko
 lib/modules/sscoredump.ko
+lib/modules/sscoredump_sample_test.ko
+lib/modules/sscoredump_test.ko
 lib/modules/st21nfc.ko
 lib/modules/st33spi.ko
 lib/modules/st54spi.ko
@@ -836,6 +942,7 @@ lib/modules/syna_touch.ko
 lib/modules/sysrq-hook.ko
 lib/modules/systrace.ko
 lib/modules/tcpci_max77759.ko
+lib/modules/tipc.ko
 lib/modules/touch_bus_negotiator.ko
 lib/modules/touch_offload.ko
 lib/modules/trusty-core.ko
@@ -843,25 +950,30 @@ lib/modules/trusty-ipc.ko
 lib/modules/trusty-log.ko
 lib/modules/trusty-test.ko
 lib/modules/trusty-virtio.ko
-lib/modules/ufs-exynos-core.ko
+lib/modules/ufs-exynos-gs.ko
 lib/modules/ufs-pixel-fips140.ko
 lib/modules/usb_f_dm.ko
 lib/modules/usb_f_dm1.ko
 lib/modules/usb_f_etr_miu.ko
-lib/modules/usb_f_rndis.ko
 lib/modules/usb_psy.ko
 lib/modules/usbc_cooling_dev.ko
+lib/modules/usbnet.ko
+lib/modules/usbserial.ko
+lib/modules/vcan.ko
 lib/modules/vh_cgroup.ko
 lib/modules/vh_fs.ko
 lib/modules/vh_mm.ko
 lib/modules/vh_preemptirq_long.ko
 lib/modules/vh_sched.ko
 lib/modules/vh_thermal.ko
-lib/modules/wlan_ptracker.ko
+lib/modules/wlan.ko
+lib/modules/wlan_firmware_service.ko
+lib/modules/wwan.ko
 lib/modules/xhci-exynos.ko
 lib/modules/zcomp_cpu.ko
 lib/modules/zcomp_eh.ko
 lib/modules/zram.ko
+lib/modules/zram_gs.ko
 lib/modules/zsmalloc.ko
 lib/server_configurable_flags.so
 lib/soundfx/libaudiopreprocessing.so
@@ -873,12 +985,10 @@ lib/soundfx/libhapticgenerator.so
 lib/soundfx/libldnhncr.so
 lib/soundfx/libreverbwrapper.so
 lib/soundfx/libvisualizer.so
-lib64/PixelVibratorFlagsL26.so
-lib64/PixelVibratorStats.so
 lib64/android.frameworks.sensorservice-V1-ndk.so
 lib64/android.frameworks.stats-V1-ndk.so
 lib64/android.frameworks.stats-V2-ndk.so
-lib64/android.hardware.audio.common-V3-ndk.so
+lib64/android.hardware.audio.common-V4-ndk.so
 lib64/android.hardware.audio.common-util.so
 lib64/android.hardware.audio.common@2.0.so
 lib64/android.hardware.audio.common@5.0.so
@@ -892,7 +1002,7 @@ lib64/android.hardware.audio.effect@7.0.so
 lib64/android.hardware.audio@7.0.so
 lib64/android.hardware.audio@7.1-util.so
 lib64/android.hardware.audio@7.1.so
-lib64/android.hardware.bluetooth.audio-V4-ndk.so
+lib64/android.hardware.bluetooth.audio-V5-ndk.so
 lib64/android.hardware.bluetooth.audio-impl.so
 lib64/android.hardware.bluetooth.audio@2.0.so
 lib64/android.hardware.bluetooth.audio@2.1.so
@@ -906,19 +1016,18 @@ lib64/android.hardware.cas@1.2.so
 lib64/android.hardware.common-V2-ndk.so
 lib64/android.hardware.common.fmq-V1-ndk.so
 lib64/android.hardware.drm-V1-ndk.so
+lib64/android.hardware.drm.common-V1-ndk.so
 lib64/android.hardware.dumpstate-V1-ndk.so
 lib64/android.hardware.gatekeeper-V1-ndk.so
-lib64/android.hardware.graphics.allocator-V1-ndk.so
 lib64/android.hardware.graphics.allocator-V2-ndk.so
 lib64/android.hardware.graphics.allocator@2.0.so
 lib64/android.hardware.graphics.allocator@3.0.so
 lib64/android.hardware.graphics.allocator@4.0.so
-lib64/android.hardware.graphics.common-V3-ndk.so
-lib64/android.hardware.graphics.common-V5-ndk.so
+lib64/android.hardware.graphics.common-V6-ndk.so
 lib64/android.hardware.graphics.common@1.0.so
 lib64/android.hardware.graphics.common@1.1.so
 lib64/android.hardware.graphics.common@1.2.so
-lib64/android.hardware.graphics.composer3-V3-ndk.so
+lib64/android.hardware.graphics.composer3-V4-ndk.so
 lib64/android.hardware.graphics.composer@2.1-resources.so
 lib64/android.hardware.graphics.composer@2.1.so
 lib64/android.hardware.graphics.composer@2.2-resources.so
@@ -929,13 +1038,13 @@ lib64/android.hardware.graphics.mapper@2.0.so
 lib64/android.hardware.graphics.mapper@2.1.so
 lib64/android.hardware.graphics.mapper@3.0.so
 lib64/android.hardware.graphics.mapper@4.0.so
-lib64/android.hardware.health-V3-ndk.so
+lib64/android.hardware.health-V4-ndk.so
 lib64/android.hardware.health.storage-V1-ndk.so
 lib64/android.hardware.memtrack-V1-ndk.so
 lib64/android.hardware.nfc-V1-ndk.so
 lib64/android.hardware.power-V1-ndk.so
 lib64/android.hardware.power-V2-ndk.so
-lib64/android.hardware.power-V5-ndk.so
+lib64/android.hardware.power-V6-ndk.so
 lib64/android.hardware.power.stats-V2-ndk.so
 lib64/android.hardware.power.stats-impl.gs-common.so
 lib64/android.hardware.power.stats-impl.gs201.so
@@ -947,11 +1056,11 @@ lib64/android.hardware.secure_element@1.0.so
 lib64/android.hardware.secure_element@1.1.so
 lib64/android.hardware.secure_element@1.2.so
 lib64/android.hardware.security.keymint-V1-ndk.so
-lib64/android.hardware.security.keymint-V3-ndk.so
+lib64/android.hardware.security.keymint-V4-ndk.so
 lib64/android.hardware.security.rkp-V3-ndk.so
 lib64/android.hardware.security.secureclock-V1-ndk.so
 lib64/android.hardware.security.sharedsecret-V1-ndk.so
-lib64/android.hardware.sensors-V2-ndk.so
+lib64/android.hardware.sensors-V3-ndk.so
 lib64/android.hardware.sensors@1.0.so
 lib64/android.hardware.sensors@2.0-ScopedWakelock.so
 lib64/android.hardware.sensors@2.0.so
@@ -962,32 +1071,29 @@ lib64/android.hardware.soundtrigger@2.1.so
 lib64/android.hardware.soundtrigger@2.2.so
 lib64/android.hardware.soundtrigger@2.3.so
 lib64/android.hardware.thermal-V1-ndk.so
-lib64/android.hardware.thermal-V2-ndk.so
+lib64/android.hardware.thermal-V3-ndk.so
 lib64/android.hardware.thermal@1.0.so
 lib64/android.hardware.thermal@2.0.so
 lib64/android.hardware.usb-V3-ndk.so
 lib64/android.hardware.usb.gadget-V1-ndk.so
 lib64/android.hardware.usb.gadget@1.0.so
-lib64/android.hardware.vibrator-V2-ndk.so
-lib64/android.hardware.wifi-V2-ndk.so
-lib64/android.hardware.wifi.common-V1-ndk.so
-lib64/android.hardware.wifi.hostapd-V2-ndk.so
-lib64/android.hardware.wifi.supplicant-V3-ndk.so
+lib64/android.hardware.wifi-V3-ndk.so
+lib64/android.hardware.wifi.common-V2-ndk.so
+lib64/android.hardware.wifi.hostapd-V3-ndk.so
+lib64/android.hardware.wifi.supplicant-V4-ndk.so
 lib64/android.hidl.allocator@1.0.so
 lib64/android.hidl.memory.token@1.0.so
 lib64/android.hidl.memory@1.0.so
 lib64/android.hidl.safe_union@1.0.so
-lib64/android.media.audio.common.types-V3-ndk.so
+lib64/android.media.audio.common.types-V4-ndk.so
 lib64/android.system.keystore2-V1-ndk.so
 lib64/android.system.suspend-V1-ndk.so
 lib64/arm.graphics-V1-ndk.so
-lib64/com.google.hardware.pixel.display-V10-ndk.so
+lib64/com.google.hardware.pixel.display-V13-ndk.so
 lib64/hw/android.hardware.audio.effect@7.0-impl.so
 lib64/hw/android.hardware.audio@7.1-impl.so
 lib64/hw/android.hardware.graphics.allocator-aidl-impl.so
-lib64/hw/android.hardware.graphics.mapper@4.0-impl.so
 lib64/hw/android.hardware.soundtrigger@2.3-impl.so
-lib64/hw/android.hardware.vibrator-impl.cs40l26.so
 lib64/hw/android.hidl.memory@1.0-impl.so
 lib64/hw/audio.bluetooth.default.so
 lib64/hw/audio.primary.default.so
@@ -996,10 +1102,13 @@ lib64/hw/audio.usb.default.so
 lib64/hw/audio.usbv2.default.so
 lib64/hw/gralloc.default.so
 lib64/hw/local_time.default.so
+lib64/hw/mapper.pixel.so
 lib64/hw/power.default.so
 lib64/hw/vibrator.default.so
 lib64/libExynosHWCService.so
+lib64/libOpenCL.so
 lib64/lib_android_keymaster_keymint_utils.so
+lib64/libaconfig_storage_read_api_cc.so
 lib64/libacryl.so
 lib64/libacryl_hdr_plugin.so
 lib64/libalsautils.so
@@ -1015,8 +1124,6 @@ lib64/libbluetooth_audio_session_aidl.so
 lib64/libc++.so
 lib64/libcfg_if.dylib.so
 lib64/libclang_rt.ubsan_standalone-aarch64-android.so
-lib64/libcppbor_external.so
-lib64/libcppcose_rkp.so
 lib64/libcrypto.so
 lib64/libcutils.so
 lib64/libdisppower-pixel.so
@@ -1041,8 +1148,7 @@ lib64/libhwjpeg.so
 lib64/libion_google.so
 lib64/libjsoncpp.so
 lib64/libkeymaster_messages.so
-lib64/libkeymaster_portable.so
-lib64/libkeymint.so
+lib64/libkeymasterconfig.so
 lib64/libkeystore-engine-wifi-hidl.so
 lib64/liblibloading.dylib.so
 lib64/liblog_rust.dylib.so
@@ -1062,12 +1168,10 @@ lib64/libpower.so
 lib64/libprocessgroup.so
 lib64/libprotobuf-cpp-full-21.12.so
 lib64/libprotobuf-cpp-lite-21.12.so
-lib64/libpuresoftkeymasterdevice.so
 lib64/libreference-ril.so
 lib64/libril.so
 lib64/librilutils.so
 lib64/libsensorndkbridge.so
-lib64/libsoft_attestation_cert.so
 lib64/libspeexresampler.so
 lib64/libssl.so
 lib64/libstagefright_foundation.so
@@ -1109,29 +1213,66 @@ lib64/soundfx/libvisualizer.so
 odm/etc/build.prop
 odm/etc/group
 odm/etc/passwd
+odm/etc/selinux/odm_file_contexts
+odm/etc/selinux/odm_hwservice_contexts
+odm/etc/selinux/odm_mac_permissions.xml
+odm/etc/selinux/odm_property_contexts
+odm/etc/selinux/odm_seapp_contexts
+odm/etc/selinux/odm_sepolicy.cil
+odm/etc/selinux/odm_service_contexts
 odm_dlkm/etc/build.prop
-overlay/EmergencyInfo__panther__auto_generated_rro_vendor.apk
-overlay/NfcNci__panther__auto_generated_rro_vendor.apk
-overlay/ONS__panther__auto_generated_rro_vendor.apk
-overlay/Settings__panther__auto_generated_rro_vendor.apk
-overlay/StorageManager__panther__auto_generated_rro_vendor.apk
-overlay/SystemUI__panther__auto_generated_rro_vendor.apk
-overlay/TeleService__panther__auto_generated_rro_vendor.apk
-overlay/ThemePicker__panther__auto_generated_rro_vendor.apk
-overlay/Traceur__panther__auto_generated_rro_vendor.apk
-overlay/framework-res__panther__auto_generated_rro_vendor.apk
 vendor_dlkm/etc/build.prop
+vendor_dlkm/etc/debug_api/init.insmod.cheetah.cfg
+vendor_dlkm/etc/debug_api/init.insmod.lynx.cfg
+vendor_dlkm/etc/debug_api/init.insmod.panther.cfg
+vendor_dlkm/etc/debug_kmemleak/init.insmod.cheetah.cfg
+vendor_dlkm/etc/debug_kmemleak/init.insmod.lynx.cfg
+vendor_dlkm/etc/debug_kmemleak/init.insmod.panther.cfg
+vendor_dlkm/etc/debug_locking/init.insmod.cheetah.cfg
+vendor_dlkm/etc/debug_locking/init.insmod.lynx.cfg
+vendor_dlkm/etc/debug_locking/init.insmod.panther.cfg
+vendor_dlkm/etc/debug_memory/init.insmod.cheetah.cfg
+vendor_dlkm/etc/debug_memory/init.insmod.lynx.cfg
+vendor_dlkm/etc/debug_memory/init.insmod.panther.cfg
+vendor_dlkm/etc/debug_memory_accounting/init.insmod.cheetah.cfg
+vendor_dlkm/etc/debug_memory_accounting/init.insmod.lynx.cfg
+vendor_dlkm/etc/debug_memory_accounting/init.insmod.panther.cfg
+vendor_dlkm/etc/init.insmod.cheetah.cfg
+vendor_dlkm/etc/init.insmod.lynx.cfg
+vendor_dlkm/etc/init.insmod.panther.cfg
+vendor_dlkm/etc/kasan/init.insmod.cheetah.cfg
+vendor_dlkm/etc/kasan/init.insmod.lynx.cfg
+vendor_dlkm/etc/kasan/init.insmod.panther.cfg
 
 # Exclude overlays, symlinks and extra files that we override
 
 # Overlays
-overlay/DeviceDiagnostics__panther__auto_generated_rro_vendor.apk
 overlay/DMService__panther__auto_generated_rro_vendor.apk
+overlay/DeviceDiagnostics__panther__auto_generated_rro_vendor.apk
 overlay/Flipendo__panther__auto_generated_rro_vendor.apk
+overlay/NexusLauncherRelease__panther__auto_generated_rro_vendor.apk
+overlay/ONS__panther__auto_generated_rro_vendor.apk
 overlay/SettingsGoogle__panther__auto_generated_rro_vendor.apk
 overlay/StorageManagerGoogle__panther__auto_generated_rro_vendor.apk
 overlay/SystemUIGoogle__panther__auto_generated_rro_vendor.apk
+overlay/TeleService__panther__auto_generated_rro_vendor.apk
+overlay/Traceur__panther__auto_generated_rro_vendor.apk
 overlay/WallpaperPickerGoogleRelease__panther__auto_generated_rro_vendor.apk
+overlay/framework-res__panther__auto_generated_rro_vendor.apk
+
+# beta
+overlay/DMService__panther_beta__auto_generated_rro_vendor.apk
+overlay/DeviceDiagnostics__panther_beta__auto_generated_rro_vendor.apk
+overlay/Flipendo__panther_beta__auto_generated_rro_vendor.apk
+overlay/NexusLauncherRelease__panther_beta__auto_generated_rro_vendor.apk
+overlay/ONS__panther_beta__auto_generated_rro_vendor.apk
+overlay/SettingsGoogle__panther_beta__auto_generated_rro_vendor.apk
+overlay/StorageManagerGoogle__panther_beta__auto_generated_rro_vendor.apk
+overlay/SystemUIGoogle__panther_beta__auto_generated_rro_vendor.apk
+overlay/TeleService__panther_beta__auto_generated_rro_vendor.apk
+overlay/Traceur__panther_beta__auto_generated_rro_vendor.apk
+overlay/WallpaperPickerGoogleRelease__panther_beta__auto_generated_rro_vendor.apk
+overlay/framework-res__panther_beta__auto_generated_rro_vendor.apk
 
 # Symlinks
 lib/modules
@@ -1150,14 +1291,13 @@ lib64/libtinycompress.so
 
 # Bluetooth
 lib64/android.hardware.bluetooth-V1-ndk.so
+lib64/android.hardware.bluetooth.finder-V1-ndk.so
+lib64/android.hardware.bluetooth.ranging-V1-ndk.so
 lib64/hardware.google.bluetooth.bt_channel_avoidance@1.0.so
 
 # Camera
-lib/libGralloc4Wrapper.so
 lib/libdrm.so
 lib/pixel-power-ext-V1-ndk.so
-lib64/libGralloc4Wrapper.so
-lib64/libcamera2ndk_vendor.so
 
 # Charger
 etc/res/images/charger/battery_fail.png
@@ -1166,7 +1306,6 @@ etc/res/images/charger/main_font.png
 etc/res/values/charger/animation.txt
 
 # Codec2
-lib/android.hardware.media.bufferpool2-V1-ndk.so
 lib/android.hardware.media.bufferpool2-V2-ndk.so
 lib/android.hardware.media.bufferpool@2.0.so
 lib/android.hardware.media.c2-V1-ndk.so
@@ -1191,7 +1330,6 @@ lib/libstagefright_bufferqueue_helper.so
 lib/libstagefright_omx_utils.so
 lib/libstagefright_xmlparser.so
 lib/libvendorgraphicbuffer.so
-lib64/android.hardware.media.bufferpool2-V1-ndk.so
 lib64/android.hardware.media.bufferpool2-V2-ndk.so
 lib64/android.hardware.media.bufferpool@2.0.so
 lib64/android.hardware.media.c2-V1-ndk.so
@@ -1203,6 +1341,7 @@ lib64/android.hardware.media@1.0.so
 lib64/libavservices_minijail.so
 lib64/libcap.so
 lib64/libcodec2.so
+lib64/libcodec2_aidl.so
 lib64/libcodec2_hal_common.so
 lib64/libcodec2_hidl@1.0.so
 lib64/libcodec2_hidl@1.1.so
@@ -1230,9 +1369,10 @@ lib64/android.hardware.confirmationui@1.0.so
 lib64/libteeui_hal_support.so
 
 # Contexthub
+lib/android.hardware.contexthub-V3-ndk.so
 lib64/android.hardware.contexthub-V3-ndk.so
+lib64/android.hardware.contexthub-V4-ndk.so
 lib64/chre_atoms_log.so
-lib64/chre_metrics_reporter.so
 lib64/chremetrics-cpp.so
 
 # Fingerprint
@@ -1248,18 +1388,18 @@ lib/libhwbinder.so
 lib64/libhidltransport.so
 lib64/libhwbinder.so
 
-# Identity credential
-etc/permissions/android.hardware.identity_credential.xml
-lib64/android.hardware.identity-V5-ndk.so
-lib64/android.hardware.identity-support-lib.so
-
 # Json
 lib/libjsoncpp.so
 lib64/libjson.so
 
 # Nos
+lib64/android.hardware.security.keymint-V3-ndk.so
+lib64/libcppbor.so
+lib64/libcppcose_rkp.so
+lib64/libkeymaster_portable.so
 lib64/libkeymaster4support.so
 lib64/libkeymint_support.so
+lib64/libkeymint_support_V3.so
 lib64/libnos.so
 lib64/libnos_client_citadel.so
 lib64/libnos_datagram.so
@@ -1268,9 +1408,7 @@ lib64/libnos_feature.so
 lib64/libnos_transport.so
 lib64/libnosprotos.so
 lib64/nos_app_avb.so
-lib64/nos_app_identity.so
 lib64/nos_app_keymaster.so
-lib64/nos_app_keymaster_ctdl.so
 lib64/nos_app_weaver.so
 lib64/pixelpowerstats_provider_aidl_interface-cpp.so
 
@@ -1291,7 +1429,7 @@ lib64/modem_clock_manager_impl.so
 
 # Sensors
 lib/android.frameworks.sensorservice-V1-ndk.so
-lib/android.hardware.sensors-V2-ndk.so
+lib/android.hardware.sensors-V3-ndk.so
 lib/android.hardware.sensors@1.0.so
 lib/android.hardware.sensors@2.0-ScopedWakelock.so
 lib/android.hardware.sensors@2.0.so
@@ -1299,17 +1437,18 @@ lib/android.hardware.sensors@2.1.so
 lib/hw/sensors.dynamic_sensor_hal.so
 lib/libhidparser.so
 lib/libsensorndkbridge.so
+lib64/android.hardware.sensors-V2-ndk.so
 lib64/hw/sensors.dynamic_sensor_hal.so
 lib64/libhidparser.so
 
 # Trusty
 lib64/android.trusty.stats.nw.setter-cpp.so
-lib64/lib_sensor_listener.so
 lib64/libbinder_trusty.so
 lib64/libtrusty_metrics.so
 
 # Misc interfaces
 lib/android.frameworks.stats-V1-ndk.so
+lib/android.frameworks.stats-V2-ndk.so
 lib/android.hardware.graphics.allocator-V2-ndk.so
 lib/android.hardware.graphics.allocator@2.0.so
 lib/android.hardware.graphics.allocator@3.0.so
@@ -1344,12 +1483,9 @@ lib/android.hardware.thermal@2.0.so
 lib/android.hidl.token@1.0-utils.so
 lib/android.hidl.token@1.0.so
 lib/com.google.hardware.pixel.display-V9-ndk.so
-lib64/android.frameworks.sensorservice@1.0.so
 lib64/android.frameworks.stats-V1-cpp.so
 lib64/android.hardware.authsecret-V1-ndk.so
 lib64/android.hardware.biometrics.common-V3-ndk.so
-lib64/android.hardware.biometrics.face-V3-ndk.so
-lib64/android.hardware.biometrics.face@1.0.so
 lib64/android.hardware.biometrics.fingerprint-V3-ndk.so
 lib64/android.hardware.gnss-V3-ndk.so
 lib64/android.hardware.graphics.bufferqueue@1.0.so
@@ -1357,11 +1493,9 @@ lib64/android.hardware.graphics.bufferqueue@2.0.so
 lib64/android.hardware.health-V1-ndk.so
 lib64/android.hardware.input.common-V1-ndk.so
 lib64/android.hardware.input.processor-V1-ndk.so
-lib64/android.hardware.keymaster-V3-ndk.so
 lib64/android.hardware.keymaster-V4-ndk.so
 lib64/android.hardware.keymaster@3.0.so
 lib64/android.hardware.keymaster@4.0.so
-lib64/android.hardware.keymaster@4.1.so
 lib64/android.hardware.neuralnetworks-V4-ndk.so
 lib64/android.hardware.neuralnetworks@1.0.so
 lib64/android.hardware.neuralnetworks@1.1.so
@@ -1388,8 +1522,8 @@ lib64/android.hardware.radio@1.3.so
 lib64/android.hardware.radio@1.4.so
 lib64/android.hardware.radio@1.5.so
 lib64/android.hardware.radio@1.6.so
+lib64/android.hardware.vibrator-V3-ndk.so
 lib64/android.hardware.weaver-V2-ndk.so
-lib64/android.hardware.wifi-V1-ndk.so
 lib64/android.hidl.token@1.0-utils.so
 lib64/android.hidl.token@1.0.so
 lib64/com.google.hardware.pixel.display-V4-ndk.so
@@ -1405,6 +1539,12 @@ lib/libui.so
 lib64/libevent.so
 lib64/libion.so
 
+# Odex
+framework/oat/arm/com.google.android.camera.experimental2022.odex
+framework/oat/arm/com.google.android.camera.experimental2022.vdex
+framework/oat/arm64/com.google.android.camera.experimental2022.odex
+framework/oat/arm64/com.google.android.camera.experimental2022.vdex
+
 # Completely skip files that are not required
 
 # Edge TPU

panther/vendor.prop

@@ -11,6 +11,3 @@ persist.vendor.ril.support_nr_ds=1
 persist.vendor.ril.use_radio_hal=2.0
 ro.vendor.config.build_carrier=europen
 vendor.rild.libpath=libsitril.so
-
-# SSR
-vendor.debug.ssrdump.type=sscoredump

powerhint-cheetah-a0.json

@@ -773,30 +773,6 @@
       "Type": "DoHint",
       "Value": "LAUNCH_PMU"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDCPUSET_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDHIGHCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDMIDCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
-    },
     {
       "PowerHint": "LAUNCH_PMU",
       "Node": "PMU_POLL",
@@ -933,7 +909,7 @@
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 2500,
-      "Value": "1197000"
+      "Value": "1663000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
@@ -1019,6 +995,18 @@
       "Duration": 100,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_MULTICAM_BOOST",
+      "Node": "CDPreferIdle",
+      "Duration": 100,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_MULTICAM_BOOST",
+      "Node": "PMU_POLL",
+      "Duration": 100,
+      "Value": "0"
+    },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
       "Node": "TAPreferHighCap",
@@ -1812,18 +1800,6 @@
       "Duration": 50,
       "Value": "1"
     },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
     {
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "PowerHALRenderingState",
@@ -1959,25 +1935,19 @@
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
+      "Duration": 500,
       "Value": "9999999"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_LITTLE_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_MID_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 500,
+      "Value": "1826000"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
+      "Duration": 500,
       "Value": "1"
     },
     {
@@ -2123,6 +2093,8 @@
       "UclampMin_Init": 232,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -2130,7 +2102,17 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "REFRESH_90FPS",
@@ -2147,6 +2129,8 @@
       "UclampMin_Init": 162,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -2154,7 +2138,17 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "REFRESH_60FPS",
@@ -2171,6 +2165,8 @@
       "UclampMin_Init": 162,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -2178,7 +2174,17 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -2198,6 +2204,8 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 197,
       "UclampMin_Low": 197,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -2222,6 +2230,8 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 53,
       "UclampMin_Low": 53,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -2246,6 +2256,8 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,

powerhint-cheetah.json

@@ -356,14 +356,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "NewlyIdleBalancer",
-      "Path": "/proc/vendor_sched/idle_balancer",
-      "Values": [
-        "0",
-        "1"
-      ]
-    },
     {
       "Name": "DisplayWakeup",
       "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
@@ -1057,7 +1049,7 @@
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 2500,
-      "Value": "1197000"
+      "Value": "1663000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
@@ -1143,6 +1135,18 @@
       "Duration": 100,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_MULTICAM_BOOST",
+      "Node": "CDPreferIdle",
+      "Duration": 100,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_MULTICAM_BOOST",
+      "Node": "PMU_POLL",
+      "Duration": 100,
+      "Value": "0"
+    },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
       "Node": "TAPreferHighCap",
@@ -1419,12 +1423,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -1551,12 +1549,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -1665,12 +1657,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "PowerHALCameraRunning",
@@ -1749,12 +1735,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",
@@ -2032,18 +2012,6 @@
       "Duration": 50,
       "Value": "1"
     },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
     {
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "PowerHALRenderingState",
@@ -2227,25 +2195,19 @@
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
+      "Duration": 500,
       "Value": "9999999"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_LITTLE_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_MID_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 500,
+      "Value": "1826000"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
+      "Duration": 500,
       "Value": "1"
     },
     {
@@ -2317,16 +2279,28 @@
       "PID_Du": 0.0,
       "UclampMin_On": true,
       "UclampMin_Init": 232,
+      "UclampMin_LoadUp": 480,
+      "UclampMin_LoadReset": 480,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
       "ReportingRateLimitNs": 83333330,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 15.0
+      "StaleTimeFactor": 15.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "REFRESH_90FPS",
@@ -2341,16 +2315,28 @@
       "PID_Du": 0.0,
       "UclampMin_On": true,
       "UclampMin_Init": 162,
+      "UclampMin_LoadUp": 480,
+      "UclampMin_LoadReset": 480,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
       "ReportingRateLimitNs": 111111110,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 15.0
+      "StaleTimeFactor": 15.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "REFRESH_60FPS",
@@ -2365,16 +2351,28 @@
       "PID_Du": 0.0,
       "UclampMin_On": true,
       "UclampMin_Init": 162,
+      "UclampMin_LoadUp": 480,
+      "UclampMin_LoadReset": 480,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
       "ReportingRateLimitNs": 166666660,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 15.0
+      "StaleTimeFactor": 15.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -2394,9 +2392,9 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 197,
       "UclampMin_Low": 197,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 5.0
     },
@@ -2418,9 +2416,9 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 53,
       "UclampMin_Low": 53,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 5.0
     },
@@ -2442,9 +2440,9 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 5.0
     }

powerhint-cloudripper.json

@@ -1150,18 +1150,6 @@
       "Duration": 50,
       "Value": "1"
     },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
     {
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "PowerHALRenderingState",
@@ -1231,16 +1219,28 @@
       "PID_Du": 0.0,
       "UclampMin_On": true,
       "UclampMin_Init": 232,
+      "UclampMin_LoadUp": 480,
+      "UclampMin_LoadReset": 480,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
       "ReportingRateLimitNs": 83333330,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "REFRESH_90FPS",
@@ -1255,16 +1255,28 @@
       "PID_Du": 0.0,
       "UclampMin_On": true,
       "UclampMin_Init": 162,
+      "UclampMin_LoadUp": 480,
+      "UclampMin_LoadReset": 480,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
       "ReportingRateLimitNs": 111111110,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "REFRESH_60FPS",
@@ -1279,16 +1291,28 @@
       "PID_Du": 0.0,
       "UclampMin_On": true,
       "UclampMin_Init": 162,
+      "UclampMin_LoadUp": 480,
+      "UclampMin_LoadReset": 480,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
       "ReportingRateLimitNs": 166666660,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -1308,9 +1332,9 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 197,
       "UclampMin_Low": 197,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 5.0
     },
@@ -1332,9 +1356,9 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 53,
       "UclampMin_Low": 53,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 5.0
     },
@@ -1356,9 +1380,9 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 5.0
     }

powerhint-panther-a0.json

@@ -762,30 +762,6 @@
       "Type": "DoHint",
       "Value": "LAUNCH_PMU"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDCPUSET_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDHIGHCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDMIDCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
-    },
     {
       "PowerHint": "LAUNCH_PMU",
       "Node": "PMU_POLL",
@@ -922,7 +898,7 @@
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 2500,
-      "Value": "1197000"
+      "Value": "1663000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
@@ -1008,6 +984,18 @@
       "Duration": 100,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_MULTICAM_BOOST",
+      "Node": "CDPreferIdle",
+      "Duration": 100,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_MULTICAM_BOOST",
+      "Node": "PMU_POLL",
+      "Duration": 100,
+      "Value": "0"
+    },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
       "Node": "TAPreferHighCap",
@@ -1699,18 +1687,6 @@
       "Duration": 50,
       "Value": "1"
     },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
     {
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "PowerHALRenderingState",
@@ -1846,25 +1822,19 @@
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
+      "Duration": 500,
       "Value": "9999999"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_LITTLE_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_MID_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 500,
+      "Value": "1826000"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
+      "Duration": 500,
       "Value": "1"
     },
     {
@@ -2010,6 +1980,8 @@
       "UclampMin_Init": 232,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -2017,7 +1989,17 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "REFRESH_90FPS",
@@ -2034,6 +2016,8 @@
       "UclampMin_Init": 162,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -2041,7 +2025,17 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "REFRESH_60FPS",
@@ -2058,6 +2052,8 @@
       "UclampMin_Init": 162,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -2065,7 +2061,17 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -2085,6 +2091,8 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 197,
       "UclampMin_Low": 197,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -2109,6 +2117,8 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 53,
       "UclampMin_Low": 53,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -2133,6 +2143,8 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,

powerhint-panther.json

@@ -336,14 +336,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "NewlyIdleBalancer",
-      "Path": "/proc/vendor_sched/idle_balancer",
-      "Values": [
-        "0",
-        "1"
-      ]
-    },
     {
       "Name": "DisplayWakeup",
       "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
@@ -1015,7 +1007,7 @@
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 2500,
-      "Value": "1197000"
+      "Value": "1663000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
@@ -1101,6 +1093,18 @@
       "Duration": 100,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_MULTICAM_BOOST",
+      "Node": "CDPreferIdle",
+      "Duration": 100,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_MULTICAM_BOOST",
+      "Node": "PMU_POLL",
+      "Duration": 100,
+      "Value": "0"
+    },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
       "Node": "TAPreferHighCap",
@@ -1275,12 +1279,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -1407,12 +1405,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -1521,12 +1513,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "PowerHALCameraRunning",
@@ -1605,12 +1591,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",
@@ -1888,18 +1868,6 @@
       "Duration": 50,
       "Value": "1"
     },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
     {
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "PowerHALRenderingState",
@@ -2083,25 +2051,19 @@
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
+      "Duration": 500,
       "Value": "9999999"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_LITTLE_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_MID_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 500,
+      "Value": "1826000"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
+      "Duration": 500,
       "Value": "1"
     },
     {
@@ -2173,16 +2135,28 @@
       "PID_Du": 0.0,
       "UclampMin_On": true,
       "UclampMin_Init": 232,
+      "UclampMin_LoadUp": 480,
+      "UclampMin_LoadReset": 480,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
       "ReportingRateLimitNs": 83333330,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 15.0
+      "StaleTimeFactor": 15.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "REFRESH_90FPS",
@@ -2197,16 +2171,28 @@
       "PID_Du": 0.0,
       "UclampMin_On": true,
       "UclampMin_Init": 162,
+      "UclampMin_LoadUp": 480,
+      "UclampMin_LoadReset": 480,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
       "ReportingRateLimitNs": 111111110,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 15.0
+      "StaleTimeFactor": 15.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "REFRESH_60FPS",
@@ -2221,16 +2207,28 @@
       "PID_Du": 0.0,
       "UclampMin_On": true,
       "UclampMin_Init": 162,
+      "UclampMin_LoadUp": 480,
+      "UclampMin_LoadReset": 480,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
       "ReportingRateLimitNs": 166666660,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 15.0
+      "StaleTimeFactor": 15.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -2250,9 +2248,9 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 197,
       "UclampMin_Low": 197,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 5.0
     },
@@ -2274,9 +2272,9 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 53,
       "UclampMin_Low": 53,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 5.0
     },
@@ -2298,9 +2296,9 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 5.0
     }

powerhint-ravenclaw.json

@@ -1150,18 +1150,6 @@
       "Duration": 50,
       "Value": "1"
     },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
     {
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "PowerHALRenderingState",
@@ -1233,6 +1221,8 @@
       "UclampMin_Init": 232,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -1240,7 +1230,17 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "REFRESH_90FPS",
@@ -1257,6 +1257,8 @@
       "UclampMin_Init": 162,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -1264,7 +1266,17 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "REFRESH_60FPS",
@@ -1281,6 +1293,8 @@
       "UclampMin_Init": 162,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -1288,7 +1302,17 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -1308,6 +1332,8 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 197,
       "UclampMin_Low": 197,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -1332,6 +1358,8 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 53,
       "UclampMin_Low": 53,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -1356,6 +1384,8 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,

ravenclaw/BoardConfig.mk

@@ -15,18 +15,12 @@
 #
 TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := ravenclaw
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
-else
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
-endif
 TARGET_SCREEN_DENSITY := 560
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_CLOUDRIPPER := true
 
 include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 include device/google/pantah-sepolicy/ravenclaw-sepolicy.mk
 include device/google/pantah/wifi/BoardConfig-wifi.mk

sepolicy/cheetah-sepolicy.mk

@@ -1,3 +1,5 @@
 # sepolicy that are shared among devices using whitechapel
 BOARD_SEPOLICY_DIRS += device/google/pantah/sepolicy/cheetah
 
+BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/common
+BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/cs40l26

sepolicy/panther-sepolicy.mk

@@ -1,2 +1,5 @@
 # sepolicy that are shared among devices using whitechapel
 BOARD_SEPOLICY_DIRS += device/google/pantah/sepolicy/panther
+
+BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/common
+BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/cs40l26

thermal_info_config_charge_cheetah.json

@@ -3,13 +3,11 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"qi_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/qi_therm/tz_temp",
             "Multiplier":0.001
         },
         {
@@ -17,7 +15,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 32.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -26,7 +23,6 @@
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -34,7 +30,6 @@
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001
         },
         {

thermal_info_config_charge_panther.json

@@ -3,20 +3,17 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"qi_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/qi_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -24,7 +21,6 @@
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001
         },
         {
@@ -32,7 +28,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 32.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000

thermal_info_config_cheetah.json

@@ -9,19 +9,16 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"gnss_tcxo_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"qi_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/qi_therm/tz_temp",
             "Multiplier":0.001
         },
         {
@@ -29,7 +26,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 32.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -38,7 +34,6 @@
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -46,13 +41,11 @@
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001
         },
         {
@@ -429,348 +422,28 @@
             "Type":"NPU",
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "Multiplier":0.001
-        },
-        {
-            "Name":"battery_cycle",
-            "Type":"BCL_VOLTAGE",
-            "Multiplier":1,
-            "Monitor":false
-        },
-        {
-            "Name":"critical-battery-cell",
-            "Type":"BCL_VOLTAGE",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "vdroop1",
-            "Combination":["battery", "battery_cycle", "vdroop1"],
-            "Coefficient":[-10000, 400, 1000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"],
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"FLASH_LED_REDUCE",
-            "Type":"UNKNOWN",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "vdroop1",
-            "Combination":["battery", "battery_cycle", "vdroop1"],
-            "Coefficient":[-10000, 400, 1000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "SendPowerHint":true
-        },
-        {
-            "Name":"soc",
-            "Type":"BCL_PERCENTAGE",
-            "HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"],
-            "Multiplier":1
-        },
-        {
-            "Name":"BCL_TPU_LOW_TEMP",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "TriggerSensor": "ocp_tpu",
-            "Combination":["ocp_tpu", "battery"],
-            "Coefficient":[1, -10],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_GPU_LOW_TEMP",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "TriggerSensor": "ocp_gpu",
-            "Combination":["ocp_gpu", "battery"],
-            "Coefficient":[1, -10],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 9, 9, 9]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_BATOILO_GPU_LOW_TEMP",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "batoilo",
-            "Combination":["batoilo", "ocp_gpu", "battery"],
-            "Coefficient":[5000, 12000, -1000 ],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN",  3.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 9, 9, 9]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_BATOILO_TPU_LOW_TEMP",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "batoilo",
-            "Combination":["batoilo", "ocp_tpu", "battery"],
-            "Coefficient":[5000, 12000, -1000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_BATOILO_GPU",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "batoilo",
-            "Combination":["batoilo", "ocp_gpu"],
-            "Coefficient":[5000, 12000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_BATOILO_TPU",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "batoilo",
-            "Combination":[
-                "batoilo",
-                "ocp_tpu"
-            ],
-            "Coefficient":[5000, 12000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 6, 6, 6]
-                }
-            ]
-        },
-        {
-            "Name":"batoilo",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_AUDIO_BAACL",
-            "Type":"BCL_VOLTAGE",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "soc",
-            "Combination":["battery", "soc"],
-            "Coefficient":[-25000, 80],
-            "HotThreshold":["NAN", "NAN",  "NAN", "NAN", 2.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"vdroop1",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
-        },
-        {
-            "Name":"vdroop2",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
-        },
-        {
-            "Name":"smpl_gm",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
-        },
-        {
-            "Name":"ocp_cpu1",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Hidden":true
-        },
-        {
-            "Name":"ocp_cpu2",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Hidden":true
-        },
-        {
-            "Name":"ocp_tpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1
-        },
-        {
-            "Name":"ocp_gpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1
-        },
-        {
-            "Name":"soft_ocp_cpu2",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1
-        },
-        {
-            "Name":"soft_ocp_cpu1",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1
-        },
-        {
-            "Name":"soft_ocp_tpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Hidden":true
-        },
-        {
-            "Name":"soft_ocp_gpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Hidden":true
         }
     ],
     "CoolingDevices":[
         {
             "Name":"thermal-cpufreq-0",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
-            "State2Power":[1100, 1050, 1000, 950, 900, 850, 800, 750, 700, 650, 600]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
         },
         {
             "Name":"thermal-cpufreq-1",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
-            "State2Power":[1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
         },
         {
             "Name":"thermal-cpufreq-2",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
-            "State2Power":[1450, 1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
         },
         {
             "Name":"thermal-gpufreq-0",
             "Type":"GPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote",
-            "State2Power":[4371, 3543, 3085, 2293, 1927, 1707, 1394, 1171, 967, 768, 592, 433]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
         },
         {
             "Name":"chg_mdis",

thermal_info_config_cloudripper.json

@@ -60,479 +60,6 @@
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
-        {
-            "Name":"battery_cycle",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN"
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1,
-            "Monitor":false
-        },
-        {
-            "Name":"critical-battery-cell",
-            "Type":"BCL_VOLTAGE",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "vdroop1",
-            "Combination":[
-                "battery",
-                "battery_cycle",
-                "vdroop1"
-            ],
-            "Coefficient":[
-                "-10000",
-                "400",
-                "1000"
-            ],
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                3.00,
-                "NAN"
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"FLASH_LED_REDUCE",
-            "Type":"UNKNOWN",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "vdroop1",
-            "Combination":[
-                "battery",
-                "battery_cycle",
-                "vdroop1"
-            ],
-            "Coefficient":[
-                "-10000",
-                "400",
-                "1000"
-            ],
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                3.00,
-                "NAN",
-                "NAN"
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1,
-            "Monitor":true,
-            "SendPowerHint":true
-        },
-        {
-            "Name":"soc",
-            "Type":"BCL_PERCENTAGE",
-            "HotThreshold":[
-                "NAN",
-                80,
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN"
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1
-        },
-        {
-            "Name":"batoilo",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                5000,
-                "NAN",
-                "NAN"
-            ],
-            "HotHysteresis":[
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                100,
-                0.0,
-                0.0
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_AUDIO_BAACL",
-            "Type":"BCL_VOLTAGE",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "soc",
-            "Combination":[
-                "battery",
-                "soc"
-            ],
-            "Coefficient":[
-                "-25000",
-                "80"
-            ],
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                2.0,
-                "NAN",
-                "NAN"
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"vdroop1",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                1000,
-                "NAN",
-                "NAN"
-            ],
-            "HotHysteresis":[
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                100,
-                0.0,
-                0.0
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 10, 10]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
-        },
-        {
-            "Name":"vdroop2",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                1200,
-                "NAN",
-                "NAN"
-            ],
-            "HotHysteresis":[
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                100,
-                0.0,
-                0.0
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 10, 10]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
-        },
-        {
-            "Name":"smpl_gm",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                1100,
-                "NAN",
-                "NAN"
-            ],
-            "HotHysteresis":[
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                100,
-                0.0,
-                0.0
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 10, 10]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
-        },
-        {
-            "Name":"ocp_cpu1",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                7000,
-                "NAN",
-                "NAN"
-            ],
-            "HotHysteresis":[
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                100,
-                0.0,
-                0.0
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1
-        },
-        {
-            "Name":"ocp_cpu2",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                12000,
-                "NAN",
-                "NAN"
-            ],
-            "HotHysteresis":[
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                100,
-                0.0,
-                0.0
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1
-        },
-        {
-            "Name":"ocp_tpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                10500,
-                "NAN",
-                "NAN"
-            ],
-            "HotHysteresis":[
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                100,
-                0.0,
-                0.0
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1
-        },
-        {
-            "Name":"ocp_gpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                12000,
-                "NAN",
-                "NAN"
-            ],
-            "HotHysteresis":[
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                100,
-                0.0,
-                0.0
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1
-        },
-        {
-            "Name":"soft_ocp_cpu2",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                9000,
-                "NAN",
-                "NAN"
-            ],
-            "HotHysteresis":[
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                100,
-                0.0,
-                0.0
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1
-        },
-        {
-            "Name":"soft_ocp_cpu1",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                7000,
-                "NAN",
-                "NAN"
-            ],
-            "HotHysteresis":[
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                100,
-                0.0,
-                0.0
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1
-        },
-        {
-            "Name":"soft_ocp_tpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                8500,
-                "NAN",
-                "NAN"
-            ],
-            "HotHysteresis":[
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                100,
-                0.0,
-                0.0
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1
-        },
-        {
-            "Name":"soft_ocp_gpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                9000,
-                "NAN",
-                "NAN"
-            ],
-            "HotHysteresis":[
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                100,
-                0.0,
-                0.0
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1
-        },
         {
             "Name":"TPU",
             "Type":"NPU",
@@ -553,20 +80,17 @@
         {
             "Name":"thermal-cpufreq-0",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
-            "State2Power":["1100", "1050", "1000", "950", "900", "850", "800", "750", "700", "650", "600"]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
         },
         {
             "Name":"thermal-cpufreq-1",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
-            "State2Power":["1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
         },
         {
             "Name":"thermal-cpufreq-2",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
-            "State2Power":["1450", "1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
         },
         {
             "Name":"thermal-gpufreq-0",

thermal_info_config_panther.json

@@ -9,26 +9,22 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"gnss_tcxo_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"qi_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/qi_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -36,13 +32,11 @@
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001
         },
         {
@@ -50,7 +44,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 32.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -429,349 +422,28 @@
             "Type":"NPU",
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "Multiplier":0.001
-        },
-        {
-            "Name":"battery_cycle",
-            "Type":"BCL_VOLTAGE",
-            "Multiplier":1,
-            "Monitor":false
-        },
-        {
-            "Name":"critical-battery-cell",
-            "Type":"BCL_VOLTAGE",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "vdroop1",
-            "Combination":["battery", "battery_cycle", "vdroop1"],
-            "Coefficient":[-10000, 400, 1000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"],
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"FLASH_LED_REDUCE",
-            "Type":"UNKNOWN",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "vdroop1",
-            "Combination":["battery", "battery_cycle", "vdroop1"],
-            "Coefficient":[-10000, 400, 1000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "SendPowerHint":true
-        },
-        {
-            "Name":"soc",
-            "Type":"BCL_PERCENTAGE",
-            "HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"BCL_TPU_LOW_TEMP",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "TriggerSensor": "ocp_tpu",
-            "Combination":["ocp_tpu", "battery"],
-            "Coefficient":[1, -10],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_GPU_LOW_TEMP",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "TriggerSensor": "ocp_gpu",
-            "Combination":["ocp_gpu", "battery"],
-            "Coefficient":[1, -10],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 9, 9, 9]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_BATOILO_GPU_LOW_TEMP",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "batoilo",
-            "Combination":["batoilo", "ocp_gpu", "battery"],
-            "Coefficient":[5000, 12000, -1000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN",  3.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 9, 9, 9]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_BATOILO_TPU_LOW_TEMP",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "batoilo",
-            "Combination":["batoilo", "ocp_tpu", "battery"],
-            "Coefficient":[5000, 12000, -1000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_BATOILO_GPU",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "batoilo",
-            "Combination":["batoilo", "ocp_gpu"],
-            "Coefficient":[5000, 12000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_BATOILO_TPU",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "batoilo",
-            "Combination":[
-                "batoilo",
-                "ocp_tpu"
-            ],
-            "Coefficient":[5000, 12000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 6, 6, 6]
-                }
-            ]
-        },
-        {
-            "Name":"batoilo",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_AUDIO_BAACL",
-            "Type":"BCL_VOLTAGE",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "soc",
-            "Combination":["battery", "soc"],
-            "Coefficient":[-25000, 80],
-            "HotThreshold":["NAN", "NAN",  "NAN", "NAN", 2.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"vdroop1",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
-        },
-        {
-            "Name":"vdroop2",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
-        },
-        {
-            "Name":"smpl_gm",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
-        },
-        {
-            "Name":"ocp_cpu1",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Hidden":true
-        },
-        {
-            "Name":"ocp_cpu2",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Hidden":true
-        },
-        {
-            "Name":"ocp_tpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1
-        },
-        {
-            "Name":"ocp_gpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1
-        },
-        {
-            "Name":"soft_ocp_cpu2",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1
-        },
-        {
-            "Name":"soft_ocp_cpu1",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1
-        },
-        {
-            "Name":"soft_ocp_tpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Hidden":true
-        },
-        {
-            "Name":"soft_ocp_gpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Hidden":true
         }
     ],
     "CoolingDevices":[
         {
             "Name":"thermal-cpufreq-0",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
-            "State2Power":[1100, 1050, 1000, 950, 900, 850, 800, 750, 700, 650, 600]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
         },
         {
             "Name":"thermal-cpufreq-1",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
-            "State2Power":[1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
         },
         {
             "Name":"thermal-cpufreq-2",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
-            "State2Power":[1450, 1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
         },
         {
             "Name":"thermal-gpufreq-0",
             "Type":"GPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote",
-            "State2Power":[4599, 3727, 3259, 2378, 2044, 1813, 1449, 1223, 1007, 804, 633, 452]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
         },
         {
             "Name":"chg_mdis",

thermal_info_config_proto.json

@@ -562,20 +562,17 @@
         {
             "Name":"thermal-cpufreq-0",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
-            "State2Power":["1100", "1050", "1000", "950", "900", "850", "800", "750", "700", "650", "600"]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
         },
         {
             "Name":"thermal-cpufreq-1",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
-            "State2Power":["1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
         },
         {
             "Name":"thermal-cpufreq-2",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
-            "State2Power":["1450", "1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
         },
         {
             "Name":"thermal-gpufreq-0",