felix: Initialize for Evolution X 9.x

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

BoardConfigEvolution.mk

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

BoardConfigLineage.mk

@@ -1,11 +1,5 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # 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,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS

audio/felix/aidl_config/mixer_paths_aidl.xml

@@ -1344,7 +1344,7 @@
     <path name="bluetooth-sco-headset-microphones" />
   </path>
 
-  <path name="usb-microphones">
+  <path name="usb-headset-microphones">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
@@ -1354,15 +1354,6 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="usb-headset-microphones">
-    <path name="usb-microphones" />
-  </path>
-
-  <path name="usb-device-microphones">
-    <path name="usb-microphones" />
-  </path>
-
-
   <!-- cs35l41 specific path to load firmware in cs35l41.c -->
   <path name="cs35l41-load-protection-firmware-start">
     <!-- Enable it after get the protection firmware -->

audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml

@@ -59,7 +59,7 @@
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
-                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">

audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml

@@ -59,7 +59,7 @@
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
-                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="incall playback" role="source"

audio/felix/config/audio_policy_configuration_le_offload_disabled.xml

@@ -60,7 +60,7 @@
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
-                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">

audio/felix/config/bluetooth_with_le_audio_policy_configuration_7_0.xml

@@ -11,7 +11,6 @@
                      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"
@@ -52,7 +51,6 @@
         <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"
@@ -68,8 +66,6 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-            sources="le audio output"/>
-        <route type="mix" sink="BLE Broadcast Out"
-            sources="le audio broadcast output"/>
+               sources="le audio output"/>
     </routes>
 </module>

bluetooth/bt_vendor_overlay.conf

@@ -3,7 +3,4 @@
 # Uart port name
 UartPort = /dev/ttySAC18
 
-# Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 262238
-
 BtOpusEnabled = true

conf/init.felix.rc

@@ -86,7 +86,7 @@ on early-boot
     start insmod_sh_felix
     chown system system /sys/class/power_supply/dualbatt/dbatt_stats
 
-service insmod_sh_felix /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.felix.cfg
+service insmod_sh_felix /vendor/bin/insmod.sh /vendor/etc/init.insmod.felix.cfg
     class main
     user root
     group root system

device-evolution.mk

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

device-felix.mk

@@ -17,12 +17,18 @@
 # 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/felix-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/felix-kernel/kernel-headers
 TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT
 
-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_FELIX_VERSION)
-# Keeps flexibility for kasan and ufs builds
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_FELIX_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_FELIX_DIR)/kernel-headers
+ifdef RELEASE_GOOGLE_FELIX_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_FELIX_KERNEL_VERSION)
+endif
+
+ifdef RELEASE_GOOGLE_FELIX_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_FELIX_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_FELIX_KERNEL_DIR)/kernel-headers
+endif
 
 $(call inherit-product-if-exists, vendor/google_devices/felix/prebuilts/device-vendor-felix.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
@@ -41,8 +47,8 @@ $(call soong_config_set,fp_hal_feature,pixel_product, product_a)
 include device/google/felix/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/display/dump_second_display.mk
-include device/google/gs-common/touch/gti/predump_gti_dual.mk
-include device/google/gs-common/touch/stm/predump_stm6.mk
+include device/google/gs-common/touch/gti/gti.mk
+include device/google/gs-common/touch/stm/stm6.mk
 ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),)
 include device/google/felix/uwb/uwb_calibration.mk
 endif
@@ -60,13 +66,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/felix/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.felix.rc
 
-# 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),)
+# insmod files
 PRODUCT_COPY_FILES += \
-	device/google/felix/init.insmod.felix.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.felix.cfg
-endif
+	device/google/felix/init.insmod.felix.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.felix.cfg
 
 # Camera
 PRODUCT_COPY_FILES += \
@@ -112,12 +114,6 @@ PRODUCT_PACKAGES += \
 	android.hardware.nfc-service.st \
 	NfcOverlayFelix
 
-# 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 \
@@ -150,10 +146,6 @@ 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 Tx power caps
 PRODUCT_COPY_FILES += \
     device/google/felix/bluetooth/bluetooth_power_limits_felix_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
@@ -176,11 +168,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
        persist.vendor.audio.spatializer.speaker_enabled=true
 
 # Bluetooth SAR test tool
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
     sar_test
 
 # Bluetooth hci_inject test tool
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
     hci_inject
 
 # Bluetooth
@@ -237,26 +229,7 @@ endif
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=$(TARGET_SVN)
 
-# Set device family property for SMR
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.build.device_family=F10
-
-# Set build properties for SMR builds
-ifeq ($(RELEASE_IS_SMR), true)
-    ifneq (,$(RELEASE_BASE_OS_FELIX))
-        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_FELIX)
-    endif
-endif
-
-# Set build properties for EMR builds
-ifeq ($(RELEASE_IS_EMR), true)
-    ifneq (,$(RELEASE_BASE_OS_FELIX))
-        PRODUCT_PROPERTY_OVERRIDES += \
-        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_FELIX)
-    endif
-endif
 # Vibrator HAL
-$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 PRODUCT_VENDOR_PROPERTIES +=\
     ro.vendor.vibrator.hal.long.frequency.shift=0 \
     ro.vendor.vibrator.hal.gpio.num=44 \
@@ -264,10 +237,6 @@ PRODUCT_VENDOR_PROPERTIES +=\
     persist.vendor.vibrator.hal.chirp.enabled=0
 ACTUATOR_MODEL := luxshare_ict_lt_xlra1906d
 
-# Override Output Distortion Gain
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.audio.hapticgenerator.distortion.output.gain=0.52
-
 # Fingerprint
 include device/google/gs101/fingerprint/fpc1540/sw42/fpc1540.mk
 FPC_MODULE_TYPE=1542_C
@@ -302,6 +271,13 @@ PRODUCT_PACKAGES += \
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q2
+else
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk
+endif
 
 # Set zram size
 PRODUCT_VENDOR_PROPERTIES += \
@@ -318,26 +294,14 @@ PRODUCT_COPY_FILES += \
 # Location
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \
+        device/google/felix/location/gps.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
         device/google/felix/location/lhd.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
         device/google/felix/location/scd.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
-    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
-        PRODUCT_COPY_FILES += \
-            device/google/felix/location/gps.6.1.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-    else
-        PRODUCT_COPY_FILES += \
-            device/google/felix/location/gps.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-    endif
 else
     PRODUCT_COPY_FILES += \
+        device/google/felix/location/gps_user.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
         device/google/felix/location/lhd_user.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
         device/google/felix/location/scd_user.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
-    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
-        PRODUCT_COPY_FILES += \
-            device/google/felix/location/gps_user.6.1.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-    else
-        PRODUCT_COPY_FILES += \
-            device/google/felix/location/gps_user.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-    endif
 endif
 
 PRODUCT_PACKAGES += \
@@ -433,10 +397,10 @@ PRODUCT_COPY_FILES += \
 
 # LE Audio Unicast Allowlist
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630
+    persist.bluetooth.leaudio.allow_list=SM-R510
 
 # Bluetooth EWP test tool
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
     ewp_tool
 
 # Enable DeviceAsWebcam support
@@ -456,7 +420,3 @@ PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
 
-# Bluetooth device id
-# Felix: 0x410C
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=16652

device-lineage.mk

@@ -1,10 +1,11 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-lineage
+# Overlays
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
 
 # ANGLE - Almost Native Graphics Layer Engine
 PRODUCT_PACKAGES += \
@@ -17,17 +18,12 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     EuiccSupportPixelOverlay
 
-# Fold extensions
-PRODUCT_SYSTEM_SERVER_JARS += \
-    system_ext:felix-services
-
 # HBM
 PRODUCT_PACKAGES += \
     HbmSVManagerOverlayFelix
 
-# IWLAN
-PRODUCT_PACKAGES += \
-    Iwlan
+# Kernel
+TARGET_PREBUILT_KERNEL := device/google/felix-kernel/Image.lz4
 
 # wireless_charger HAL service
 include device/google/gs-common/wireless_charger/wireless_charger.mk
@@ -40,16 +36,19 @@ PRODUCT_PACKAGES += \
     libacryl_hdr_plugin \
     libexynosv4l2
 
-# 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
+
+# Properties
+TARGET_VENDOR_PROP := $(LOCAL_PATH)/vendor.prop

device_framework_matrix_product_felix.xml

@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework" level="7">
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>13</version>
+        <version>10</version>
         <interface>
             <name>IDisplay</name>
             <instance>secondary</instance>

evolution.dependencies

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

extract-files.py

@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-MY_DIR="$(cd "$(dirname "${0}")"; pwd -P)"
-
-pushd "${MY_DIR}/felix"
-./extract-files.py $@
-popd

extract-files.sh

@@ -0,0 +1,149 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=felix
+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"

felix/Android.bp

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

felix/BoardConfig.mk

@@ -21,15 +21,18 @@ USES_DEVICE_GOOGLE_FELIX := true
 BOARD_KERNEL_CMDLINE += swiotlb=noforce
 
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR)
-RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR)
-$(call soong_config_set,felix_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_FELIX_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
 
 # Enable load module in parallel
 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
 BOARD_KERNEL_CMDLINE += panel-samsung-ana6707-f10.load_sequential=1
 BOARD_KERNEL_CMDLINE += s2mpg12-regulator.load_sequential=1
@@ -39,12 +42,8 @@ USES_IDISPLAY_INTF_SEC := 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 vendor/google_devices/felix/proprietary/BoardConfigVendor.mk
 include device/google/felix/sepolicy/felix-sepolicy.mk
 include device/google/felix/wifi/BoardConfig-wifi.mk
 
-DEVICE_PATH := device/google/felix
-VENDOR_PATH := vendor/google/felix
-include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
-include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
+include device/google/felix/felix/BoardConfigLineage.mk

felix/BoardConfigEvolution.mk

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

felix/BoardConfigLineage.mk

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

felix/device-evolution.mk

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

felix/device-lineage.mk

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

felix/extract-files.py

@@ -1,107 +0,0 @@
-#!/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/felix',
-    '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(
-    'felix',
-    'google',
-    device_rel_path='device/google/felix/felix',
-    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()

felix/init.recovery.touch.rc

@@ -1,4 +0,0 @@
-on init
-   insmod /lib/modules/goog_touch_interface.ko
-   insmod /lib/modules/fst2.ko
-   insmod /lib/modules/ftm5.ko

felix/osaifu-keitai.patch

@@ -1,24 +0,0 @@
-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
-

felix/overlay/frameworks/base/core/res/res/values/config.xml

@@ -221,9 +221,6 @@
     <!-- Indicates whether to enable hinge angle sensor when using unfold animation -->
     <bool name="config_unfoldTransitionHingeAngle">true</bool>
 
-    <!-- Indicates whether to enable haptics during unfold animation -->
-    <bool name="config_unfoldTransitionHapticsEnabled">true</bool>
-
     <!-- Timeout for receiving the keyguard drawn event from System UI.  -->
     <integer name="config_keyguardDrawnTimeout">1700</integer>
 

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

@@ -16,6 +16,6 @@
 */
 -->
 <resources>
-    <!-- Default paddings for content around the corners. -->
-    <dimen name="rounded_corner_content_padding">14dp</dimen>
+   <!-- for 20dp of padding at 3.5px/dp at default density -->
+    <dimen name="rounded_corner_content_padding">50px</dimen>
 </resources>

felix/overlay/frameworks/base/core/res/res/xml/power_profile.xml

@@ -151,17 +151,13 @@
     </array>
 
     <!-- Additional power used when screen is ambient mode -->
-    <item name="ambient.on.display0">32</item>
-    <item name="ambient.on.display1">32</item>
+    <item name="ambient.on">32</item>
 
     <!-- Additional power used when screen is turned on at minimum brightness -->
-    <item name="screen.on.display0">98</item>
-    <item name="screen.on.display1">98</item>
-
+    <item name="screen.on">98</item>
     <!-- Additional power used when screen is at maximum brightness, compared to
          screen at minimum brightness -->
-    <item name="screen.full.display0">470</item>
-    <item name="screen.full.display1">470</item>
+    <item name="screen.full">470</item>
 
     <!-- Average power used by the camera flash module when on -->
     <item name="camera.flashlight">240.47</item>

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

@@ -16,6 +16,10 @@
 */
 -->
 <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>

felix/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp-land/styles.xml

@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="AuthNonBioCredentialPatternContainerStyle">
+    <style name="AuthCredentialPatternContainerStyle">
         <item name="android:gravity">center</item>
         <item name="android:maxHeight">@dimen/biometric_auth_pattern_view_max_size</item>
         <item name="android:maxWidth">@dimen/biometric_auth_pattern_view_max_size</item>

felix/overlay/frameworks/base/packages/SystemUI/res/values/config.xml

@@ -148,8 +148,5 @@
          4 : DEVICE_POSTURE_FLIPPED
     -->
     <integer name="config_face_auth_supported_posture">1</integer>
-
-    <!--  Whether to use a machine learning model for back gesture falsing. -->
-    <bool name="config_useBackGestureML">false</bool>
 </resources>
 

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

@@ -16,20 +16,21 @@
 */
 -->
 <resources>
-    <!-- the padding on the start of the statusbar -->
+    <!-- Don't need the left side padding due to being inset from the cutout -->
     <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_default</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">40px</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="keyguard_carrier_text_margin">0px</dimen>
 
     <dimen name="config_rounded_mask_size">71px</dimen>
     <dimen name="config_rounded_mask_size_top">71px</dimen>

felix/radio/felix_display_secondary_mipi_coex_table.csv

@@ -1,7 +1,7 @@
-365000,335000
+730000,670000
 
-1810000,1835000,335000
-720000,740000,335000
-0,710000,365000
-750000,1800000,365000
-1845000,50000000,365000
+1810000,1835000,670000
+720000,740000,670000
+0,710000,730000
+750000,1800000,730000
+1845000,50000000,730000

felix/setup-makefiles.py

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

lineage_felix.mk

@@ -1,35 +1,33 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # 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_foldable_book_telephony.mk)
 
 # Inherit device configuration
-DEVICE_CODENAME := felix
-DEVICE_PATH := device/google/felix
-VENDOR_PATH := vendor/google/felix
-$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
+$(call inherit-product, device/google/felix/aosp_felix.mk)
 $(call inherit-product, device/google/gs201/lineage_common.mk)
 $(call inherit-product, device/google/gs201/evolution_common.mk)
-$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
-$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-evolution.mk)
+$(call inherit-product, device/google/felix/device-lineage.mk)
+$(call inherit-product, device/google/felix/device-evolution.mk)
 
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel Fold
-PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+PRODUCT_NAME := lineage_felix
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 2092
 TARGET_SCREEN_WIDTH := 1080
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="felix-user 15 BP1A.250505.005.B1 13277630 release-keys" \
-    BuildFingerprint=google/felix/felix:15/BP1A.250505.005.B1/13277630:user/release-keys \
-    DeviceProduct=$(DEVICE_CODENAME)
+    TARGET_PRODUCT=felix \
+    PRIVATE_BUILD_DESC="felix-user 14 AP2A.240905.003 12231197 release-keys"
 
-$(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)
+BUILD_FINGERPRINT := google/felix/felix:14/AP2A.240905.003/12231197:user/release-keys
+
+$(call inherit-product, vendor/google/felix/felix-vendor.mk)

location/gps.6.1.xml.f10

@@ -1,107 +0,0 @@
-<?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"
-       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="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="2.9"
-       RfPathLossDb_Cp="2.9"
-       RfPathLossDb_Ap_L5="3.7"
-       RfPathLossDb_Cp_L5="3.7"
-       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
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/gps.xml.f10

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23"
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -49,7 +49,6 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -71,7 +70,7 @@
   <gll
        PpsEnable="true"
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
@@ -101,7 +100,6 @@
   <gll_features
        EnableNicAutoSwitch="true"
        EnableNavic="true"
-       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

location/gps_user.6.1.xml.f10

@@ -1,106 +0,0 @@
-<?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="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="2.9"
-       RfPathLossDb_Cp="2.9"
-       RfPathLossDb_Ap_L5="3.7"
-       RfPathLossDb_Cp_L5="3.7"
-       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
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/gps_user.xml.f10

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

manifest.xml

@@ -48,6 +48,15 @@
             <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

@@ -1,3 +0,0 @@
-blocklist fst2.ko
-blocklist ftm5.ko
-blocklist goog_touch_interface.ko

modules.load.vendor_kernel_boot

@@ -1,3 +0,0 @@
-extra/fst2.ko
-extra/ftm5.ko
-extra/goog_touch_interface.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=0x00
+DEFAULT_ISODEP_ROUTE=0x81
 
 ###############################################################################
 # Configure the HAL Clock control

overlay-lineage/frameworks/base/core/res/res/values/config.xml

@@ -24,9 +24,6 @@
      entries do not follow the convention, but all new entries should. -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- IWLAN-->
-    <string name="config_qualified_networks_service_package">com.android.qns</string>
-
     <!-- If true, allows rotation resolver service to help resolve screen rotation. -->
     <bool name="config_allowRotationResolver">false</bool>
 
@@ -54,11 +51,9 @@
         <item>3</item>
     </integer-array>
 
-    <!-- The device states (supplied by DeviceStateManager) that should be treated as concurrent
-    display state. Default is empty. -->
-    <integer-array name="config_concurrentDisplayDeviceStates">
-        <item>4</item>
-    </integer-array>
+    <!-- Indicates whether the window manager reacts to half-fold device states by overriding
+     rotation. -->
+    <bool name="config_windowManagerHalfFoldAutoRotateOverride">true</bool>
 
     <!-- Indicates whether the window manager pauses autorotation when folding or unfolding
      a foldable device based on hinge angle sensor events and physical display switch events. -->
@@ -98,7 +93,6 @@
         <item>0:1</item>
         <item>1:0:2</item>
         <item>2:2</item>
-        <item>3:0:0</item>
     </string-array>
 
     <!-- Device states where the sensor based rotation values should be reversed around the Z axis
@@ -108,24 +102,17 @@
         <item>3</item>
     </integer-array>
 
-    <!-- Boolean indicating whether secondary built-in displays should have their orientation
-         match the active default display. This config assumes that the secondary display only
-         requires swapping ROTATION_90 and ROTATION_270.
-         TODO(b/265991392): This should eventually be configured and parsed in
-          display_settings.xml -->
-    <bool name="config_matchSecondaryInternalDisplaysOrientationToReverseDefaultDisplay">true</bool>
-
     <!-- The time in milliseconds after which a press on power button is considered "long". -->
     <integer name="config_longPressOnPowerDurationMs">750</integer>
 
+    <!-- Control whether the pickup gesture is enabled by default. This value will be used
+     during initialization when the setting is still null. -->
+    <bool name="config_dozePickupGestureEnabled">false</bool>
+
     <!-- Amount of time in ms the user needs to press the relevant key to bring up the
          global actions dialog -->
     <integer name="config_globalActionsKeyTimeout">750</integer>
 
-    <!-- Class name of the device specific implementation of DeviceStatePolicy.Provider
-        or empty if the default should be used. -->
-    <string translatable="false" name="config_deviceSpecificDeviceStatePolicyProvider">com.google.android.server.policy.FelixDeviceStatePolicyProvider</string>
-
     <!-- Indicates whether device has a power button fingerprint sensor. -->
     <bool name="config_is_powerbutton_fps">true</bool>
 
@@ -143,7 +130,6 @@
         <item>1:2</item>
         <item>2:3</item>
         <item>3:1</item>
-        <item>4:1000</item>
     </string-array>
 
     <!-- Which Surface rotations are considered as tabletop posture (horizontal hinge) when the
@@ -166,7 +152,7 @@
          Note: Activity min/max aspect ratio restrictions will still be respected.
          Therefore this override can control the maximum screen area that can be occupied by
          the app in the letterbox mode. -->
-    <item name="config_fixedOrientationLetterboxAspectRatio" format="float" type="dimen">1.333</item>
+    <item type="dimen" name="config_fixedOrientationLetterboxAspectRatio">1.333</item>
 
     <!-- Corners radius for activity presented the letterbox mode. Values < 0 enable rounded
          corners with radius equal to min between device bottom corner radii. Default 0 value turns
@@ -204,12 +190,6 @@
          TODO(b/255532890) Enable when ignoreOrientationRequest is set -->
     <bool name="config_letterboxIsEnabledForTranslucentActivities">true</bool>
 
-    <!-- Whether per-app user aspect ratio override settings is enabled -->
-    <bool name="config_appCompatUserAppAspectRatioSettingsIsEnabled">true</bool>
-
-    <!-- Whether per-app fullscreen override option is allowed in user aspect ratio settings -->
-    <bool name="config_appCompatUserAppAspectRatioFullscreenIsEnabled">true</bool>
-
     <!-- Whether sending compat fake focus for split screen resumed activities is enabled.
          Needed because some game engines wait to get focus before drawing the content of
          the app which isn't guaranteed by default in multi-window modes. -->
@@ -232,7 +212,6 @@
     <!-- List of the labels of requestable device state config values -->
     <string-array name="config_deviceStatesAvailableForAppRequests">
         <item>config_deviceStateRearDisplay</item>
-        <item>config_deviceStateConcurrentRearDisplay</item>
     </string-array>
 
     <!-- Device state that corresponds to rear display mode, feature provided
@@ -241,15 +220,12 @@
     -->
     <integer name="config_deviceStateRearDisplay">3</integer>
 
-    <!-- Device state that corresponds to concurrent display mode where the default display
-         is the internal display. Public API for the feature is provided through Jetpack
-         WindowManager.
-         TODO(b/236022708) Move concurrent display state to device state config file
-    -->
-    <integer name="config_deviceStateConcurrentRearDisplay">4</integer>
+    <!-- Whether the vendor power press code need to be mapped. -->
+    <bool name="config_powerPressMapping">true</bool>
 
-    <!-- Physical display address that corresponds to the rear display in rear display mode
-         and concurrent display mode. Used to get information about the display before
-         entering the corresponding modes -->
-    <string name="config_rearDisplayPhysicalAddress" translatable="false">4619827677550801153</string>
+    <!-- Power press vendor code. -->
+    <integer name="config_powerPressCode">19</integer>
+
+    <!-- IWLAN-->
+    <string name="config_qualified_networks_service_package">com.android.qns</string>
 </resources>

overlay-lineage/frameworks/base/packages/SettingsProvider/res/values/defaults.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2009, 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>
-    <bool name="def_accelerometer_rotation">true</bool>
-</resources>

overlay-lineage/packages/apps/Settings/res/values-af/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="setting_auto_rotate_folded">Outodraai wanneer dit gevou is</string>
+    <string name="setting_auto_rotate_folded">Outodraai wanneer dit toegevou is</string>
     <string name="setting_auto_rotate_unfolded">Outodraai wanneer dit oopgevou is</string>
 </resources>

overlay-lineage/packages/apps/Settings/res/values-ar-rXB/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="setting_auto_rotate_folded">‏‮Auto-rotate‬‏ ‏‮when‬‏ ‏‮folded‬‏</string>
+    <string name="setting_auto_rotate_unfolded">‏‮Auto-rotate‬‏ ‏‮when‬‏ ‏‮unfolded‬‏</string>
+</resources>

overlay-lineage/packages/apps/Settings/res/values-ne/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="setting_auto_rotate_folded">फोल्ड गरिएका बेला स्वतः रोटेट गर्नुहोस्</string>
-    <string name="setting_auto_rotate_unfolded">अनफोल्ड गरिएका बेला स्वतः रोटेट गर्नुहोस्</string>
+    <string name="setting_auto_rotate_folded">फोल्ड गरिएका बेला स्वतः रोटेट गरियोस्</string>
+    <string name="setting_auto_rotate_unfolded">अनफोल्ड गरिएका बेला स्वतः रोटेट गरियोस्</string>
 </resources>

overlay-lineage/packages/apps/Settings/res/values/config.xml

@@ -18,23 +18,6 @@
     <!-- Whether to show Smooth Display feature in Settings Options -->
     <bool name="config_show_smooth_display">true</bool>
 
-    <!-- App aspect ratio settings screen, user aspect ratio override options. Must be the same
-         length and order as config_userAspectRatioOverrideValues below. -->
-    <string-array name="config_userAspectRatioOverrideEntries" translatable="false">
-        <item>@null</item>
-        <item>@null</item>
-        <item>@null</item>
-    </string-array>
-
-    <!-- App aspect ratio settings screen, user aspect ratio override options. Must be the same
-         length and order as config_userAspectRatioOverrideEntries above. The values must
-         correspond to PackageManager.UserMinAspectRatio -->
-    <integer-array name="config_userAspectRatioOverrideValues" translatable="false">
-        <item>0</item> <!-- USER_MIN_ASPECT_RATIO_UNSET -->
-        <item>6</item> <!-- USER_MIN_ASPECT_RATIO_FULLSCREEN -->
-        <item>1</item> <!-- USER_MIN_ASPECT_RATIO_SPLIT_SCREEN -->
-    </integer-array>
-
     <!-- The settings/preference description for each settable device state defined in the array
          "config_perDeviceStateRotationLockDefaults".
          The item in position "i" describes the auto-rotation setting for the device state also in
@@ -43,7 +26,6 @@
         <item>@string/setting_auto_rotate_folded</item>
         <item>@null</item>
         <item>@string/setting_auto_rotate_unfolded</item>
-        <item>@null</item>
     </string-array>
 
     <!-- The ratio to use when using the two-pane settings layout -->

overlay-lineage/packages/apps/Settings/res/values/lineage_config.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020-2023 The LineageOS 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>
+    <!-- Whether to show advanced display rotation settings -->
+    <bool name="config_show_advanced_rotation_settings">false</bool>
+</resources>

powerhint.json

@@ -21,8 +21,7 @@
         "1539000",
         "1352000",
         "1014000",
-        "421000",
-        "546000"
+        "421000"
       ],
       "ResetOnInit": true
     },
@@ -879,12 +878,6 @@
       "Duration": 5000,
       "Value": "0"
     },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "MemFreq",
-      "Duration": 0,
-      "Value": "421000"
-    },
     {
       "PowerHint": "CPU_LOAD_RESET",
       "Node": "GPUMinFreq",
@@ -897,12 +890,6 @@
       "Duration": 33,
       "Value": "1014000"
     },
-    {
-      "PowerHint": "CPU_LOAD_RESET",
-      "Node": "TAPreferHighCap",
-      "Duration": 33,
-      "Value": "1"
-    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "MemFreq",
@@ -1113,18 +1100,6 @@
       "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",
@@ -1984,6 +1959,18 @@
       "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",
@@ -2125,19 +2112,25 @@
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMaxFreq",
-      "Duration": 500,
+      "Duration": 1000,
       "Value": "9999999"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPUBigClusterMinFreq",
-      "Duration": 500,
-      "Value": "1826000"
+      "Node": "CPU_LITTLE_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPU_MID_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 500,
+      "Duration": 1000,
       "Value": "1"
     },
     {
@@ -2209,28 +2202,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "REFRESH_90FPS",
@@ -2245,28 +2226,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "REFRESH_60FPS",
@@ -2281,28 +2250,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -2322,9 +2279,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
     },
@@ -2346,9 +2303,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
     },
@@ -2370,9 +2327,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
     }

proprietary-files-carriersettings.txt

@@ -1,8 +1,6 @@
 # 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
@@ -10,13 +8,9 @@ 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
@@ -24,14 +18,12 @@ 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
@@ -57,11 +49,7 @@ 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
@@ -76,7 +64,6 @@ 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
@@ -85,20 +72,15 @@ 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
@@ -108,7 +90,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_tmo_us.pb
+product/etc/CarrierSettings/fi_us.pb
 product/etc/CarrierSettings/fido_ca.pb
 product/etc/CarrierSettings/finetwork_es.pb
 product/etc/CarrierSettings/firstnet_us.pb
@@ -116,10 +98,7 @@ 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
@@ -128,8 +107,6 @@ 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
@@ -137,7 +114,6 @@ 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
@@ -145,15 +121,9 @@ 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
@@ -161,7 +131,6 @@ 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
@@ -171,33 +140,18 @@ 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
@@ -208,12 +162,9 @@ 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
@@ -231,24 +182,18 @@ 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
@@ -265,47 +210,34 @@ 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
@@ -317,18 +249,15 @@ 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
@@ -336,21 +265,15 @@ 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
@@ -372,7 +295,6 @@ 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
@@ -380,7 +302,6 @@ 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
@@ -390,8 +311,6 @@ 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
@@ -401,7 +320,6 @@ 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
@@ -410,12 +328,10 @@ 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
@@ -425,4 +341,3 @@ 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

proprietary-files.txt

@@ -3,8 +3,8 @@
 # product partition
 
 # AiAi
-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
+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
 
 # Audio
 product/etc/ambient/matcher_tah.leveldb
@@ -20,11 +20,6 @@ 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
@@ -67,7 +62,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_51.0.707712815/CarrierSettings_signed_51.0.707712815.apk;PRESIGNED
+product/priv-app/CarrierSettings_signed_45.0.591154042/CarrierSettings_signed_45.0.591154042.apk;PRESIGNED
 product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
 product/priv-app/ConnMO/ConnMO.apk
 product/priv-app/DCMO/DCMO.apk
@@ -88,11 +83,6 @@ 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
@@ -101,26 +91,15 @@ system_ext/etc/permissions/com.google.android.camerax.extensions.xml
 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
-
-# Fold extensions
-system_ext/framework/felix-services.jar
+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
@@ -140,11 +119,6 @@ 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
 
@@ -168,7 +142,6 @@ 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

rro_overlays/NfcOverlay/res/values/config.xml

@@ -29,8 +29,8 @@
     <item>30</item>
   </integer-array>
   <integer-array name="antenna_y">
-    <item>44</item>
-    <item>44</item>
+    <item>103</item>
+    <item>103</item>
   </integer-array>
   <bool name="nfc_observe_mode_supported">true</bool>
 </resources>

rro_overlays/WifiOverlay/res/values/config.xml

@@ -169,12 +169,4 @@
          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>

sepolicy/felix-sepolicy.mk

@@ -4,6 +4,3 @@ BOARD_SEPOLICY_DIRS += device/google/felix/sepolicy/tracking_denials
 
 # Fingerprint
 BOARD_SEPOLICY_DIRS += device/google/felix/sepolicy/fingerprint_capacitance
-
-BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/common
-BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/cs40l26

sepolicy/vendor/file_contexts

@@ -21,6 +21,3 @@
 /dev/logbuffer_dual_batt                                                    u:object_r:logbuffer_device:s0
 /dev/logbuffer_maxfg_secondary                                              u:object_r:logbuffer_device:s0
 /dev/logbuffer_maxfg_secondary_monitor                                      u:object_r:logbuffer_device:s0
-
-# Touch
-/dev/touch_offload_fts_ext                                                  u:object_r:touch_offload_device:s0

sepolicy/vendor/genfs_contexts

@@ -18,7 +18,6 @@ genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/panel_idle
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/panel_need_handle_idle_exit          u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/osc2_clk_khz                         u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/time_in_state                        u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/power_mode                           u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/hs_clock                                                u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c241000.drmdecon/early_wakeup                                           u:object_r:sysfs_display:s0
 
@@ -35,6 +34,4 @@ genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-0036/power_supply/maxf
 genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-0036/power_supply/maxfg_secondary/wakeup                      u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-0061/power_supply/wireless/wakeup                             u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-0061/wakeup                                                   u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-0036/wakeup                                                   u:object_r:sysfs_wakeup:s0
-
 genfscon sysfs /devices/platform/google,dual_batt_gauge/power_supply/dualbatt/wakeup                                    u:object_r:sysfs_wakeup:s0

setup-makefiles.py

@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-MY_DIR="$(cd "$(dirname "${0}")"; pwd -P)"
-
-pushd "${MY_DIR}/felix"
-./setup-makefiles.py
-popd

setup-makefiles.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=felix
+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/felix",
+		"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

skip-files-vendor.txt

@@ -1,10 +1,10 @@
 # Standard build output with vendor image build enabled
+apex/com.android.hardware.cas.apex
 bin/[
 bin/acpi
 bin/awk
 bin/base64
 bin/basename
-bin/blkdiscard
 bin/blockdev
 bin/boringssl_self_test32
 bin/boringssl_self_test64
@@ -38,23 +38,20 @@ bin/du
 bin/dump/dump_aoc
 bin/dump/dump_devfreq
 bin/dump/dump_display
-bin/dump/dump_fingerprint
-bin/dump/dump_modem
+bin/dump/dump_gti0.sh
+bin/dump/dump_modem.sh
 bin/dump/dump_modemlog
 bin/dump/dump_perf
 bin/dump/dump_pixel_metrics
-bin/dump/dump_power
+bin/dump/dump_power_gs201.sh
 bin/dump/dump_second_display
 bin/dump/dump_sensors
 bin/dump/dump_soc
+bin/dump/dump_stm.sh
 bin/dump/dump_storage
 bin/dump/dump_thermal.sh
-bin/dump/dump_touch.sh
 bin/dump/dump_trusty.sh
 bin/dump/dump_umfw_stat
-bin/dump_touch/predump_gti0.sh
-bin/dump_touch/predump_gti1.sh
-bin/dump_touch/predump_stm.sh
 bin/dumpsys
 bin/echo
 bin/egrep
@@ -74,7 +71,6 @@ bin/getconf
 bin/getenforce
 bin/getevent
 bin/getfattr
-bin/getopt
 bin/getprop
 bin/gpiodetect
 bin/gpiofind
@@ -95,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-V2-service
+bin/hw/android.hardware.graphics.allocator-V1-service
 bin/hw/android.hardware.health-service.gs201
 bin/hw/android.hardware.health.storage-service.default
 bin/hw/android.hardware.memtrack-service.pixel
@@ -105,7 +101,6 @@ 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
@@ -178,7 +173,6 @@ bin/pidof
 bin/pixelstats-vendor
 bin/pkill
 bin/pmap
-bin/predump_touch.sh
 bin/printenv
 bin/printf
 bin/ps
@@ -233,7 +227,6 @@ bin/timeout
 bin/toolbox
 bin/top
 bin/touch
-bin/touch_gti_ical
 bin/toybox_vendor
 bin/tr
 bin/true
@@ -271,11 +264,10 @@ 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_default_audio_set_configurations.json
-etc/aidl/le_audio/aidl_default_audio_set_scenarios.json
+etc/aidl/le_audio/aidl_audio_set_scenarios.json
 etc/aoc/BLUETOOTH.dat
 etc/aoc/HANDSET.dat
 etc/aoc/HANDSFREE.dat
@@ -301,7 +293,6 @@ 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
@@ -332,20 +323,20 @@ etc/gnss/scd.conf
 etc/group
 etc/hearing_aid_audio_policy_configuration_7_0.xml
 etc/init.common.cfg
+etc/init.insmod.felix.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.allocator2-aidl-service.rc
+etc/init/android.hardware.graphics.allocator-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
@@ -360,23 +351,14 @@ etc/init/health-storage-default.rc
 etc/init/hostapd.android.rc
 etc/init/hw/init.felix.rc
 etc/init/hw/init.gs201.rc
-etc/init/hw/init.gs201.storage.rc
 etc/init/hw/init.gs201.usb.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.gti0.rc
-etc/init/init.touch.gti1.rc
-etc/init/init.touch.predump.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
@@ -386,9 +368,6 @@ 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.conf
 etc/libse-gto-hal.conf
 etc/libse-gto-hal2.conf
@@ -422,7 +401,7 @@ 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.fingerprint.xml
-etc/permissions/android.hardware.hardware_keystore_V3.xml
+etc/permissions/android.hardware.hardware_keystore.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
@@ -456,6 +435,7 @@ 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
@@ -465,12 +445,10 @@ 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.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
@@ -480,7 +458,6 @@ 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
@@ -561,7 +538,6 @@ 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
@@ -573,8 +549,7 @@ 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.xml
-etc/vintf/manifest/manifest_gralloc_aidl2.xml
+etc/vintf/manifest/manifest_gralloc_aidl.xml
 etc/vintf/manifest/memtrack.xml
 etc/vintf/manifest/nfc-service-default.xml
 etc/vintf/manifest/pixel-display-default.xml
@@ -602,7 +577,7 @@ firmware/fast_switch5.txt
 firmware/fast_switch6.txt
 firmware/fast_switch7.txt
 firmware/fast_switch8.txt
-lib/android.hardware.audio.common-V4-ndk.so
+lib/android.hardware.audio.common-V3-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
@@ -616,13 +591,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-V5-ndk.so
+lib/android.hardware.bluetooth.audio-V4-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-V6-ndk.so
+lib/android.hardware.graphics.common-V5-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
@@ -638,11 +613,12 @@ 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-V4-ndk.so
+lib/android.media.audio.common.types-V3-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
@@ -652,11 +628,8 @@ 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
@@ -700,8 +673,6 @@ 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
@@ -710,54 +681,41 @@ 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/aqc111.ko
+lib/modules/arm-memlat-mon.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/bigwave.ko
-lib/modules/bluetooth.ko
-lib/modules/bsd_comp.ko
-lib/modules/btbcm.ko
-lib/modules/btqca.ko
+lib/modules/bigocean.ko
+lib/modules/boot_device_spi.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_gs.ko
+lib/modules/clk_exynos.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/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/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/diag.ko
-lib/modules/drm_display_helper.ko
+lib/modules/drv2624.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
@@ -774,7 +732,6 @@ 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
@@ -784,16 +741,15 @@ 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
 lib/modules/exynos_mfc.ko
 lib/modules/exynos_pm_qos.ko
 lib/modules/exynos_tty.ko
-lib/modules/fips140.ko
 lib/modules/fpc1020_platform_tee.ko
 lib/modules/fst2.ko
-lib/modules/ftdi_sio.ko
 lib/modules/ftm5.ko
 lib/modules/g2d.ko
 lib/modules/goodixfp.ko
@@ -803,50 +759,33 @@ 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/google_tcpci_shim.ko
+lib/modules/governor_memlat.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/hall_sensor.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/mac80211.ko
-lib/modules/mac802154.ko
+lib/modules/lzo-rle.ko
+lib/modules/lzo.ko
 lib/modules/mailbox-wc.ko
 lib/modules/mali_kbase.ko
 lib/modules/mali_kutf.ko
@@ -857,50 +796,25 @@ 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/mii.ko
+lib/modules/memlat-devfreq.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/odpm-whi.ko
+lib/modules/null_blk.ko
+lib/modules/odpm.ko
+lib/modules/overheat_mitigation.ko
 lib/modules/p9221.ko
 lib/modules/panel-boe-nt37290.ko
-lib/modules/panel-common.ko
 lib/modules/panel-samsung-ana6707-f10.ko
 lib/modules/panel-samsung-drv.ko
 lib/modules/panel-samsung-ea8182-f10.ko
@@ -913,17 +827,16 @@ 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-gs.ko
+lib/modules/pcie-exynos-core.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-exynos-gs.ko
+lib/modules/pinctrl-samsung-core.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
@@ -933,20 +846,9 @@ lib/modules/pkvm-s2mpu.ko
 lib/modules/pl330.ko
 lib/modules/pmic_class.ko
 lib/modules/power_stats.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/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/pps-gpio.ko
+lib/modules/pps_core.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
@@ -955,7 +857,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.ko
+lib/modules/s2mpg1x-gpio-gs201.ko
 lib/modules/s3c2410_wdt.ko
 lib/modules/samsung-dma.ko
 lib/modules/samsung-iommu-group.ko
@@ -964,6 +866,7 @@ 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/sg.ko
 lib/modules/shm_ipc.ko
 lib/modules/sjtag-driver.ko
@@ -971,24 +874,23 @@ 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.ko
 lib/modules/snd-soc-cs40l26.ko
 lib/modules/snd-soc-wm-adsp.ko
 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
@@ -996,7 +898,6 @@ lib/modules/stmvl53l1.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
@@ -1004,28 +905,25 @@ lib/modules/trusty-ipc.ko
 lib/modules/trusty-log.ko
 lib/modules/trusty-test.ko
 lib/modules/trusty-virtio.ko
-lib/modules/ufs-exynos-gs.ko
+lib/modules/ufs-exynos-core.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/wwan.ko
+lib/modules/wlan_ptracker.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
@@ -1037,11 +935,10 @@ lib/soundfx/libhapticgenerator.so
 lib/soundfx/libldnhncr.so
 lib/soundfx/libreverbwrapper.so
 lib/soundfx/libvisualizer.so
-lib64/PixelVibratorFlagsL26.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-V4-ndk.so
+lib64/android.hardware.audio.common-V3-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
@@ -1055,7 +952,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-V5-ndk.so
+lib64/android.hardware.bluetooth.audio-V4-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
@@ -1069,18 +966,19 @@ 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-V6-ndk.so
+lib64/android.hardware.graphics.common-V3-ndk.so
+lib64/android.hardware.graphics.common-V5-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-V4-ndk.so
+lib64/android.hardware.graphics.composer3-V3-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
@@ -1091,13 +989,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-V4-ndk.so
+lib64/android.hardware.health-V3-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-V6-ndk.so
+lib64/android.hardware.power-V5-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
@@ -1109,11 +1007,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-V4-ndk.so
+lib64/android.hardware.security.keymint-V3-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-V3-ndk.so
+lib64/android.hardware.sensors-V2-ndk.so
 lib64/android.hardware.sensors@1.0.so
 lib64/android.hardware.sensors@2.0-ScopedWakelock.so
 lib64/android.hardware.sensors@2.0.so
@@ -1124,29 +1022,30 @@ 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-V3-ndk.so
+lib64/android.hardware.thermal-V2-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-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.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.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-V4-ndk.so
+lib64/android.media.audio.common.types-V3-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-V13-ndk.so
+lib64/com.google.hardware.pixel.display-V10-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-private.so
 lib64/hw/android.hidl.memory@1.0-impl.so
@@ -1157,13 +1056,10 @@ 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
@@ -1179,6 +1075,8 @@ 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
@@ -1203,7 +1101,8 @@ lib64/libhwjpeg.so
 lib64/libion_google.so
 lib64/libjsoncpp.so
 lib64/libkeymaster_messages.so
-lib64/libkeymasterconfig.so
+lib64/libkeymaster_portable.so
+lib64/libkeymint.so
 lib64/libkeystore-engine-wifi-hidl.so
 lib64/liblibloading.dylib.so
 lib64/liblog_rust.dylib.so
@@ -1223,10 +1122,12 @@ 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
@@ -1268,42 +1169,27 @@ 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__felix__auto_generated_rro_vendor.apk
+overlay/NfcNci__felix__auto_generated_rro_vendor.apk
+overlay/SettingsProvider__felix__auto_generated_rro_vendor.apk
+overlay/Settings__felix__auto_generated_rro_vendor.apk
+overlay/StorageManager__felix__auto_generated_rro_vendor.apk
+overlay/SystemUI__felix__auto_generated_rro_vendor.apk
+overlay/TeleService__felix__auto_generated_rro_vendor.apk
+overlay/Traceur__felix__auto_generated_rro_vendor.apk
+overlay/framework-res__felix__auto_generated_rro_vendor.apk
 vendor_dlkm/etc/build.prop
-vendor_dlkm/etc/init.insmod.felix.cfg
 
 # Exclude overlays, symlinks and extra files that we override
 
 # Overlays
-overlay/DMService__felix__auto_generated_rro_vendor.apk
 overlay/DeviceDiagnostics__felix__auto_generated_rro_vendor.apk
+overlay/DMService__felix__auto_generated_rro_vendor.apk
 overlay/Flipendo__felix__auto_generated_rro_vendor.apk
 overlay/SettingsGoogle__felix__auto_generated_rro_vendor.apk
-overlay/SettingsProvider__felix__auto_generated_rro_vendor.apk
 overlay/StorageManagerGoogle__felix__auto_generated_rro_vendor.apk
 overlay/SystemUIGoogle__felix__auto_generated_rro_vendor.apk
-overlay/TeleService__felix__auto_generated_rro_vendor.apk
-overlay/Traceur__felix__auto_generated_rro_vendor.apk
-overlay/framework-res__felix__auto_generated_rro_vendor.apk
-
-# beta
-overlay/DMService__felix_beta__auto_generated_rro_vendor.apk
-overlay/DeviceDiagnostics__felix_beta__auto_generated_rro_vendor.apk
-overlay/Flipendo__felix_beta__auto_generated_rro_vendor.apk
-overlay/SettingsGoogle__felix_beta__auto_generated_rro_vendor.apk
-overlay/SettingsProvider__felix_beta__auto_generated_rro_vendor.apk
-overlay/StorageManagerGoogle__felix_beta__auto_generated_rro_vendor.apk
-overlay/SystemUIGoogle__felix_beta__auto_generated_rro_vendor.apk
-overlay/TeleService__felix_beta__auto_generated_rro_vendor.apk
-overlay/Traceur__felix_beta__auto_generated_rro_vendor.apk
-overlay/framework-res__felix_beta__auto_generated_rro_vendor.apk
 
 # Symlinks
 lib/modules
@@ -1322,13 +1208,14 @@ 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
@@ -1337,6 +1224,7 @@ 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
@@ -1361,6 +1249,7 @@ 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
@@ -1372,7 +1261,6 @@ 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
@@ -1400,10 +1288,9 @@ 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
 
 # GPS
@@ -1416,17 +1303,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
@@ -1435,7 +1323,9 @@ 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
 
@@ -1456,7 +1346,7 @@ lib64/modem_clock_manager_impl.so
 
 # Sensors
 lib/android.frameworks.sensorservice-V1-ndk.so
-lib/android.hardware.sensors-V3-ndk.so
+lib/android.hardware.sensors-V2-ndk.so
 lib/android.hardware.sensors@1.0.so
 lib/android.hardware.sensors@2.0-ScopedWakelock.so
 lib/android.hardware.sensors@2.0.so
@@ -1464,18 +1354,17 @@ 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
@@ -1510,9 +1399,12 @@ 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
@@ -1520,15 +1412,20 @@ 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
 lib64/android.hardware.neuralnetworks@1.2.so
 lib64/android.hardware.neuralnetworks@1.3.so
 lib64/android.hardware.oemlock-V1-ndk.so
+lib64/android.hardware.power@1.0.so
+lib64/android.hardware.power@1.1.so
+lib64/android.hardware.power@1.2.so
 lib64/android.hardware.radio-V1-ndk.so
 lib64/android.hardware.radio.config-V1-ndk.so
 lib64/android.hardware.radio.config@1.0.so
@@ -1547,6 +1444,7 @@ lib64/android.hardware.radio@1.4.so
 lib64/android.hardware.radio@1.5.so
 lib64/android.hardware.radio@1.6.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-V9-ndk.so
@@ -1561,12 +1459,6 @@ 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

thermal_info_config_charge_felix.json

@@ -3,17 +3,20 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"skin_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 32.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/skin_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000
@@ -21,12 +24,14 @@
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000
@@ -34,16 +39,19 @@
         {
             "Name":"inner_disp_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/inner_disp_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"outer_disp_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/outer_disp_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
         },
         {

thermal_info_config_felix.json

@@ -9,17 +9,20 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"skin_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 32.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/skin_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000
@@ -27,12 +30,14 @@
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000
@@ -40,16 +45,19 @@
         {
             "Name":"inner_disp_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/inner_disp_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"outer_disp_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/outer_disp_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
         },
         {
@@ -542,28 +550,348 @@
             "Type":"NPU",
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "Multiplier":0.001
+        },
+        {
+            "Name":"battery_cycle",
+            "Type":"BCL_VOLTAGE",
+            "Multiplier":1,
+            "SendCallback":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,
+            "SendCallback":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,
+            "SendCallback":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,
+            "SendCallback":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,
+            "SendCallback":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,
+            "SendCallback":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,
+            "SendCallback":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,
+            "SendCallback":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,
+            "SendCallback":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,
+            "SendCallback":true,
+            "PollingDelay":0,
+            "PassiveDelay":60000,
+            "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":[-10000, 80],
+            "HotThreshold":["NAN", "NAN",  "NAN", "NAN", 2.0, "NAN", "NAN"],
+            "Multiplier":1,
+            "SendCallback":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,
+            "SendCallback":true,
+            "PollingDelay":0,
+            "PassiveDelay":60000,
+            "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,
+            "SendCallback":true,
+            "PollingDelay":0,
+            "PassiveDelay":60000,
+            "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,
+            "SendCallback":true,
+            "PollingDelay":0,
+            "PassiveDelay":60000,
+            "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"
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
+            "State2Power":[516, 456, 392, 296, 264, 216, 184, 140, 100, 68, 28]
         },
         {
             "Name":"thermal-cpufreq-1",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
+            "State2Power":[2466, 2166, 1840, 1544, 1260, 1024, 816, 642, 538, 410, 342, 276, 224, 162, 104]
         },
         {
             "Name":"thermal-cpufreq-2",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
+            "State2Power":[4920, 4614, 4092, 3684, 3198, 2820, 2354, 2184, 1862, 1476, 1338, 1110, 928, 738, 552, 450, 362, 188]
         },
         {
             "Name":"thermal-gpufreq-0",
             "Type":"GPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote",
+            "State2Power":[1925, 1528, 1258, 928, 795, 703, 573, 481, 396, 314, 236]
         },
         {
             "Name":"chg_mdis",

thermal_info_config_proactive_skin_felix.json

@@ -9,17 +9,20 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"skin_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 32.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/skin_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000
@@ -27,12 +30,14 @@
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000
@@ -40,16 +45,19 @@
         {
             "Name":"inner_disp_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/inner_disp_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"outer_disp_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/outer_disp_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
         },
         {
@@ -864,22 +872,26 @@
         {
             "Name":"thermal-cpufreq-0",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
+            "State2Power":[516, 456, 392, 296, 264, 216, 184, 140, 100, 68, 28]
         },
         {
             "Name":"thermal-cpufreq-1",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
+            "State2Power":[2466, 2166, 1840, 1544, 1260, 1024, 816, 642, 538, 410, 342, 276, 224, 162, 104]
         },
         {
             "Name":"thermal-cpufreq-2",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
+            "State2Power":[4920, 4614, 4092, 3684, 3198, 2820, 2354, 2184, 1862, 1476, 1338, 1110, 928, 738, 552, 450, 362, 188]
         },
         {
             "Name":"thermal-gpufreq-0",
             "Type":"GPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote",
+            "State2Power":[1925, 1528, 1258, 928, 795, 703, 573, 481, 396, 314, 236]
         },
         {
             "Name":"chg_mdis",

vendor.prop

@@ -9,5 +9,8 @@ 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

vibrator/OWNERS

@@ -1,3 +1,4 @@
 chrispaulo@google.com
+michaelwr@google.com
 nathankulczak@google.com
 taikuo@google.com

vibrator/common/HardwareBase.cpp

@@ -40,6 +40,10 @@ void HwApiBase::saveName(const std::string &name, const std::ios *stream) {
     mNames[stream] = name;
 }
 
+bool HwApiBase::has(const std::ios &stream) {
+    return !!stream;
+}
+
 void HwApiBase::debug(int fd) {
     dprintf(fd, "Kernel:\n");
 
@@ -69,7 +73,6 @@ HwCalBase::HwCalBase() {
     std::ifstream calfile;
     std::ifstream calfile_dual;
     auto propertyPrefix = std::getenv("PROPERTY_PREFIX");
-    auto calPath = std::getenv("CALIBRATION_FILEPATH");
 
     if (propertyPrefix != NULL) {
         mPropertyPrefix = std::string(propertyPrefix);
@@ -77,14 +80,6 @@ HwCalBase::HwCalBase() {
         ALOGE("Failed get property prefix!");
     }
 
-    // Keep the cal file path for the current HwCalBase instance.
-    if (calPath != NULL) {
-        mCalPath = std::string(calPath);
-    } else {
-        ALOGE("Failed get the calibration file path!");
-    }
-
-    // Read the cal data for the current instance.
     utils::fileFromEnv("CALIBRATION_FILEPATH", &calfile);
 
     for (std::string line; std::getline(calfile, line);) {
@@ -98,7 +93,6 @@ HwCalBase::HwCalBase() {
         }
     }
 
-    // Read the cal data for the other instance.
     utils::fileFromEnv("CALIBRATION_FILEPATH_DUAL", &calfile_dual);
 
     for (std::string line; std::getline(calfile_dual, line);) {
@@ -116,6 +110,7 @@ HwCalBase::HwCalBase() {
 
 void HwCalBase::debug(int fd) {
     std::ifstream stream;
+    std::string path;
     std::string line;
     struct context {
         HwCalBase *obj;
@@ -142,8 +137,9 @@ void HwCalBase::debug(int fd) {
 
     dprintf(fd, "Persist:\n");
 
-    utils::openNoCreate(mCalPath, &stream);
-    dprintf(fd, "  %s:\n", mCalPath.c_str());
+    utils::fileFromEnv("CALIBRATION_FILEPATH", &stream, &path);
+
+    dprintf(fd, "  %s:\n", path.c_str());
     while (std::getline(stream, line)) {
         dprintf(fd, "    %s\n", line.c_str());
     }

vibrator/common/HardwareBase.h

@@ -20,12 +20,10 @@
 #include <sys/epoll.h>
 #include <utils/Trace.h>
 
-#include <chrono>
 #include <list>
 #include <map>
 #include <sstream>
 #include <string>
-#include <type_traits>
 
 #include "utils.h"
 
@@ -49,19 +47,17 @@ class HwApiBase {
     class Record : public RecordInterface {
       public:
         Record(const char *func, const T &value, const std::ios *stream)
-            : mFunc(func), mValue(value), mStream(stream),
-              mTp(std::chrono::system_clock::system_clock::now()) {}
+            : mFunc(func), mValue(value), mStream(stream) {}
         std::string toString(const NamesMap &names) override;
 
       private:
         const char *mFunc;
         const T mValue;
         const std::ios *mStream;
-        const std::chrono::system_clock::time_point mTp;
     };
     using Records = std::list<std::unique_ptr<RecordInterface>>;
 
-    static constexpr uint32_t RECORDS_SIZE = 2048;
+    static constexpr uint32_t RECORDS_SIZE = 32;
 
   public:
     HwApiBase();
@@ -71,8 +67,7 @@ class HwApiBase {
     void saveName(const std::string &name, const std::ios *stream);
     template <typename T>
     void open(const std::string &name, T *stream);
-    template <typename T>
-    bool has(const T &stream);
+    bool has(const std::ios &stream);
     template <typename T>
     bool get(T *value, std::istream *stream);
     template <typename T>
@@ -98,16 +93,6 @@ void HwApiBase::open(const std::string &name, T *stream) {
     utils::openNoCreate(mPathPrefix + name, stream);
 }
 
-template <typename T>
-bool HwApiBase::has(const T &stream) {
-    if constexpr (std::is_same<T, std::fstream>::value || std::is_same<T, std::ofstream>::value ||
-                  std::is_same<T, std::ifstream>::value)
-        return stream.is_open() && !stream.fail();
-
-    ALOGE("File stream is not of the correct type");
-    return false;
-}
-
 template <typename T>
 bool HwApiBase::get(T *value, std::istream *stream) {
     ATRACE_NAME("HwApi::get");
@@ -184,14 +169,9 @@ template <typename T>
 std::string HwApiBase::Record<T>::toString(const NamesMap &names) {
     using utils::operator<<;
     std::stringstream ret;
-    auto lTp = std::chrono::system_clock::to_time_t(mTp);
-    struct tm buf;
-    auto lTime = localtime_r(&lTp, &buf);
 
-    ret << std::put_time(lTime, "%Y-%m-%d %H:%M:%S.") << std::setfill('0') << std::setw(3)
-        << (std::chrono::duration_cast<std::chrono::milliseconds>(mTp.time_since_epoch()) % 1000)
-                    .count()
-        << "    " << mFunc << " '" << names.at(mStream) << "' = '" << mValue << "'";
+    ret << mFunc << " '" << names.at(mStream) << "' = '" << mValue << "'";
+
     return ret.str();
 }
 
@@ -208,7 +188,6 @@ class HwCalBase {
 
   private:
     std::string mPropertyPrefix;
-    std::string mCalPath;
     std::map<std::string, std::string> mCalData;
 };
 

vibrator/common/utils.h

@@ -103,19 +103,6 @@ inline Enable_If_Unsigned<T, T> getProperty(const std::string &key, const T def)
     return ::android::base::GetUintProperty(key, def);
 }
 
-template <typename T, size_t N>
-inline std::array<T, N> getProperty(const std::string &key, const std::array<T, N> &def) {
-    std::string value = ::android::base::GetProperty(key, "");
-    if (!value.empty()) {
-        std::array<T, N> result{0};
-        std::stringstream stream{value};
-        utils::unpack(stream, &result);
-        if (stream && stream.eof())
-            return result;
-    }
-    return def;
-}
-
 template <>
 inline bool getProperty<bool>(const std::string &key, const bool def) {
     return ::android::base::GetBoolProperty(key, def);
@@ -123,12 +110,10 @@ inline bool getProperty<bool>(const std::string &key, const bool def) {
 
 template <typename T>
 static void openNoCreate(const std::string &file, T *outStream) {
-    if (!std::filesystem::exists(file)) {
-        ALOGE("File does not exist: %s", file.c_str());
-        return;
-    }
+    auto mode = std::is_base_of_v<std::ostream, T> ? std::ios_base::out : std::ios_base::in;
 
-    outStream->open(file);
+    // Force 'in' mode to prevent file creation
+    outStream->open(file, mode | std::ios_base::in);
     if (!*outStream) {
         ALOGE("Failed to open %s (%d): %s", file.c_str(), errno, strerror(errno));
     }

vibrator/cs40l26/Android.bp

@@ -60,7 +60,6 @@ cc_library {
     srcs: [
         "Vibrator.cpp",
     ],
-    shared_libs: ["//device/google/gs-common:PixelVibratorFlagsL26Private"],
     export_include_dirs: ["."],
     vendor_available: true,
     visibility: [":__subpackages__"],

vibrator/cs40l26/Hardware.h

@@ -78,9 +78,6 @@ class HwApi : public Vibrator::HwApi, private HwApiBase {
         open("calibration/q_stored", &mQ);
         open("default/vibe_state", &mVibeState);
         open("default/num_waves", &mEffectCount);
-        open("default/braking_time_bank", &mEffectBrakingTimeBank);
-        open("default/braking_time_index", &mEffectBrakingTimeIndex);
-        open("default/braking_time_ms", &mEffectBrakingTimeMs);
         open("default/owt_free_space", &mOwtFreeSpace);
         open("default/f0_comp_enable", &mF0CompEnable);
         open("default/redc_comp_enable", &mRedcCompEnable);
@@ -92,16 +89,6 @@ class HwApi : public Vibrator::HwApi, private HwApiBase {
     bool setRedc(std::string value) override { return set(value, &mRedc); }
     bool setQ(std::string value) override { return set(value, &mQ); }
     bool getEffectCount(uint32_t *value) override { return get(value, &mEffectCount); }
-    bool hasEffectBrakingTimeBank() override { return has(mEffectBrakingTimeBank); }
-    bool setEffectBrakingTimeBank(uint32_t value) override {
-        return set(value, &mEffectBrakingTimeBank);
-    }
-    bool setEffectBrakingTimeIndex(uint32_t value) override {
-        return set(value, &mEffectBrakingTimeIndex);
-    }
-    bool getEffectBrakingTimeMs(uint32_t *value) override {
-        return get(value, &mEffectBrakingTimeMs);
-    }
     bool pollVibeState(uint32_t value, int32_t timeoutMs) override {
         return poll(value, &mVibeState, timeoutMs);
     }
@@ -295,9 +282,6 @@ class HwApi : public Vibrator::HwApi, private HwApiBase {
     std::ofstream mRedc;
     std::ofstream mQ;
     std::ifstream mEffectCount;
-    std::ofstream mEffectBrakingTimeBank;
-    std::ofstream mEffectBrakingTimeIndex;
-    std::ifstream mEffectBrakingTimeMs;
     std::ifstream mVibeState;
     std::ifstream mOwtFreeSpace;
     std::ofstream mF0CompEnable;
@@ -318,9 +302,9 @@ class HwCal : public Vibrator::HwCal, private HwCalBase {
 
     static constexpr uint32_t VERSION_DEFAULT = 2;
     static constexpr int32_t DEFAULT_FREQUENCY_SHIFT = 0;
-    static constexpr std::array<uint32_t, 2> V_TICK_DEFAULT = {5, 95};
-    static constexpr std::array<uint32_t, 2> V_CLICK_DEFAULT = {5, 95};
-    static constexpr std::array<uint32_t, 2> V_LONG_DEFAULT = {5, 95};
+    static constexpr std::array<uint32_t, 2> V_TICK_DEFAULT = {1, 100};
+    static constexpr std::array<uint32_t, 2> V_CLICK_DEFAULT = {1, 100};
+    static constexpr std::array<uint32_t, 2> V_LONG_DEFAULT = {1, 100};
 
   public:
     HwCal() {}
@@ -370,19 +354,22 @@ class HwCal : public Vibrator::HwCal, private HwCalBase {
         if (getPersist(TICK_VOLTAGES_CONFIG, value)) {
             return true;
         }
-        return getProperty(TICK_VOLTAGES_CONFIG, value, V_TICK_DEFAULT);
+        *value = V_TICK_DEFAULT;
+        return true;
     }
     bool getClickVolLevels(std::array<uint32_t, 2> *value) override {
         if (getPersist(CLICK_VOLTAGES_CONFIG, value)) {
             return true;
         }
-        return getProperty(CLICK_VOLTAGES_CONFIG, value, V_CLICK_DEFAULT);
+        *value = V_CLICK_DEFAULT;
+        return true;
     }
     bool getLongVolLevels(std::array<uint32_t, 2> *value) override {
         if (getPersist(LONG_VOLTAGES_CONFIG, value)) {
             return true;
         }
-        return getProperty(LONG_VOLTAGES_CONFIG, value, V_LONG_DEFAULT);
+        *value = V_LONG_DEFAULT;
+        return true;
     }
     bool isChirpEnabled() override {
         return utils::getProperty("persist.vendor.vibrator.hal.chirp.enabled", false);

vibrator/cs40l26/Vibrator.cpp

@@ -19,7 +19,6 @@
 #include <glob.h>
 #include <hardware/hardware.h>
 #include <hardware/vibrator.h>
-#include <linux/version.h>
 #include <log/log.h>
 #include <stdio.h>
 #include <utils/Trace.h>
@@ -59,7 +58,7 @@ static constexpr int8_t MAX_PAUSE_TIMING_ERROR_MS = 1;  // ALERT Irq Handling
 static constexpr uint32_t MAX_TIME_MS = UINT16_MAX;
 
 static constexpr auto ASYNC_COMPLETION_TIMEOUT = std::chrono::milliseconds(100);
-static constexpr auto POLLING_TIMEOUT = 50;
+static constexpr auto POLLING_TIMEOUT = 20;
 static constexpr int32_t COMPOSE_DELAY_MAX_MS = 10000;
 
 /* nsections is 8 bits. Need to preserve 1 section for the first delay before the first effect. */
@@ -72,14 +71,6 @@ static constexpr int32_t COMPOSE_PWLE_SIZE_MAX_DEFAULT = 127;
 // See the LRA Calibration Support documentation for more details.
 static constexpr int32_t Q14_BIT_SHIFT = 14;
 
-// Measured ReDC. The LRA series resistance (ReDC), expressed as follows
-// redc(ohms) = redc_measured / 2^Q15_BIT_SHIFT.
-// This value represents the unit-specific ReDC input to the click compensation
-// algorithm. It can be overwritten at a later time by writing to the redc_stored
-// sysfs control.
-// See the LRA Calibration Support documentation for more details.
-static constexpr int32_t Q15_BIT_SHIFT = 15;
-
 // Measured Q factor, q_measured, is represented by Q8.16 fixed
 // point format on cs40l26 devices. The expression to calculate q is:
 //   q = q_measured / 2^Q16_BIT_SHIFT
@@ -93,30 +84,6 @@ static constexpr uint8_t PWLE_CHIRP_BIT = 0x8;  // Dynamic/static frequency and
 static constexpr uint8_t PWLE_BRAKE_BIT = 0x4;
 static constexpr uint8_t PWLE_AMP_REG_BIT = 0x2;
 
-static constexpr uint8_t PWLE_WT_TYPE = 12;
-static constexpr uint8_t PWLE_HEADER_WORD_COUNT = 3;
-static constexpr uint8_t PWLE_HEADER_FTR_SHIFT = 8;
-static constexpr uint8_t PWLE_SVC_METADATA_WORD_COUNT = 3;
-static constexpr uint32_t PWLE_SVC_METADATA_TERMINATOR = 0xFFFFFF;
-static constexpr uint8_t PWLE_SEGMENT_WORD_COUNT = 2;
-static constexpr uint8_t PWLE_HEADER_WCOUNT_WORD_OFFSET = 2;
-static constexpr uint8_t PWLE_WORD_SIZE = sizeof(uint32_t);
-
-static constexpr uint8_t PWLE_SVC_NO_BRAKING = -1;
-static constexpr uint8_t PWLE_SVC_CAT_BRAKING = 0;
-static constexpr uint8_t PWLE_SVC_OPEN_BRAKING = 1;
-static constexpr uint8_t PWLE_SVC_CLOSED_BRAKING = 2;
-static constexpr uint8_t PWLE_SVC_MIXED_BRAKING = 3;
-
-static constexpr uint32_t PWLE_SVC_MAX_BRAKING_TIME_MS = 1000;
-
-static constexpr uint8_t PWLE_FTR_BUZZ_BIT = 0x80;
-static constexpr uint8_t PWLE_FTR_CLICK_BIT = 0x00;
-static constexpr uint8_t PWLE_FTR_DYNAMIC_F0_BIT = 0x10;
-static constexpr uint8_t PWLE_FTR_SVC_METADATA_BIT = 0x04;
-static constexpr uint8_t PWLE_FTR_DVL_BIT = 0x02;
-static constexpr uint8_t PWLE_FTR_LF0T_BIT = 0x01;
-
 static constexpr float PWLE_LEVEL_MIN = 0.0;
 static constexpr float PWLE_LEVEL_MAX = 1.0;
 static constexpr float CS40L26_PWLE_LEVEL_MIN = -1.0;
@@ -148,10 +115,6 @@ static uint16_t amplitudeToScale(float amplitude, float maximum) {
     return std::round(ratio);
 }
 
-static float redcToFloat(std::string *caldata) {
-    return static_cast<float>(std::stoul(*caldata, nullptr, 16)) / (1 << Q15_BIT_SHIFT);
-}
-
 enum WaveformBankID : uint8_t {
     RAM_WVFRM_BANK,
     ROM_WVFRM_BANK,
@@ -195,8 +158,6 @@ enum vibe_state {
     VIBE_STATE_ASP,
 };
 
-std::mutex mActiveId_mutex;  // protects mActiveId
-
 class DspMemChunk {
   private:
     std::unique_ptr<uint8_t[]> head;
@@ -272,18 +233,10 @@ class DspMemChunk {
             write(8, 0); /* nsections placeholder */
             write(8, 0); /* repeat */
         } else if (waveformType == WAVEFORM_PWLE) {
-            write(16, (PWLE_FTR_BUZZ_BIT | PWLE_FTR_DVL_BIT)
-                              << PWLE_HEADER_FTR_SHIFT); /* Feature flag */
-            write(8, PWLE_WT_TYPE);                      /* type12 */
-            write(24, PWLE_HEADER_WORD_COUNT);           /* Header word count */
-            write(24, 0);                                /* Body word count placeholder */
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)
             write(24, 0); /* Waveform length placeholder */
             write(8, 0);  /* Repeat */
             write(12, 0); /* Wait time between repeats */
             write(8, 0);  /* nsections placeholder */
-#endif
         } else {
             ALOGE("%s: Invalid type: %u", __func__, waveformType);
         }
@@ -371,9 +324,6 @@ class DspMemChunk {
             ALOGE("%s: Invalid argument: %u", __func__, totalDuration);
             return -EINVAL;
         }
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)
-        f += PWLE_HEADER_WORD_COUNT * PWLE_WORD_SIZE;
-#endif
         totalDuration *= 8; /* Unit: 0.125 ms (since wlength played @ 8kHz). */
         totalDuration |=
                 WT_LEN_CALCD; /* Bit 23 is for WT_LEN_CALCD; Bit 22 is for WT_INDEFINITE. */
@@ -402,9 +352,6 @@ class DspMemChunk {
                 ALOGE("%s: Invalid argument: %d", __func__, segmentIdx);
                 return -EINVAL;
             }
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)
-            f += PWLE_HEADER_WORD_COUNT * PWLE_WORD_SIZE;
-#endif
             *(f + 7) |= (0xF0 & segmentIdx) >> 4; /* Bit 4 to 7 */
             *(f + 9) |= (0x0F & segmentIdx) << 4; /* Bit 3 to 0 */
         } else {
@@ -414,34 +361,6 @@ class DspMemChunk {
 
         return 0;
     }
-
-    int updateWCount(int segmentCount) {
-        uint8_t *f = front();
-
-        if (segmentCount > COMPOSE_SIZE_MAX + 1 /*1st effect may have a delay*/) {
-            ALOGE("%s: Invalid argument: %d", __func__, segmentCount);
-            return -EINVAL;
-        }
-        if (f == nullptr) {
-            ALOGE("%s: head does not exist!", __func__);
-            return -ENOMEM;
-        }
-        if (waveformType != WAVEFORM_PWLE) {
-            ALOGE("%s: Invalid type: %d", __func__, waveformType);
-            return -EDOM;
-        }
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)
-        f += PWLE_HEADER_WORD_COUNT * PWLE_WORD_SIZE;
-#endif
-        uint32_t dataSize = segmentCount * PWLE_SEGMENT_WORD_COUNT + PWLE_HEADER_WORD_COUNT;
-        *(f + 0) = (dataSize >> 24) & 0xFF;
-        *(f + 1) = (dataSize >> 16) & 0xFF;
-        *(f + 2) = (dataSize >> 8) & 0xFF;
-        *(f + 3) = dataSize & 0xFF;
-
-        return 0;
-    }
 };
 
 Vibrator::Vibrator(std::unique_ptr<HwApi> hwApiDefault, std::unique_ptr<HwCal> hwCalDefault,
@@ -566,9 +485,8 @@ Vibrator::Vibrator(std::unique_ptr<HwApi> hwApiDefault, std::unique_ptr<HwCal> h
     mFfEffects.resize(WAVEFORM_MAX_INDEX);
     mEffectDurations.resize(WAVEFORM_MAX_INDEX);
     mEffectDurations = {
-            1000, 100, 9, 1000, 300, 130, 150, 500, 100, 5, 12, 1000, 1000, 1000,
+            1000, 100, 12, 1000, 300, 130, 150, 500, 100, 5, 12, 1000, 1000, 1000,
     }; /* 11+3 waveforms. The duration must < UINT16_MAX */
-    mEffectBrakingDurations.resize(WAVEFORM_MAX_INDEX);
     mEffectCustomData.reserve(WAVEFORM_MAX_INDEX);
 
     uint8_t effectIndex;
@@ -601,11 +519,6 @@ Vibrator::Vibrator(std::unique_ptr<HwApi> hwApiDefault, std::unique_ptr<HwCal> h
             if (mFfEffects[effectIndex].id != effectIndex) {
                 ALOGW("Unexpected effect index: %d -> %d", effectIndex, mFfEffects[effectIndex].id);
             }
-
-            if (mHwApiDef->hasEffectBrakingTimeBank()) {
-                mHwApiDef->setEffectBrakingTimeIndex(effectIndex);
-                mHwApiDef->getEffectBrakingTimeMs(&mEffectBrakingDurations[effectIndex]);
-            }
         } else {
             /* Initiate placeholders for OWT effects. */
             numBytes = effectIndex == WAVEFORM_COMPOSE ? FF_CUSTOM_DATA_LEN_MAX_COMP
@@ -679,12 +592,9 @@ Vibrator::Vibrator(std::unique_ptr<HwApi> hwApiDefault, std::unique_ptr<HwCal> h
 
     if (mHwCalDef->getF0(&caldata)) {
         mHwApiDef->setF0(caldata);
-        mResonantFrequency =
-                static_cast<float>(std::stoul(caldata, nullptr, 16)) / (1 << Q14_BIT_SHIFT);
     }
     if (mHwCalDef->getRedc(&caldata)) {
         mHwApiDef->setRedc(caldata);
-        mRedc = redcToFloat(&caldata);
     }
     if (mHwCalDef->getQ(&caldata)) {
         mHwApiDef->setQ(caldata);
@@ -767,21 +677,8 @@ Vibrator::Vibrator(std::unique_ptr<HwApi> hwApiDefault, std::unique_ptr<HwCal> h
         mSupportedPrimitives = defaultSupportedPrimitives;
     }
 
-    mPrimitiveMaxScale.resize(WAVEFORM_MAX_INDEX, 100);
-    mPrimitiveMaxScale[WAVEFORM_CLICK_INDEX] = 95;
-    mPrimitiveMaxScale[WAVEFORM_THUD_INDEX] = 75;
-    mPrimitiveMaxScale[WAVEFORM_SPIN_INDEX] = 90;
-    mPrimitiveMaxScale[WAVEFORM_LIGHT_TICK_INDEX] = 75;
-    mPrimitiveMaxScale[WAVEFORM_LOW_TICK_INDEX] = 75;
-
-    mPrimitiveMinScale.resize(WAVEFORM_MAX_INDEX, 0);
-    mPrimitiveMinScale[WAVEFORM_CLICK_INDEX] = 1;
-    mPrimitiveMinScale[WAVEFORM_THUD_INDEX] = 11;
-    mPrimitiveMinScale[WAVEFORM_SPIN_INDEX] = 23;
-    mPrimitiveMinScale[WAVEFORM_SLOW_RISE_INDEX] = 25;
-    mPrimitiveMinScale[WAVEFORM_QUICK_FALL_INDEX] = 2;
-    mPrimitiveMinScale[WAVEFORM_LIGHT_TICK_INDEX] = 3;
-    mPrimitiveMinScale[WAVEFORM_LOW_TICK_INDEX] = 16;
+    mPrimitiveMaxScale = {1.0f, 0.95f, 0.75f, 0.9f, 1.0f, 1.0f, 1.0f, 0.75f, 0.75f};
+    mPrimitiveMinScale = {0.0f, 0.01f, 0.11f, 0.23f, 0.0f, 0.25f, 0.02f, 0.03f, 0.16f};
 
     // ====== Get GPIO status and init it ================
     mGPIOStatus = mHwGPIO->getGPIO();
@@ -953,7 +850,7 @@ ndk::ScopedAStatus Vibrator::getPrimitiveDuration(CompositePrimitive primitive,
             return status;
         }
 
-        *durationMs = mEffectDurations[effectIndex] + mEffectBrakingDurations[effectIndex];
+        *durationMs = mEffectDurations[effectIndex];
     } else {
         *durationMs = 0;
     }
@@ -966,6 +863,7 @@ ndk::ScopedAStatus Vibrator::compose(const std::vector<CompositeEffect> &composi
     ALOGD("Vibrator::compose");
     uint16_t size;
     uint16_t nextEffectDelay;
+    uint16_t totalDuration = 0;
 
     if (composite.size() > COMPOSE_SIZE_MAX || composite.empty()) {
         return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
@@ -973,6 +871,7 @@ ndk::ScopedAStatus Vibrator::compose(const std::vector<CompositeEffect> &composi
 
     /* Check if there is a wait before the first effect. */
     nextEffectDelay = composite.front().delayMs;
+    totalDuration += nextEffectDelay;
     if (nextEffectDelay > COMPOSE_DELAY_MAX_MS || nextEffectDelay < 0) {
         return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
     } else if (nextEffectDelay > 0) {
@@ -1005,7 +904,16 @@ ndk::ScopedAStatus Vibrator::compose(const std::vector<CompositeEffect> &composi
             if (!status.isOk()) {
                 return status;
             }
+            // Add a max and min threshold to prevent the device crash(overcurrent) or no
+            // feeling
+            if (effectScale > mPrimitiveMaxScale[static_cast<uint32_t>(e_curr.primitive)]) {
+                effectScale = mPrimitiveMaxScale[static_cast<uint32_t>(e_curr.primitive)];
+            }
+            if (effectScale < mPrimitiveMinScale[static_cast<uint32_t>(e_curr.primitive)]) {
+                effectScale = mPrimitiveMinScale[static_cast<uint32_t>(e_curr.primitive)];
+            }
             effectVolLevel = intensityToVolLevel(effectScale, effectIndex);
+            totalDuration += mEffectDurations[effectIndex];
         }
 
         /* Fetch the next composite effect delay and fill into the current section */
@@ -1018,14 +926,13 @@ ndk::ScopedAStatus Vibrator::compose(const std::vector<CompositeEffect> &composi
                 return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
             }
             nextEffectDelay = delay;
+            totalDuration += delay;
         }
 
         if (effectIndex == 0 && nextEffectDelay == 0) {
             return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
         }
 
-        nextEffectDelay += mEffectBrakingDurations[effectIndex];
-
         ch.constructComposeSegment(effectVolLevel, effectIndex, 0 /*repeat*/, 0 /*flags*/,
                                    nextEffectDelay /*delay*/);
     }
@@ -1083,7 +990,7 @@ ndk::ScopedAStatus Vibrator::on(uint32_t timeoutMs, uint32_t effectIndex, const
         if (mIsDual) {
             mHwApiDual->getOwtFreeSpace(&freeBytes);
             if (ch-> size() > freeBytes) {
-                ALOGE("Invalid OWT length in flip: Effect %d: %zu > %d!", effectIndex,
+                ALOGE("Invalid OWT length in flip: Effect %d: %d > %d!", effectIndex,
                       ch-> size(), freeBytes);
                 return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
             }
@@ -1222,7 +1129,12 @@ ndk::ScopedAStatus Vibrator::alwaysOnDisable(int32_t /*id*/) {
 }
 
 ndk::ScopedAStatus Vibrator::getResonantFrequency(float *resonantFreqHz) {
-    *resonantFreqHz = mResonantFrequency;
+    std::string caldata{8, '0'};
+    if (!mHwCalDef->getF0(&caldata)) {
+        ALOGE("Failed to get resonant frequency (%d): %s", errno, strerror(errno));
+        return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE);
+    }
+    *resonantFreqHz = static_cast<float>(std::stoul(caldata, nullptr, 16)) / (1 << Q14_BIT_SHIFT);
 
     return ndk::ScopedAStatus::ok();
 }
@@ -1439,13 +1351,6 @@ ndk::ScopedAStatus Vibrator::composePwle(const std::vector<PrimitivePwle> &compo
         return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
     }
 
-    /* Update word count */
-    if (ch.updateWCount(segmentIdx) < 0) {
-        ALOGE("%s: Failed to update the waveform word count", __func__);
-        return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
-    }
-
-    /* Update waveform length */
     if (ch.updateWLength(totalDuration) < 0) {
         ALOGE("%s: Failed to update the waveform length length", __func__);
         return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
@@ -1478,37 +1383,36 @@ binder_status_t Vibrator::dump(int fd, const char **args, uint32_t numArgs) {
 
     dprintf(fd, "AIDL:\n");
 
-    dprintf(fd, "  Active Effect ID: %" PRId32 "\n", mActiveId);
-    dprintf(fd, "  F0: %.02f\n", mResonantFrequency);
     dprintf(fd, "  F0 Offset: base: %" PRIu32 " flip: %" PRIu32 "\n", mF0Offset, mF0OffsetDual);
-    dprintf(fd, "  Redc: %.02f\n", mRedc);
 
     dprintf(fd, "  Voltage Levels:\n");
-    dprintf(fd, "    Tick Effect Min: %" PRIu32 " Max: %" PRIu32 "\n", mTickEffectVol[0],
+    dprintf(fd, "     Tick Effect Min: %" PRIu32 " Max: %" PRIu32 "\n", mTickEffectVol[0],
             mTickEffectVol[1]);
-    dprintf(fd, "    Click Effect Min: %" PRIu32 " Max: %" PRIu32 "\n", mClickEffectVol[0],
+    dprintf(fd, "     Click Effect Min: %" PRIu32 " Max: %" PRIu32 "\n", mClickEffectVol[0],
             mClickEffectVol[1]);
-    dprintf(fd, "    Long Effect Min: %" PRIu32 " Max: %" PRIu32 "\n", mLongEffectVol[0],
+    dprintf(fd, "     Long Effect Min: %" PRIu32 " Max: %" PRIu32 "\n", mLongEffectVol[0],
             mLongEffectVol[1]);
 
+    dprintf(fd, "  FF effect:\n");
+    dprintf(fd, "    Physical waveform:\n");
+    dprintf(fd, "==== Base ====\n\tId\tIndex\tt   ->\tt'\ttrigger button\n");
     uint8_t effectId;
-    dprintf(fd, "  Scales\n");
-    dprintf(fd, "\tId\tMinScale\tMaxScale\n");
     for (effectId = 0; effectId < WAVEFORM_MAX_PHYSICAL_INDEX; effectId++) {
-        dprintf(fd, "\t%d\t%d\t\t%d\n", effectId, mPrimitiveMinScale[effectId],
-            mPrimitiveMaxScale[effectId]);
+        dprintf(fd, "\t%d\t%d\t%d\t%d\t%X\n", mFfEffects[effectId].id,
+                mFfEffects[effectId].u.periodic.custom_data[1], mEffectDurations[effectId],
+                mFfEffects[effectId].replay.length, mFfEffects[effectId].trigger.button);
+    }
+    if (mIsDual) {
+        dprintf(fd, "==== Flip ====\n\tId\tIndex\tt   ->\tt'\ttrigger button\n");
+        for (effectId = 0; effectId < WAVEFORM_MAX_PHYSICAL_INDEX; effectId++) {
+            dprintf(fd, "\t%d\t%d\t%d\t%d\t%X\n", mFfEffectsDual[effectId].id,
+                    mFfEffectsDual[effectId].u.periodic.custom_data[1], mEffectDurations[effectId],
+                    mFfEffectsDual[effectId].replay.length,
+                    mFfEffectsDual[effectId].trigger.button);
+        }
     }
 
-    dprintf(fd, "  Base FF effect:\n");
-    dprintf(fd, "    Physical waveform:\n");
-    dprintf(fd, "\tId\tIndex\tt   ->\tt'\tBrake\ttrigger button\n");
-    for (effectId = 0; effectId < WAVEFORM_MAX_PHYSICAL_INDEX; effectId++) {
-        dprintf(fd, "\t%d\t%d\t%d\t%d\t%d\t%X\n", mFfEffects[effectId].id,
-                mFfEffects[effectId].u.periodic.custom_data[1], mEffectDurations[effectId],
-                mFfEffects[effectId].replay.length, mEffectBrakingDurations[effectId],
-                mFfEffects[effectId].trigger.button);
-    }
-    dprintf(fd, "    OWT waveform:\n");
+    dprintf(fd, "Base: OWT waveform:\n");
     dprintf(fd, "\tId\tBytes\tData\tt\ttrigger button\n");
     for (effectId = WAVEFORM_MAX_PHYSICAL_INDEX; effectId < WAVEFORM_MAX_INDEX; effectId++) {
         uint32_t numBytes = mFfEffects[effectId].u.periodic.custom_len * 2;
@@ -1524,18 +1428,8 @@ binder_status_t Vibrator::dump(int fd, const char **args, uint32_t numArgs) {
         dprintf(fd, "\t%d\t%d\t{%s}\t%u\t%X\n", mFfEffects[effectId].id, numBytes, ss.str().c_str(),
                 mFfEffectsDual[effectId].replay.length, mFfEffects[effectId].trigger.button);
     }
-
     if (mIsDual) {
-        dprintf(fd, "  Flip FF effect:\n");
-        dprintf(fd, "    Physical waveform:\n");
-        dprintf(fd, "\tId\tIndex\tt   ->\tt'\tBrake\ttrigger button\n");
-        for (effectId = 0; effectId < WAVEFORM_MAX_PHYSICAL_INDEX; effectId++) {
-            dprintf(fd, "\t%d\t%d\t%d\t%d\t%d\t%X\n", mFfEffectsDual[effectId].id,
-                    mFfEffectsDual[effectId].u.periodic.custom_data[1], mEffectDurations[effectId],
-                    mFfEffectsDual[effectId].replay.length, mEffectBrakingDurations[effectId],
-                    mFfEffectsDual[effectId].trigger.button);
-        }
-        dprintf(fd, "    OWT waveform:\n");
+        dprintf(fd, "Flip: OWT waveform:\n");
         dprintf(fd, "\tId\tBytes\tData\tt\ttrigger button\n");
         for (effectId = WAVEFORM_MAX_PHYSICAL_INDEX; effectId < WAVEFORM_MAX_INDEX; effectId++) {
             uint32_t numBytes = mFfEffectsDual[effectId].u.periodic.custom_len * 2;
@@ -1554,59 +1448,6 @@ binder_status_t Vibrator::dump(int fd, const char **args, uint32_t numArgs) {
         }
     }
     dprintf(fd, "\n");
-
-    dprintf(fd, "Versions:\n");
-    const std::vector<std::pair<std::string, std::string>> moduleFolderNames = {
-        {"cs40l26_core", "Haptics"}, {"cl_dsp_core", "DSP"}};
-    const std::string firmwareFolder = "/vendor/firmware/";
-    const std::string waveformName = "cs40l26.bin";
-    const std::array<std::string, 2> firmwareFileNames = {"cs40l26.wmfw", "cs40l26-calib.wmfw"};
-    const std::array<std::string, 4> tuningFileNames = {"cs40l26-svc.bin", "cs40l26-calib.bin",
-                                                        "cs40l26-dvl.bin", "cs40l26-dbc.bin"};
-    std::ifstream verFile;
-    const auto verBinFileMode = std::ifstream::in | std::ifstream::binary;
-    std::string ver;
-    for (const auto &[folder, logTag] : moduleFolderNames) {
-        verFile.open("/sys/module/" + folder + "/version");
-        if (verFile.is_open()) {
-            getline(verFile, ver);
-            dprintf(fd, "  %s Driver: %s\n", logTag.c_str(), ver.c_str());
-            verFile.close();
-        }
-    }
-    for (auto &name : firmwareFileNames) {
-        verFile.open(firmwareFolder + name, verBinFileMode);
-        if (verFile.is_open()) {
-            verFile.seekg(113);
-            dprintf(fd, "  %s: %d.%d.%d\n", name.c_str(), verFile.get(), verFile.get(),
-                    verFile.get());
-            verFile.close();
-        }
-    }
-    verFile.open(firmwareFolder + waveformName, verBinFileMode);
-    if (verFile.is_open()) {
-        while (getline(verFile, ver)) {
-            auto pos = ver.find("Date: ");
-            if (pos != std::string::npos) {
-                ver = ver.substr(pos + 6, pos + 15);
-                dprintf(fd, "  %s: %s\n", waveformName.c_str(), ver.c_str());
-                break;
-            }
-        }
-        verFile.close();
-    }
-    for (auto &name : tuningFileNames) {
-        verFile.open(firmwareFolder + name, verBinFileMode);
-        if (verFile.is_open()) {
-            verFile.seekg(36);
-            getline(verFile, ver);
-            ver = ver.substr(0, ver.find(".bin") + 4);
-            ver = ver.substr(ver.rfind('\\') + 1);
-            dprintf(fd, "  %s: %s\n", name.c_str(), ver.c_str());
-            verFile.close();
-        }
-    }
-
     dprintf(fd, "\n");
 
     mHwApiDef->debug(fd);
@@ -1615,8 +1456,6 @@ binder_status_t Vibrator::dump(int fd, const char **args, uint32_t numArgs) {
 
     mHwCalDef->debug(fd);
 
-    dprintf(fd, "\n");
-
     if (mIsDual) {
         mHwApiDual->debug(fd);
         dprintf(fd, "\n");
@@ -1681,6 +1520,10 @@ ndk::ScopedAStatus Vibrator::getSimpleDetails(Effect effect, EffectStrength stre
         case Effect::HEAVY_CLICK:
             effectIndex = WAVEFORM_CLICK_INDEX;
             intensity *= 1.0f;
+            // WAVEFORM_CLICK_INDEX is 2, but the primitive CLICK index is 1.
+            if (intensity > mPrimitiveMaxScale[WAVEFORM_CLICK_INDEX - 1]) {
+                intensity = mPrimitiveMaxScale[WAVEFORM_CLICK_INDEX - 1];
+            }
             break;
         default:
             return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
@@ -1922,16 +1765,6 @@ uint32_t Vibrator::intensityToVolLevel(float intensity, uint32_t effectIndex) {
             volLevel = calc(intensity, mClickEffectVol);
             break;
     }
-    // The waveform being played must fall within the allowable scale range
-    if (effectIndex < WAVEFORM_MAX_INDEX) {
-        if (volLevel > mPrimitiveMaxScale[effectIndex]) {
-            volLevel = mPrimitiveMaxScale[effectIndex];
-        }
-        if (volLevel < mPrimitiveMinScale[effectIndex]) {
-            volLevel = mPrimitiveMinScale[effectIndex];
-        }
-    }
-
     return volLevel;
 }
 

vibrator/cs40l26/Vibrator.h

@@ -62,15 +62,6 @@ class Vibrator : public BnVibrator {
         virtual bool setQ(std::string value) = 0;
         // Reports the number of effect waveforms loaded in firmware.
         virtual bool getEffectCount(uint32_t *value) = 0;
-        // Checks whether braking time bank is supported.
-        virtual bool hasEffectBrakingTimeBank() = 0;
-        // Specifies the bank of the effect for querying braking time.
-        // 0: RAM bank, 2: OWT bank
-        virtual bool setEffectBrakingTimeBank(uint32_t value) = 0;
-        // Specifies the index of an effect whose braking time is to be read.
-        virtual bool setEffectBrakingTimeIndex(uint32_t value) = 0;
-        // Gets the braking time duration of SVC effects (returns 0 if not SVC).
-        virtual bool getEffectBrakingTimeMs(uint32_t *value) = 0;
         // Blocks until timeout or vibrator reaches desired state
         // (2 = ASP enabled, 1 = haptic enabled, 0 = disabled).
         virtual bool pollVibeState(uint32_t value, int32_t timeoutMs = -1) = 0;
@@ -227,7 +218,6 @@ class Vibrator : public BnVibrator {
     std::vector<ff_effect> mFfEffects;
     std::vector<ff_effect> mFfEffectsDual;
     std::vector<uint32_t> mEffectDurations;
-    std::vector<uint32_t> mEffectBrakingDurations;
     std::vector<std::vector<int16_t>> mEffectCustomData;
     std::vector<std::vector<int16_t>> mEffectCustomDataDual;
     std::future<void> mAsyncHandle;
@@ -242,14 +232,13 @@ class Vibrator : public BnVibrator {
     float mLongEffectScale{1.0};
     bool mIsChirpEnabled;
     uint32_t mSupportedPrimitivesBits = 0x0;
-    float mRedc{0.0f};
-    float mResonantFrequency{0.0f};
     std::vector<CompositePrimitive> mSupportedPrimitives;
-    std::vector<uint32_t> mPrimitiveMaxScale;
-    std::vector<uint32_t> mPrimitiveMinScale;
+    std::vector<float> mPrimitiveMaxScale;
+    std::vector<float> mPrimitiveMinScale;
     bool mConfigHapticAlsaDeviceDone{false};
     bool mGPIOStatus;
     bool mIsDual{false};
+    std::mutex mActiveId_mutex;  // protects mActiveId
 };
 
 }  // namespace vibrator

vibrator/cs40l26/android.hardware.vibrator-service.cs40l26-private.rc

@@ -14,9 +14,6 @@ on property:vendor.all.modules.ready=1
     chown system system /sys/bus/i2c/devices/15-0043/calibration/redc_stored
     chown system system /sys/bus/i2c/devices/15-0043/default/vibe_state
     chown system system /sys/bus/i2c/devices/15-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/15-0043/default/braking_time_bank
-    chown system system /sys/bus/i2c/devices/15-0043/default/braking_time_index
-    chown system system /sys/bus/i2c/devices/15-0043/default/braking_time_ms
     chown system system /sys/bus/i2c/devices/15-0043/default/f0_offset
     chown system system /sys/bus/i2c/devices/15-0043/default/owt_free_space
     chown system system /sys/bus/i2c/devices/15-0043/default/f0_comp_enable
@@ -28,9 +25,6 @@ on property:vendor.all.modules.ready=1
     chown system system /sys/bus/i2c/devices/15-0042/calibration/redc_stored
     chown system system /sys/bus/i2c/devices/15-0042/default/vibe_state
     chown system system /sys/bus/i2c/devices/15-0042/default/num_waves
-    chown system system /sys/bus/i2c/devices/15-0042/default/braking_time_bank
-    chown system system /sys/bus/i2c/devices/15-0042/default/braking_time_index
-    chown system system /sys/bus/i2c/devices/15-0042/default/braking_time_ms
     chown system system /sys/bus/i2c/devices/15-0042/default/f0_offset
     chown system system /sys/bus/i2c/devices/15-0042/default/owt_free_space
     chown system system /sys/bus/i2c/devices/15-0042/default/f0_comp_enable
@@ -62,9 +56,6 @@ service vendor.vibrator.cs40l26 /vendor/bin/hw/android.hardware.vibrator-service
         calibration/q_stored
         default/vibe_state
         default/num_waves
-        default/braking_time_bank
-        default/braking_time_index
-        default/braking_time_ms
         default/f0_offset
         default/owt_free_space
         default/f0_comp_enable

vibrator/cs40l26/tests/Android.bp

@@ -26,6 +26,7 @@ cc_test {
         "test-vibrator.cpp",
     ],
     static_libs: [
+        "libc++fs",
         "libgmock",
     ],
     shared_libs: [

vibrator/cs40l26/tests/mocks.h

@@ -39,10 +39,6 @@ class MockApi : public ::aidl::android::hardware::vibrator::Vibrator::HwApi {
     MOCK_METHOD1(setRedc, bool(std::string value));
     MOCK_METHOD1(setQ, bool(std::string value));
     MOCK_METHOD1(getEffectCount, bool(uint32_t *value));
-    MOCK_METHOD0(hasEffectBrakingTimeBank, bool());
-    MOCK_METHOD1(setEffectBrakingTimeBank, bool(uint32_t value));
-    MOCK_METHOD1(setEffectBrakingTimeIndex, bool(uint32_t value));
-    MOCK_METHOD1(getEffectBrakingTimeMs, bool(uint32_t *value));
     MOCK_METHOD2(pollVibeState, bool(uint32_t value, int32_t timeoutMs));
     MOCK_METHOD0(hasOwtFreeSpace, bool());
     MOCK_METHOD1(getOwtFreeSpace, bool(uint32_t *value));

vibrator/cs40l26/tests/test-hwcal.cpp

@@ -30,9 +30,9 @@ using ::testing::Test;
 
 class HwCalTest : public Test {
   protected:
-    static constexpr std::array<uint32_t, 2> V_TICK_DEFAULT = {5, 95};
-    static constexpr std::array<uint32_t, 2> V_CLICK_DEFAULT = {5, 95};
-    static constexpr std::array<uint32_t, 2> V_LONG_DEFAULT = {5, 95};
+    static constexpr std::array<uint32_t, 2> V_TICK_DEFAULT = {1, 100};
+    static constexpr std::array<uint32_t, 2> V_CLICK_DEFAULT = {1, 100};
+    static constexpr std::array<uint32_t, 2> V_LONG_DEFAULT = {1, 100};
 
   public:
     void SetUp() override { setenv("CALIBRATION_FILEPATH", mCalFile.path, true); }

vibrator/cs40l26/tests/test-vibrator.cpp

@@ -74,7 +74,7 @@ static constexpr std::array<EffectLevel, 2> V_TICK_DEFAULT = {1, 100};
 static constexpr std::array<EffectLevel, 2> V_CLICK_DEFAULT{1, 100};
 static constexpr std::array<EffectLevel, 2> V_LONG_DEFAULT{1, 100};
 static constexpr std::array<EffectDuration, 14> EFFECT_DURATIONS{
-        1000, 100, 9, 1000, 300, 130, 150, 500, 100, 5, 12, 1000, 1000, 1000};
+        0, 100, 30, 1000, 300, 130, 150, 500, 100, 15, 20, 1000, 1000, 1000};
 
 // Constants With Prescribed Values
 
@@ -87,7 +87,7 @@ static const std::map<Effect, EffectIndex> EFFECT_INDEX{
 static constexpr uint32_t MIN_ON_OFF_INTERVAL_US = 8500;
 static constexpr uint8_t VOLTAGE_SCALE_MAX = 100;
 static constexpr int8_t MAX_COLD_START_LATENCY_MS = 6;  // I2C Transaction + DSP Return-From-Standby
-static constexpr auto POLLING_TIMEOUT = 50;
+static constexpr auto POLLING_TIMEOUT = 20;
 enum WaveformIndex : uint16_t {
     /* Physical waveform */
     WAVEFORM_LONG_VIBRATION_EFFECT_INDEX = 0,
@@ -375,11 +375,6 @@ TEST_F(VibratorTest, Constructor) {
             .WillOnce(DoAll(SetArgPointee<0>(supportedPrimitivesBits), Return(true)));
 
     EXPECT_CALL(*mMockApi, setMinOnOffInterval(MIN_ON_OFF_INTERVAL_US)).WillOnce(Return(true));
-    EXPECT_CALL(*mMockApi, setEffectBrakingTimeBank(0)).WillRepeatedly(Return(true));
-    for (uint32_t i = 0; i < WAVEFORM_MAX_PHYSICAL_INDEX; i++) {
-        EXPECT_CALL(*mMockApi, setEffectBrakingTimeIndex(i)).WillRepeatedly(Return(true));
-        EXPECT_CALL(*mMockApi, getEffectBrakingTimeMs(_)).WillRepeatedly(Return(true));
-    }
     createVibrator(std::move(mockapi), std::move(mockcal), std::move(mockgpio), false);
 }
 
@@ -506,23 +501,6 @@ TEST_P(EffectsTest, perform) {
         promise.set_value();
         return ndk::ScopedAStatus::ok();
     };
-    std::vector<uint32_t> primitiveMaxScale;
-    std::vector<uint32_t> primitiveMinScale;
-    primitiveMaxScale.resize(WAVEFORM_MAX_INDEX, 100);
-    primitiveMaxScale[WAVEFORM_CLICK_INDEX] = 95;
-    primitiveMaxScale[WAVEFORM_THUD_INDEX] = 75;
-    primitiveMaxScale[WAVEFORM_SPIN_INDEX] = 90;
-    primitiveMaxScale[WAVEFORM_LIGHT_TICK_INDEX] = 75;
-    primitiveMaxScale[WAVEFORM_LOW_TICK_INDEX] = 75;
-
-    primitiveMinScale.resize(WAVEFORM_MAX_INDEX, 0);
-    primitiveMinScale[WAVEFORM_CLICK_INDEX] = 1;
-    primitiveMinScale[WAVEFORM_THUD_INDEX] = 11;
-    primitiveMinScale[WAVEFORM_SPIN_INDEX] = 23;
-    primitiveMinScale[WAVEFORM_SLOW_RISE_INDEX] = 25;
-    primitiveMinScale[WAVEFORM_QUICK_FALL_INDEX] = 2;
-    primitiveMinScale[WAVEFORM_LIGHT_TICK_INDEX] = 3;
-    primitiveMinScale[WAVEFORM_LOW_TICK_INDEX] = 16;
     bool composeEffect;
 
     ExpectationSet eSetup;
@@ -532,18 +510,7 @@ TEST_P(EffectsTest, perform) {
         EffectIndex index = EFFECT_INDEX.at(effect);
         duration = EFFECT_DURATIONS[index];
 
-        auto updatedScale = levelToScale(scale->second);
-
-        if (index < WAVEFORM_MAX_INDEX) {
-            if (updatedScale > primitiveMaxScale[index]) {
-                updatedScale = primitiveMaxScale[index];
-            }
-            if (updatedScale < primitiveMinScale[index]) {
-                updatedScale = primitiveMinScale[index];
-            }
-        }
-
-        eSetup += EXPECT_CALL(*mMockApi, setFFGain(_, updatedScale))
+        eSetup += EXPECT_CALL(*mMockApi, setFFGain(_, levelToScale(scale->second)))
                           .WillOnce(DoDefault());
         eActivate = EXPECT_CALL(*mMockApi, setFFPlay(_, index, true))
                             .After(eSetup)