lynx: Initialize for Evolution X 9.x

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

AndroidProducts.mk

@@ -16,4 +16,9 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_lynx.mk \
+    $(LOCAL_DIR)/aosp_lynx_hwasan.mk \
+    $(LOCAL_DIR)/factory_lynx.mk \
     $(LOCAL_DIR)/lineage_lynx.mk
+
+COMMON_LUNCH_CHOICES := \
+    aosp_lynx-trunk_staging-userdebug

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

@@ -0,0 +1,4 @@
+per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com
+
+# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS

PREUPLOAD.cfg

@@ -0,0 +1,2 @@
+[Builtin Hooks]
+jsonlint = true

aosp_lynx.mk

@@ -28,3 +28,6 @@ PRODUCT_DEVICE := lynx
 PRODUCT_MODEL := AOSP on Lynx
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
+
+DEVICE_MANIFEST_FILE := \
+	device/google/lynx/manifest.xml

aosp_lynx_hwasan.mk

@@ -0,0 +1,23 @@
+#
+# Copyright 2023 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.
+#
+
+$(call inherit-product, device/google/lynx/aosp_lynx.mk)
+PRODUCT_NAME := aosp_lynx_hwasan
+
+# Add "hwaddress" as a global sanitizer if it's missing.
+ifeq ($(filter hwaddress,$(SANITIZE_TARGET)),)
+  SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) hwaddress)
+endif

audio/lynx/aidl_config/mixer_paths_aidl.xml

@@ -1312,7 +1312,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" />
@@ -1322,14 +1322,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/lynx/audio-tables.mk

@@ -62,3 +62,21 @@ PRODUCT_COPY_FILES += \
     device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/mcps.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/mcps.dat \
     device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \
     device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
+
+# eng specific
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_COPY_FILES += \
+    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
+    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \
+    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.mods \
+    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.mods
+
+#Bluenote files
+PRODUCT_COPY_FILES += \
+    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/template.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/template.xml \
+    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/tuning_constraints_combination.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/tuning_constraints_combination.xml
+
+# Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
+PRODUCT_COPY_FILES += \
+    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
+endif

audio/lynx/config/audio_policy_configuration.xml

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

audio/lynx/config/audio_policy_configuration_a2dp_offload_disabled.xml

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

audio/lynx/config/audio_policy_configuration_bluetooth_legacy_hal.xml

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

audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml

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

audio/lynx/config/mixer_paths_factory.xml

@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<mixer>
+    <ctl name="TDM_0_RX Mixer EP3" value="0" />
+    <ctl name="TDM_0_RX Mixer EP6" value="0" />
+    <ctl name="I2S_0_RX Mixer EP3" value="0" />
+    <ctl name="Main AMP Enable Switch" value="0" />
+    <ctl name="R Main AMP Enable Switch" value="0" />
+    <ctl name="MIC HW Gain At Lower Power Mode (cB)" value="-160" />
+    <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0"/>
+
+    <ctl name="EP1 TX Mixer TDM_0_TX" value="0" />
+    <ctl name="DEFAULT_MIC_ID" value="0" />
+    <ctl name="MIC0" value="0" />
+    <ctl name="MIC1" value="0" />
+    <ctl name="MIC2" value="0" />
+    <ctl name="MIC3" value="0" />
+    <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_ON" />
+
+    <ctl name="TDM_0_RX Mixer US" value="0" />
+    <ctl name="US Record Enable" value="0" />
+
+    <path name="mfg-playback">
+    </path>
+
+    <path name="deep-buffer-playback speaker">
+        <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
+        <ctl name="TDM_0_RX Mixer EP6" value="1" />
+        <path name="mfg-playback" />
+    </path>
+
+    <path name="deep-buffer-playback headphones">
+        <ctl name="I2S_0_RX Mixer EP6" value="1" />
+        <path name="mfg-playback" />
+    </path>
+
+    <path name="mfg-record">
+        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
+    </path>
+
+    <path name="us-mfg-record">
+        <ctl name="US Record Enable" value="1" />
+        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
+    </path>
+
+    <path name="mic1-status">
+        <ctl name="MIC0" value="1" />
+    </path>
+
+    <path name="mic2-status">
+        <ctl name="MIC1" value="1" />
+    </path>
+
+    <path name="mic3-status">
+        <ctl name="MIC2" value="1" />
+    </path>
+
+    <path name="mic4-status">
+        <ctl name="MIC3" value="0" />
+    </path>
+
+    <path name="mic1-gain">
+        <ctl name="MIC HW Gain At Lower Power Mode (cB)" />
+        <ctl name="MIC HW Gain At High Power Mode (cB)" />
+    </path>
+
+    <path name="mic2-gain">
+        <ctl name="MIC HW Gain At Lower Power Mode (cB)" />
+        <ctl name="MIC HW Gain At High Power Mode (cB)" />
+    </path>
+
+    <path name="mic3-gain">
+        <ctl name="MIC HW Gain At Lower Power Mode (cB)" />
+        <ctl name="MIC HW Gain At High Power Mode (cB)" />
+    </path>
+
+    <path name="mic4-gain">
+        <ctl name="MIC HW Gain At Lower Power Mode (cB)" />
+        <ctl name="MIC HW Gain At High Power Mode (cB)" />
+    </path>
+
+    <path name="mic1-sw-gain">
+        <ctl name="MIC Record Soft Gain (dB)" />
+    </path>
+
+    <path name="mic2-sw-gain">
+        <ctl name="MIC Record Soft Gain (dB)" />
+    </path>
+
+    <path name="mic3-sw-gain">
+        <ctl name="MIC Record Soft Gain (dB)" />
+    </path>
+
+    <path name="mic4-sw-gain">
+        <ctl name="MIC Record Soft Gain (dB)" />
+    </path>
+
+    <path name="usb-capture-gain">
+        <ctl name="Headset Capture Volume" />
+    </path>
+
+    <path name="mic1-only">
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+        <ctl name="MIC0" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    </path>
+
+    <path name="mic2-only">
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="2" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+        <ctl name="MIC1" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    </path>
+
+    <path name="mic3-only">
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="2" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+        <ctl name="MIC2" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    </path>
+
+    <path name="mic4-only">
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="3" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+        <ctl name="MIC3" value="0" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    </path>
+
+    <path name="mic-all">
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="2" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="3" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+        <ctl name="MIC0" value="1" />
+        <ctl name="MIC1" value="1" />
+        <ctl name="MIC2" value="1" />
+        <ctl name="MIC3" value="0" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    </path>
+
+    <path name="amp_iv-only">
+        <ctl name="R ASPTX1 Slot Position" value="2" />
+        <ctl name="R ASPTX2 Slot Position" value="3" />
+        <ctl name="R ASPTX3 Slot Position" value="6" />
+        <ctl name="R ASPTX4 Slot Position" value="7" />
+        <ctl name="ASPTX1 Slot Position" value="0" />
+        <ctl name="ASPTX2 Slot Position" value="1" />
+        <ctl name="ASPTX3 Slot Position" value="4" />
+        <ctl name="ASPTX4 Slot Position" value="5" />
+        <ctl name="R ASP TX1 Source" value="VMON" />
+        <ctl name="R ASP TX2 Source" value="ASPRX1" />
+        <ctl name="R ASP TX3 Source" value="Zero" />
+        <ctl name="R ASP TX4 Source" value="Zero" />
+        <ctl name="ASP TX1 Source" value="VMON" />
+        <ctl name="ASP TX2 Source" value="ASPRX1" />
+        <ctl name="ASP TX3 Source" value="Zero" />
+        <ctl name="ASP TX4 Source" value="Zero" />
+        <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
+    </path>
+
+    <path name="amp_iv1-only">
+        <ctl name="R ASPTX1 Slot Position" value="4" />
+        <ctl name="R ASPTX2 Slot Position" value="5" />
+        <ctl name="R ASPTX3 Slot Position" value="6" />
+        <ctl name="R ASPTX4 Slot Position" value="7" />
+        <ctl name="ASPTX1 Slot Position" value="0" />
+        <ctl name="ASPTX2 Slot Position" value="1" />
+        <ctl name="ASPTX3 Slot Position" value="2" />
+        <ctl name="ASPTX4 Slot Position" value="3" />
+        <ctl name="R ASP TX1 Source" value="Zero" />
+        <ctl name="R ASP TX2 Source" value="Zero" />
+        <ctl name="R ASP TX3 Source" value="Zero" />
+        <ctl name="R ASP TX4 Source" value="Zero" />
+        <ctl name="ASP TX1 Source" value="VMON" />
+        <ctl name="ASP TX2 Source" value="IMON" />
+        <ctl name="ASP TX3 Source" value="VPMON" />
+        <ctl name="ASP TX4 Source" value="ASPRX1" />
+        <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
+    </path>
+
+    <path name="amp_iv2-only">
+        <ctl name="R ASPTX1 Slot Position" value="0" />
+        <ctl name="R ASPTX2 Slot Position" value="1" />
+        <ctl name="R ASPTX3 Slot Position" value="2" />
+        <ctl name="R ASPTX4 Slot Position" value="3" />
+        <ctl name="ASPTX1 Slot Position" value="4" />
+        <ctl name="ASPTX2 Slot Position" value="5" />
+        <ctl name="ASPTX3 Slot Position" value="6" />
+        <ctl name="ASPTX4 Slot Position" value="7" />
+        <ctl name="R ASP TX1 Source" value="VMON" />
+        <ctl name="R ASP TX2 Source" value="IMON" />
+        <ctl name="R ASP TX3 Source" value="VPMON" />
+        <ctl name="R ASP TX4 Source" value="ASPRX1" />
+        <ctl name="ASP TX1 Source" value="Zero" />
+        <ctl name="ASP TX2 Source" value="Zero" />
+        <ctl name="ASP TX3 Source" value="Zero" />
+        <ctl name="ASP TX4 Source" value="Zero" />
+        <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
+    </path>
+
+    <path name="us-amp_iv-only">
+        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
+        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
+        <path name="amp_iv-only" />
+    </path>
+
+    <path name="us-amp_iv1-only">
+        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
+        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
+        <path name="amp_iv1-only" />
+    </path>
+
+    <path name="us-amp_iv2-only">
+        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
+        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
+        <path name="amp_iv2-only" />
+    </path>
+
+    <path name="speaker1-status">
+        <ctl name="Main AMP Enable Switch" value="1" />
+    </path>
+
+    <path name="speaker2-status">
+        <ctl name="R Main AMP Enable Switch" value="1" />
+    </path>
+
+    <path name="speaker1-gain">
+        <ctl name="AMP PCM Gain" />
+    </path>
+
+    <path name="speaker2-gain">
+        <ctl name="R AMP PCM Gain" />
+    </path>
+
+    <path name="usb-playback-gain">
+        <ctl name="Headset Playback Volume" />
+    </path>
+
+    <path name="mfg-playback speaker">
+        <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
+        <ctl name="TDM_0_RX Mixer EP3" value="1" />
+        <ctl name="ASPRX1 Slot Position" value="0" />
+        <ctl name="R ASPRX1 Slot Position" value="1" />
+        <ctl name="SINK_IDS" id="0" value="0" />
+        <ctl name="SINK_IDS" id="1" value="-1" />
+    </path>
+
+    <path name="mfg-playback headphones">
+        <ctl name="I2S_0_RX Chan" value="Two" />
+        <ctl name="I2S_0_RX Format" value="S32_LE" />
+        <ctl name="I2S_0_RX Mixer EP3" value="1" />
+        <ctl name="SINK_IDS" id="0" value="1" />
+        <ctl name="SINK_IDS" id="1" value="-1" />
+    </path>
+
+    <path name="mfg-playback usb-headphones">
+        <ctl name="USB Dev ID v2" value="2" />
+        <ctl name="USB Playback EP ID v2" value="1" />
+        <ctl name="USB Capture EP ID v2" value="0" />
+        <ctl name="USB Playback FORMAT v2" value="6" />
+        <ctl name="USB Playback SR v2" value="48000" />
+        <ctl name="USB Playback CH v2" value="2" />
+        <ctl name="USB Playback BW v2" value="16" />
+        <ctl name="USB Config To AoC v2" value="1" />
+        <ctl name="USB_RX Mixer EP3" value="1" />
+    </path>
+
+    <path name="mfg-record usb-headset-mic">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
+        <ctl name="USB Playback EP ID v2" value="0" />
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="USB Config To AoC v2" value="1"/>
+        <ctl name="EP1 TX Mixer USB_TX" value="1"/>
+    </path>
+
+    <path name="us-mfg-playback speaker">
+        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
+        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
+        <ctl name="TDM_0_RX Mixer US" value="1" />
+    </path>
+
+    <path name="speaker1-only">
+        <ctl name="Main AMP Enable Switch" value="1" />
+        <path name="mfg-playback speaker" />
+        <ctl name="AMP PCM Gain" value="17" />
+        <ctl name="PCM Source" value="ASP" />
+    </path>
+
+    <path name="speaker2-only">
+        <ctl name="R Main AMP Enable Switch" value="1" />
+        <path name="mfg-playback speaker" />
+        <ctl name="R AMP PCM Gain" value="17" />
+        <ctl name="R PCM Source" value="ASP" />
+    </path>
+
+    <path name="us-speaker1-only">
+        <path name="us-mfg-playback speaker" />
+        <ctl name="PCM Source" value="ASP" />
+        <ctl name="Main AMP Enable Switch" value="1" />
+    </path>
+
+    <path name="us-speaker2-only">
+        <path name="us-mfg-playback speaker" />
+        <ctl name="R PCM Source" value="ASP" />
+        <ctl name="R Main AMP Enable Switch" value="1" />
+    </path>
+
+    <path name="headphones">
+        <ctl name="DAC1 MIXL DAC1 Switch" value="1" />
+        <ctl name="DAC1 MIXR DAC1 Switch" value="1" />
+        <ctl name="Stereo1 DAC MIXL DAC L1 Switch" value="1" />
+        <ctl name="Stereo1 DAC MIXR DAC R1 Switch" value="1" />
+        <ctl name="DAC L1 Source" value="Stereo1 DAC Mixer" />
+        <ctl name="DAC R1 Source" value="Stereo1 DAC Mixer" />
+        <ctl name="HPOL Playback Switch" value="1" />
+        <ctl name="HPOR Playback Switch" value="1" />
+        <path name="mfg-playback headphones" />
+    </path>
+
+    <path name="speaker-all">
+        <ctl name="Main AMP Enable Switch" value="1" />
+        <ctl name="PCM Source" value="ASP" />
+        <ctl name="R Main AMP Enable Switch" value="1" />
+        <ctl name="R PCM Source" value="ASP" />
+        <path name="mfg-playback speaker" />
+    </path>
+
+    <path name="us-speaker-all">
+        <path name="us-mfg-playback speaker" />
+        <ctl name="PCM Source" value="ASP" />
+        <ctl name="Main AMP Enable Switch" value="1" />
+        <ctl name="R PCM Source" value="ASP" />
+        <ctl name="R Main AMP Enable Switch" value="1" />
+    </path>
+
+    <path name="loopback-mic-speaker">
+        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
+        <ctl name="SINK_IDS" id="0" value="0" />
+        <ctl name="SINK_IDS" id="1" value="-1" />
+        <path name="mfg-playback" />
+    </path>
+
+    <path name="loopback-mic-headphones">
+        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
+        <ctl name="SINK_IDS" id="0" value="1" />
+        <ctl name="SINK_IDS" id="1" value="-1" />
+        <path name="mfg-playback" />
+    </path>
+
+    <path name="loopback-mic-usb-headphones">
+        <ctl name="MIC HW Gain At Lower Power Mode (cB)" value="-160" />
+        <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
+        <ctl name="TDM_0_TX Format" value="S32_LE" />
+        <ctl name="TDM_0_TX Chan" value="One" />
+        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
+    </path>
+
+    <path name="loopback-usb-mic-speaker">
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    </path>
+
+    <path name="loopback-usb-mic-usb-headphone">
+        <ctl name="Audio Capture Mic Source" value='USB_MIC' />
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    </path>
+
+    <pcm_id name="loopback-mic1" value="EP1 capture (*)"/>
+    <pcm_id name="loopback-mic2" value="EP1 capture (*)"/>
+    <pcm_id name="loopback-mic3" value="EP1 capture (*)"/>
+    <pcm_id name="loopback-mic4" value="EP1 capture (*)"/>
+    <pcm_id name="loopback-speaker1" value="EP3 playback (*)"/>
+    <pcm_id name="loopback-speaker2" value="EP3 playback (*)"/>
+    <pcm_id name="loopback-speaker3" value="EP3 playback (*)"/>
+    <pcm_id name="loopback-headphones" value="EP3 playback (*)"/>
+    <pcm_id name="loopback-usb-headphones" value="EP3 playback (*)"/>
+    <pcm_id name="loopback-usb-mic" value="EP1 capture (*)"/>
+    <pcm_id name="loopback-amp_iv" value="nohost1 capture (*)"/>
+</mixer>

audio/lynx/cs35l41/crus_sp_cal_mixer_paths.xml

@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.    -->
+<!--                                                                        -->
+<!-- Redistribution and use in source and binary forms, with or without     -->
+<!-- modification, are permitted provided that the following conditions are -->
+<!-- met:                                                                   -->
+<!--     * Redistributions of source code must retain the above copyright   -->
+<!--       notice, this list of conditions and the following disclaimer.    -->
+<!--     * Redistributions in binary form must reproduce the above          -->
+<!--       copyright notice, this list of conditions and the following      -->
+<!--       disclaimer in the documentation and/or other materials provided  -->
+<!--       with the distribution.                                           -->
+<!--     * Neither the name of The Linux Foundation nor the names of its    -->
+<!--       contributors may be used to endorse or promote products derived  -->
+<!--       from this software without specific prior written permission.    -->
+<!--                                                                        -->
+<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED           -->
+<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF   -->
+<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
+<!-- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
+<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
+<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF   -->
+<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR        -->
+<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  -->
+<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
+<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->
+<mixer>
+    <!-- Initial Values -->
+    <!-- Preload Stage -->
+    <ctl name="Main AMP Enable Switch" value="0" />
+    <ctl name="DSP1 Preload Switch" value="0" />
+    <ctl name="R Main AMP Enable Switch" value="0" />
+    <ctl name="R DSP1 Preload Switch" value="0" />
+    <!-- Clock-trigger Stage -->
+    <ctl name="SINK_IDS" id="0" value="-1"/>
+    <ctl name="SINK_IDS" id="1" value="-1"/>
+    <ctl name="PCM Playback Volume" value="10"/>
+    <ctl name="TDM_0_RX Mixer EP6" value="0"/>
+
+    <!-- Preparation Stage -->
+    <path name="crus-switch-fw-prepare">
+        <ctl name="DRE DRE Switch" value="1" />
+        <ctl name="VBSTMON Output Switch" value="1" />
+        <ctl name="DSP Booted" value="0" />
+        <ctl name="DSP1 Preload Switch" value="0" />
+        <ctl name="R DRE DRE Switch" value="1" />
+        <ctl name="R VBSTMON Output Switch" value="1" />
+        <ctl name="R DSP Booted" value="0" />
+        <ctl name="R DSP1 Preload Switch" value="0" />
+    </path>
+
+    <!-- Preload Stage -->
+    <path name="crus-fw-preload">
+        <ctl name="DSP1 Preload Switch" value="1" />
+        <ctl name="R DSP1 Preload Switch" value="1" />
+    </path>
+
+    <!-- Firmware-switching Stage -->
+    <path name="crus-switch-fw-Calibration">
+        <ctl name="AMP PCM Gain" value="17" />
+        <ctl name="Digital PCM Volume" value="817" />
+        <ctl name="PCM Source" value="DSP" />
+        <ctl name="DSP1 Firmware" value="Calibration" />
+        <ctl name="R AMP PCM Gain" value="17" />
+        <ctl name="R Digital PCM Volume" value="817" />
+        <ctl name="R PCM Source" value="DSP" />
+        <ctl name="R DSP1 Firmware" value="Calibration" />
+    </path>
+
+    <path name="crus-switch-fw-Diagnostic">
+        <ctl name="AMP PCM Gain" value="17" />
+        <ctl name="Digital PCM Volume" value="817" />
+        <ctl name="PCM Source" value="DSP" />
+        <ctl name="DSP1 Firmware" value="Diagnostic" />
+        <ctl name="R AMP PCM Gain" value="17" />
+        <ctl name="R Digital PCM Volume" value="817" />
+        <ctl name="R PCM Source" value="DSP" />
+        <ctl name="R DSP1 Firmware" value="Diagnostic" />
+    </path>
+
+    <path name="crus-switch-fw-Protection">
+        <ctl name="PCM Source" value="DSP" />
+        <ctl name="DSP1 Firmware" value="Protection" />
+        <ctl name="R PCM Source" value="DSP" />
+        <ctl name="R DSP1 Firmware" value="Protection" />
+    </path>
+
+    <!-- DSP-initialization Stage -->
+    <path name="crus-dsp-pre-calibration-amp1">
+        <ctl name="Main AMP Enable Switch" value="1" />
+    </path>
+
+    <path name="crus-dsp-pre-calibration-amp2">
+        <ctl name="R Main AMP Enable Switch" value="1" />
+    </path>
+
+    <path name="crus-dsp-pre-calibration">
+        <path name="crus-dsp-pre-calibration-amp1" />
+        <path name="crus-dsp-pre-calibration-amp2" />
+    </path>
+
+    <path name="crus-dsp-pre-diagnostic-amp1">
+        <ctl name="Main AMP Enable Switch" value="1" />
+    </path>
+
+    <path name="crus-dsp-pre-diagnostic-amp2">
+        <ctl name="R Main AMP Enable Switch" value="1" />
+    </path>
+
+    <path name="crus-dsp-pre-diagnostic">
+        <path name="crus-dsp-pre-diagnostic-amp1" />
+        <path name="crus-dsp-pre-diagnostic-amp2" />
+    </path>
+
+    <path name="crus-dsp-pre-protection">
+        <ctl name="Main AMP Enable Switch" value="1" />
+        <ctl name="R Main AMP Enable Switch" value="1" />
+    </path>
+
+    <!-- Clock-trigger Stage -->
+    <path name="platform-controls">
+        <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="SINK_IDS" id="0" value="0"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="TDM_0_RX Mixer EP6" value="1"/>
+    </path>
+
+    <!-- Post loaded firmware -->
+    <path name="crus-dsp-post-loading-fw">
+        <ctl name="Main AMP Enable Switch" value="0" />
+        <ctl name="R Main AMP Enable Switch" value="0" />
+    </path>
+
+    <!-- Value & Information Fetch Stage -->
+    <path name="platform-values">
+        <ctl name="TDM_0_RX Format" />
+        <ctl name="TDM_0_RX Chan" />
+        <ctl name="TDM_0_RX Sample Rate" />
+        <ctl name="PCM Playback Volume" />
+        <ctl name="TDM_0_RX Mixer EP6" />
+    </path>
+
+    <path name="cs35l41-values">
+        <ctl name="DRE DRE Switch" />
+        <ctl name="R DRE DRE Switch" />
+        <ctl name="VBSTMON Output Switch" />
+        <ctl name="R VBSTMON Output Switch" />
+        <ctl name="AMP PCM Gain" />
+        <ctl name="R AMP PCM Gain" />
+        <ctl name="Digital PCM Volume" />
+        <ctl name="R Digital PCM Volume" />
+        <ctl name="PCM Source" />
+        <ctl name="R PCM Source" />
+        <ctl name="DSP Booted" />
+        <ctl name="R DSP Booted" />
+        <ctl name="Main AMP Enable Switch" />
+        <ctl name="R Main AMP Enable Switch" />
+        <ctl name="DSP1 Preload Switch" />
+        <ctl name="R DSP1 Preload Switch" />
+        <ctl name="DSP1 Firmware" />
+        <ctl name="R DSP1 Firmware" />
+    </path>
+
+
+    <!-- Note that the order of controls does matter because
+         it should be matched to the structure defined in
+         sp_cal_common.h -->
+    <!--
+        struct calibration_data {
+            unsigned int cal_r;
+            unsigned int cal_status;
+            unsigned int cal_checksum;
+            unsigned int cal_ambient;
+            unsigned int amp_pcm_gain;
+            unsigned int digital_pcm_gain;
+        };
+    -->
+    <path name="cs35l41-dsp-amp1-calibration-values">
+        <ctl name="DSP1 Calibration cd CAL_R" />
+        <ctl name="DSP1 Calibration cd CAL_STATUS" />
+        <ctl name="DSP1 Calibration cd CAL_CHECKSUM" />
+        <ctl name="DSP1 Calibration cd CAL_AMBIENT" />
+        <ctl name="AMP PCM Gain" />
+        <ctl name="Digital PCM Volume" />
+
+        <!-- Only for debug print -->
+        <ctl name="DSP1 Calibration cd CAL_SET_STATUS" />
+    </path>
+
+    <path name="cs35l41-dsp-amp2-calibration-values">
+        <ctl name="R DSP1 Calibration cd CAL_R" />
+        <ctl name="R DSP1 Calibration cd CAL_STATUS" />
+        <ctl name="R DSP1 Calibration cd CAL_CHECKSUM" />
+        <ctl name="R DSP1 Calibration cd CAL_AMBIENT" />
+        <ctl name="R AMP PCM Gain" />
+        <ctl name="R Digital PCM Volume" />
+
+        <!-- Only for debug print -->
+        <ctl name="R DSP1 Calibration cd CAL_SET_STATUS" />
+    </path>
+
+    <!--
+        struct diagnostic_data {
+            struct calibration_data calibration_data;
+            unsigned int z_low_diff;
+            unsigned int diag_f0;
+            unsigned int diag_f0_status;
+        };
+    -->
+    <path name="cs35l41-dsp-amp1-diagnostic-values">
+        <!-- struct calibration_data START -->
+        <ctl name="DSP1 Diagnostic cd CAL_R" />
+        <ctl name="DSP1 Diagnostic cd CAL_STATUS" />
+        <ctl name="DSP1 Diagnostic cd CAL_CHECKSUM" />
+        <ctl name="DSP1 Diagnostic cd CAL_AMBIENT" />
+        <ctl name="AMP PCM Gain" />
+        <ctl name="Digital PCM Volume" />
+        <!-- struct calibration_data END -->
+        <ctl name="DSP1 Diagnostic cd DIAG_Z_LOW_DIFF" />
+        <ctl name="DSP1 Diagnostic cd DIAG_F0" />
+        <ctl name="DSP1 Diagnostic cd DIAG_F0_STATUS" />
+
+        <!-- Only for debug print -->
+        <ctl name="DSP1 Diagnostic cd CAL_SET_STATUS" />
+    </path>
+
+    <path name="cs35l41-dsp-amp2-diagnostic-values">
+        <!-- struct calibration_data START -->
+        <ctl name="R DSP1 Diagnostic cd CAL_R" />
+        <ctl name="R DSP1 Diagnostic cd CAL_STATUS" />
+        <ctl name="R DSP1 Diagnostic cd CAL_CHECKSUM" />
+        <ctl name="R DSP1 Diagnostic cd CAL_AMBIENT" />
+        <ctl name="R AMP PCM Gain" />
+        <ctl name="R Digital PCM Volume" />
+        <!-- struct calibration_data END -->
+        <ctl name="R DSP1 Diagnostic cd DIAG_Z_LOW_DIFF" />
+        <ctl name="R DSP1 Diagnostic cd DIAG_F0" />
+        <ctl name="R DSP1 Diagnostic cd DIAG_F0_STATUS" />
+
+        <!-- Only for debug print -->
+        <ctl name="R DSP1 Diagnostic cd CAL_SET_STATUS" />
+    </path>
+
+    <path name="cs35l41-dsp-amp1-protection-values">
+        <!-- struct calibration_data START -->
+        <ctl name="DSP1 Protection cd CAL_R" />
+        <ctl name="DSP1 Protection cd CAL_STATUS" />
+        <ctl name="DSP1 Protection cd CAL_CHECKSUM" />
+        <ctl name="DSP1 Protection cd CAL_AMBIENT" />
+
+        <!-- These controls are unrelated so we can simply
+             skip them
+        <ctl name="AMP PCM Gain" />
+        <ctl name="Digital PCM Volume" />
+        -->
+        <!-- struct calibration_data END -->
+    </path>
+
+    <path name="cs35l41-dsp-amp2-protection-values">
+        <!-- struct calibration_data START -->
+        <ctl name="R DSP1 Protection cd CAL_R" />
+        <ctl name="R DSP1 Protection cd CAL_STATUS" />
+        <ctl name="R DSP1 Protection cd CAL_CHECKSUM" />
+        <ctl name="R DSP1 Protection cd CAL_AMBIENT" />
+
+        <!-- These controls are unrelated so we can simply
+             skip them
+        <ctl name="R AMP PCM Gain" />
+        <ctl name="R Digital PCM Volume" />
+        -->
+        <!-- struct calibration_data END -->
+    </path>
+
+    <path name="cs35l41-dsp-amp1-calibration-completion">
+        <ctl name="DSP1 Calibration cd CAL_STATUS" />
+    </path>
+
+    <path name="cs35l41-dsp-amp2-calibration-completion">
+        <ctl name="R DSP1 Calibration cd CAL_STATUS" />
+    </path>
+
+    <path name="cs35l41-dsp-amp1-protection-completion">
+        <ctl name="DSP1 Protection cd CAL_SET_STATUS" />
+    </path>
+
+    <path name="cs35l41-dsp-amp2-protection-completion">
+        <ctl name="R DSP1 Protection cd CAL_SET_STATUS" />
+    </path>
+
+    <path name="cs35l41-dsp-amp1-diagnostic-completion">
+        <ctl name="DSP1 Diagnostic cd CAL_STATUS" />
+        <ctl name="DSP1 Diagnostic cd DIAG_F0_STATUS" />
+    </path>
+
+    <path name="cs35l41-dsp-amp2-diagnostic-completion">
+        <ctl name="R DSP1 Diagnostic cd CAL_STATUS" />
+        <ctl name="R DSP1 Diagnostic cd DIAG_F0_STATUS" />
+    </path>
+
+    <path name="cs35l41-dsp-amp1-enable-status">
+        <ctl name="Main AMP Enable Switch" />
+    </path>
+
+    <path name="cs35l41-dsp-amp2-enable-status">
+        <ctl name="R Main AMP Enable Switch" />
+    </path>
+</mixer>

audio/lynx/factory-audio-tables.mk

@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2021 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+AUDIO_FACTORY_TABLE_FOLDER := lynx
+
+# Mixer Path Configuration for Audio Factory
+PRODUCT_COPY_FILES += \
+    device/google/lynx/audio/$(AUDIO_FACTORY_TABLE_FOLDER)/config/mixer_paths_factory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_factory.xml
+

audio/lynx/tuning/bluenote/template.xml

@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+  <modules>
+    <module id="2" name="Waves">
+      <param id="0" max="3" name="opMode_" type="uint32"/>
+    </module>
+    <module id="3" name="Forte">
+      <param id="0" max="3" name="opMode_" type="uint32"/>
+    </module>
+    <module id="5" name="Auto Gain Control">
+      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
+      <param default="48000" id="1" name="fs_" type="uint32"/>
+      <param default="1" id="2" name="numCh_" type="uint32"/>
+      <param default="1" id="3" name="chMask_" type="uint32"/>
+      <param id="16" name="GainApplied" type="float"/>
+      <param id="17" name="idealRMS" type="float"/>
+      <param id="18" name="noiseGate" type="float"/>
+      <param id="19" name="minGain" type="float"/>
+      <param id="20" name="maxGain" type="float"/>
+      <param id="21" name="longGainAtRt" type="uint32"/>
+      <param id="22" name="GainAtRt" type="uint32"/>
+      <param id="23" name="rmsTav" type="uint32"/>
+    </module>
+    <module id="6" name="Surround Record">
+      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
+      <param default="48000" id="1" name="fs_" type="uint32"/>
+      <param default="3" id="2" name="numCh_" type="uint32"/>
+      <param default="7" id="3" name="chMask_" type="uint32"/>
+      <param id="16" max="1" min="0" name="alpha" type="float"/>
+      <param complex="true" id="17" name="ch0_profileL" size="1024" type="float"/>
+      <param complex="true" id="18" name="ch1_profileL" size="1024" type="float"/>
+      <param complex="true" id="19" name="ch2_profileL" size="1024" type="float"/>
+      <param complex="true" id="20" name="ch0_profileR" size="1024" type="float"/>
+      <param complex="true" id="21" name="ch1_profileR" size="1024" type="float"/>
+      <param complex="true" id="22" name="ch2_profileR" size="1024" type="float"/>
+      <param complex="true" id="23" name="ch0_profileAZ" size="1024" type="float"/>
+      <param complex="true" id="24" name="ch1_profileAZ" size="1024" type="float"/>
+      <param complex="true" id="25" name="ch2_profileAZ" size="1024" type="float"/>
+      <struct id="26">
+        <param default="1" name="ch_gain" type="float"/>
+        <param default="1" name="zoom_gain" type="float"/>
+      </struct>
+      <param default="0" id="27" name="ch0_assignFrom" type="int32"/>
+      <param default="1" id="28" name="ch1_assignFrom" type="int32"/>
+      <param default="2" id="29" name="ch2_assignFrom" type="int32"/>
+    </module>
+    <module id="7" name="Multi Channel IIR 2">
+      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
+      <param default="48000" id="1" name="fs_" type="uint32"/>
+      <param default="3" id="2" name="numCh_" type="uint32"/>
+      <param default="1" id="3" name="chMask_" type="uint32"/>
+      <param default="3" id="16" max="3" min="1" name="numOfChannel" type="uint32"/>
+      <param id="17" name="coeff" size="300" type="float"/>
+      <struct id="18">
+        <param max="18" min="-96" name="gain" size="60" type="float"/>
+        <param max="24000" min="0" name="frequency" size="60" type="uint32"/>
+        <param max="200" min="0" name="qfactor" size="60" type="float"/>
+        <param default="4" name="type" size="60" type="int32"/>
+      </struct>
+    </module>
+    <module id="8" name="Multi Band DRC">
+      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
+      <param default="48000" id="1" name="fs_" type="uint32"/>
+      <param default="2" id="2" name="numCh_" type="uint32"/>
+      <param default="3" id="3" name="chMask_" type="uint32"/>
+      <struct id="16">
+        <param default="1" max="3" min="1" name="numBand" type="uint32"/>
+        <param name="IIR_LowPass1" size="5" type="float"/>
+        <param name="IIR_HighPass1" size="5" type="float"/>
+        <param name="IIR_LowPass2" size="5" type="float"/>
+        <param name="IIR_HighPass2" size="5" type="float"/>
+      </struct>
+      <struct id="17">
+        <param max="20" min="0" name="band0_delay_ms" type="float"/>
+        <param default="5" max="20" min="0" minInclusive="false" name="band0_rms_ms" type="float"/>
+        <param max="30" min="0" name="band0_gain_dB" type="float"/>
+        <param max="30" min="-30" name="band0_Min_Gain_dB" type="float"/>
+        <param default="1" max="3" min="1" name="band0_numOfKnee" type="uint32"/>
+        <param name="band0_threadhold_dB" size="3" type="float"/>
+        <param name="band0_compressRatio" size="4" type="float"/>
+        <param name="band0_kneeWidth" size="3" type="float"/>
+        <param name="band0_attackTime_ms" size="4" type="float"/>
+        <param name="band0_releaseTime_ms" size="4" type="float"/>
+        <param name="band0_hysteresis" size="4" type="float"/>
+        <param max="20" min="0" name="band1_delay_ms" type="float"/>
+        <param default="5" max="20" min="0" minInclusive="false" name="band1_rms_ms" type="float"/>
+        <param max="30" min="0" name="band1_gain_dB" type="float"/>
+        <param max="30" min="-30" name="band1_Min_Gain_dB" type="float"/>
+        <param default="1" max="3" min="1" name="band1_numOfKnee" type="uint32"/>
+        <param name="band1_threadhold_dB" size="3" type="float"/>
+        <param name="band1_compressRatio" size="4" type="float"/>
+        <param name="band1_kneeWidth" size="3" type="float"/>
+        <param name="band1_attackTime_ms" size="4" type="float"/>
+        <param name="band1_releaseTime_ms" size="4" type="float"/>
+        <param name="band1_hysteresis" size="4" type="float"/>
+        <param max="20" min="0" name="band2_delay_ms" type="float"/>
+        <param default="5" max="20" min="0" minInclusive="false" name="band2_rms_ms" type="float"/>
+        <param max="30" min="0" name="band2_gain_dB" type="float"/>
+        <param max="30" min="-30" name="band2_Min_Gain_dB" type="float"/>
+        <param default="1" max="3" min="1" name="band2_numOfKnee" type="uint32"/>
+        <param name="band2_threadhold_dB" size="3" type="float"/>
+        <param name="band2_compressRatio" size="4" type="float"/>
+        <param name="band2_kneeWidth" size="3" type="float"/>
+        <param name="band2_attackTime_ms" size="4" type="float"/>
+        <param name="band2_releaseTime_ms" size="4" type="float"/>
+        <param name="band2_hysteresis" size="4" type="float"/>
+      </struct>
+      <struct id="18">
+        <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
+        <param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
+        <param max="100" min="0" name="limiter_attackTime_ms" type="float"/>
+        <param max="100" min="0" name="limiter_releaseTime_ms" type="float"/>
+      </struct>
+      <struct id="19">
+        <param name="frequency0" type="uint32"/>
+        <param name="frequency1" type="uint32"/>
+      </struct>
+    </module>
+    <module id="11" name="Stationary Noise Suppression">
+      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
+      <param default="48000" id="1" name="fs_" type="uint32"/>
+      <param default="2" id="2" name="numCh_" type="uint32"/>
+      <param default="3" id="3" name="chMask_" type="uint32"/>
+      <param default="1" id="16" name="strength level" type="uint32"/>
+      <param id="17" name="POWER_TIME_SMOOTH" type="float"/>
+      <param id="18" name="RMS_TIME_SMOOTH" type="float"/>
+      <param id="19" name="LOWER_BAND_THRESHOLD" size="129" type="float"/>
+      <param id="20" name="UPPER_BAND_THRESHOLD" size="3" type="float"/>
+      <param id="21" name="ATTACK_TIME" type="float"/>
+      <param id="22" name="RELEASE_TIME" type="float"/>
+    </module>
+    <module id="14" name="Linear Gain">
+      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
+      <param default="48000" id="1" name="fs_" type="uint32"/>
+      <param default="1" id="2" name="numCh_" type="uint32"/>
+      <param default="1" id="3" name="chMask_" type="uint32"/>
+      <param id="16" name="Simple_gain" type="float"/>
+      <param default="0" id="17" name="ch0_assignFrom" type="int32"/>
+      <param default="1" id="18" name="ch1_assignFrom" type="int32"/>
+      <param default="2" id="19" name="ch2_assignFrom" type="int32"/>
+    </module>
+    <module id="17" name="Wind Noise Reduction">
+      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
+      <param default="48000" id="1" name="fs_" type="uint32"/>
+      <param default="2" id="2" name="numCh_" type="uint32"/>
+      <param default="3" id="3" name="chMask_" type="uint32"/>
+      <param default="450" id="16" name="DECISION_SMOOTHING_FACTOR" type="int32"/>
+      <param default="50" id="17" name="DECISION_ATTACK_SMOOTHING_FACTOR" type="int32"/>
+      <param default="50" id="18" name="DECISION_RELEASE_HIGH_SMOOTHING_FACTOR" type="int32"/>
+      <param default="50" id="19" name="DECISION_RELEASE_LOW_SMOOTHING_FACTOR" type="int32"/>
+      <param default="700" id="20" name="DECISION_RELEASE_THRESHOLD" type="int32"/>
+      <param default="0" id="21" name="DECISION_RANGE_OFFSET_FACTOR" type="int32"/>
+      <param default="1000" id="22" name="DECISION_RANGE_SLOPE_FACTOR" type="int32"/>
+      <param default="450" id="23" name="DECISION_GAIN_SMOOTHING_FACTOR" type="int32"/>
+      <param default="27" id="24" name="DECISION_DB_RANGE" type="int32"/>
+      <param default="1000" id="25" name="MASTER_REDUCTION_FACTOR" type="int32"/>
+      <param default="15" id="26" name="KEEP_NUM_OF_PREV_DECISIONS" type="int32"/>
+      <param default="1000" id="27" name="DEC_PRE_GAIN" type="int32"/>
+      <param default="16000" id="28" name="SUP_PRE_GAIN" type="int32"/>
+      <param default="2" id="29" name="COHERENCE_ENABLE" type="int32"/>
+      <param default="1" id="30" name="COHERENCE_START_BIN" type="int32"/>
+      <param default="10" id="31" name="COHERENCE_END_BIN" type="int32"/>
+      <param default="300" id="32" name="COHERENCE_THRESHOLD" type="int32"/>
+      <param default="990" id="33" name="COHERENCE_FORGETTING_FACTOR" type="int32"/>
+      <param default="0" id="34" name="DB_SCALING_FACTOR" type="int32"/>
+      <param default="9" id="35" name="SEP_LAYER" type="int32"/>
+      <param default="1" id="36" name="SP_GAIN_ENABLE" type="int32"/>
+      <param default="15" id="37" name="SP_GAIN_MAX_BIN" type="int32"/>
+      <param default="500" id="38" name="SP_GAIN_MIN" type="int32"/>
+      <param default="200" id="39" name="SP_GAIN_TH_MIN" type="int32"/>
+      <param default="450" id="40" name="SP_GAIN_TH_MAX" type="int32"/>
+      <param default="800" id="41" name="SP_GAIN_SMOOTH" type="int32"/>
+      <param default="3" id="42" name="SP_GAIN_FREQ_SMOOTH" type="int32"/>
+      <param default="300" id="43" name="MASTER_MAX_SUP_SMOOTHING_FACTOR" type="int32"/>
+      <param default="1" id="44" name="GAIN_FREQ_SMOOTH" type="int32"/>
+      <param default="2" id="45" name="GMIN_CURVE_TYPE" type="int32"/>
+      <param default="55" id="46" name="GMIN_LINEAR_SPLIT_MID_POINT_BINR" type="int32"/>
+      <param default="330" id="47" name="GMIN_LINEAR_SPLIT_MID_POINT_VAL" type="int32"/>
+      <param default="1000" id="48" name="SP_OVERSUB_RATIO" type="int32"/>
+      <param default="16" id="49" name="WIND_ENERGY_EST_COMPENSATION_GAIN" type="int32"/>
+      <param default="2000" id="50" name="WIND_ENERGY_CURVE_SLOPE" type="int32"/>
+      <param default="300" id="51" name="WIND_ENERGY_CURVE_OFFSET" type="int32"/>
+      <param default="16000" id="52" name="WIND_ENERGY_CURVE_MIN" type="int32"/>
+      <param default="16000" id="53" name="WIND_ENERGY_CURVE_MAX" type="int32"/>
+      <param default="900" id="54" name="WIND_ENERGY_SMOOTHING" type="int32"/>
+      <param default="144" id="55" name="WIND_ENERGY_NORM_DENOM" type="int32"/>
+      <param default="600" id="56" name="WIND_ENERGY_CURVE_SCALED_TH_MIN" type="int32"/>
+      <param default="900" id="57" name="WIND_ENERGY_CURVE_SCALED_TH_MAX" type="int32"/>
+      <param default="1" id="58" name="ENABLE_ML_COMBI_WIND_ENERGY" type="int32"/>
+      <param default="1" id="59" name="ENABLE_SP_COMBI_WIND_ENERGY" type="int32"/>
+      <param default="1" id="60" name="ENALBE_SP_COMBI_OVERSUBTRACTION" type="int32"/>
+      <param default="1" id="61" name="ENABLE_PRIORI_SNR" type="int32"/>
+      <param default="1000" id="62" name="PRIORI_SNR_ML_TUNING" type="int32"/>
+      <param default="15" id="63" name="DEC_PREV_NUM" type="int32"/>
+      <param default="1" id="64" name="SSC_ENABLE" type="int32"/>
+      <param default="930" id="65" name="SSC_SOFT_SMOOTHING_FACTOR" type="int32"/>
+      <param default="1600" id="66" name="SSC_OVERDRIVE" type="int32"/>
+      <param default="3" id="67" name="SSC_MIN_FREQ" type="int32"/>
+      <param default="130" id="68" name="SSC_MAX_FREQ" type="int32"/>
+      <param default="700" id="69" name="SSC_PSD_SMOOTHING_FACTOR" type="int32"/>
+      <param default="12" id="70" name="SSC_SOFT_DECISION_MIN_FREQ" type="int32"/>
+      <param default="450" id="71" name="SSC_SOFT_DECISION_MAX_FREQ" type="int32"/>
+      <param default="5" id="72" name="SSC_KEEP_SAVED_PROB_SMOOTH_SIZE" type="int32"/>
+      <param default="1000" id="73" name="GAIN_BOOSTING_COST" type="int32"/>
+    </module>
+    <module id="18" name="Multi Channel IIR 1">
+      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
+      <param default="48000" id="1" name="fs_" type="uint32"/>
+      <param default="2" id="2" name="numCh_" type="uint32"/>
+      <param default="3" id="3" name="chMask_" type="uint32"/>
+      <param default="3" id="16" max="3" min="1" name="numOfChannel" type="uint32"/>
+      <param id="17" name="coeff" size="300" type="float"/>
+      <struct id="18">
+        <param max="18" min="-96" name="gain" size="60" type="float"/>
+        <param max="24000" min="0" name="frequency" size="60" type="uint32"/>
+        <param max="200" min="0" name="qfactor" size="60" type="float"/>
+        <param default="4" name="type" size="60" type="int32"/>
+      </struct>
+    </module>
+    <module id="32" name="Single Band DRC">
+      <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
+      <param default="48000" id="1" name="fs_" type="uint32"/>
+      <param default="2" id="2" name="numCh_" type="uint32"/>
+      <param default="3" id="3" name="chMask_" type="uint32"/>
+      <struct id="16">
+        <param max="20" min="0" name="delay_ms" type="float"/>
+        <param default="5" max="20" min="0" minInclusive="false" name="rms_ms" type="float"/>
+        <param max="30" min="0" name="gain_dB" type="float"/>
+        <param max="30" min="-30" name="Min_Gain_dB" type="float"/>
+        <param default="1" max="3" min="1" name="numOfKnee" type="uint32"/>
+        <param name="threadhold_dB" size="3" type="float"/>
+        <param name="compressRatio" size="4" type="float"/>
+        <param name="kneeWidth" size="3" type="float"/>
+        <param name="attackTime_ms" size="4" type="float"/>
+        <param name="releaseTime_ms" size="4" type="float"/>
+        <param name="hysteresis" size="4" type="float"/>
+      </struct>
+      <struct id="17">
+        <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
+        <param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
+        <param max="100" min="0" name="limiter_attackTime_ms" type="uint32"/>
+        <param max="100" min="0" name="limiter_releaseTime_ms" type="uint32"/>
+      </struct>
+    </module>
+    <module id="10000" name="Eraser">
+      <param id="275" name="eraser_pre_gain" type="uint32"/>
+      <param id="277" name="eraser_post_gain" type="uint32"/>
+      <param id="279" name="non_eraser_gain" type="uint32"/>
+    </module>
+    <module id="10001" name="Cleaner">
+      <param id="299" name="cleaner_post_gain" type="uint32"/>
+    </module>
+    <module id="10002" name="CHRE">
+      <param id="297" name="chre_gain" type="uint32"/>
+    </module>
+  </modules>
+  <signalflows>
+    <signalflow id="1" name="Spatial Audio">
+      <block id="128">
+        <moduleRef id="18"/>
+        <moduleRef id="17"/>
+      </block>
+      <block id="134">
+        <moduleRef id="14"/>
+        <moduleRef id="11"/>
+        <moduleRef id="6"/>
+        <moduleRef id="7"/>
+        <moduleRef id="5"/>
+        <moduleRef id="8"/>
+      </block>
+    </signalflow>
+    <signalflow id="2" name="General Mic Recording">
+      <block id="137">
+        <moduleRef id="14"/>
+        <moduleRef id="7"/>
+        <moduleRef id="8"/>
+      </block>
+    </signalflow>
+    <signalflow id="1000" name="Smart Feature">
+      <block id="0">
+        <moduleRef id="10000"/>
+        <moduleRef id="10001"/>
+        <moduleRef id="10002"/>
+      </block>
+    </signalflow>
+  </signalflows>
+</template>

bluetooth/qti_default.mk

@@ -23,17 +23,38 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \
-	ro.bluetooth.leaudio_switcher.supported=false \
-	bluetooth.profile.bap.unicast.client.enabled?=false \
-	bluetooth.profile.csip.set_coordinator.enabled?=false \
-	bluetooth.profile.hap.client.enabled?=false \
-	bluetooth.profile.mcp.server.enabled?=false \
-	bluetooth.profile.ccp.server.enabled?=false \
-	bluetooth.profile.vcp.controller.enabled?=false \
+	ro.bluetooth.leaudio_switcher.supported=true \
+	ro.bluetooth.leaudio_offload.supported=true \
+	persist.bluetooth.leaudio_offload.disabled=false \
+	ro.vendor.audio_hal.ble_use_stream_id=true \
+	bluetooth.profile.bap.unicast.client.enabled?=true \
+	bluetooth.profile.csip.set_coordinator.enabled?=true \
+	bluetooth.profile.hap.client.enabled?=true \
+	bluetooth.profile.mcp.server.enabled?=true \
+	bluetooth.profile.ccp.server.enabled?=true \
+	bluetooth.profile.vcp.controller.enabled?=true \
 
-# Bluetotoh Auto On feature
+# Bluetooth LE Audio CIS handover to SCO
+# Set the property only if the controller doesn't support CIS and SCO
+# simultaneously. More details in b/242908683.
 PRODUCT_PRODUCT_PROPERTIES += \
-	bluetooth.server.automatic_turn_on=true
+	persist.bluetooth.leaudio.notify.idle.during.call=true
+
+# Not support LE Audio dual mic SWB call based on the current launch strategy
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.leaudio.dual_bidirection_swb.supported=false
+
+# LE Audio Lunch Config for Phase 1 (LE audio toggle hidden by default)
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.leaudio.toggle_visible=false
+
+# LE Auido Offload Capabilities setting
+PRODUCT_COPY_FILES += \
+	device/google/lynx/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml
+
+# LE Audio use classic connection by default
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.bluetooth.leaudio.le_audio_connection_by_default=false
 
 # Bluetooth HAL and Pixel extension
 DEVICE_MANIFEST_FILE += \
@@ -84,6 +105,13 @@ PRODUCT_COPY_FILES += \
 	device/google/lynx/bluetooth/bluetooth_power_limits_Lynx_G0DZQ_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G0DZQ_JP.csv \
 	device/google/lynx/bluetooth/bluetooth_power_limits_Lynx_G82U8_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G82U8_JP.csv
 
+# Bluetooth SAR test tools
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter true, $(TARGET_USE_QTI_BT_SAR_V1_1) $(TARGET_USE_QTI_BT_SAR)))
+   PRODUCT_PACKAGES_DEBUG += bluetooth_sar_test
+endif
+endif
+
 # Bluetooth (Vendor) SoC, BDA in device tree, and WiPower
 PRODUCT_PROPERTY_OVERRIDES += \
 	vendor.qcom.bluetooth.soc=hastings \
@@ -91,6 +119,12 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.emb_wp_mode=false \
 	ro.vendor.bluetooth.wipower=false
 
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.vendor.service.bdroid.soclog=true \
+	persist.vendor.service.bdroid.fwsnoop=true
+else
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.service.bdroid.soclog=false \
 	persist.vendor.service.bdroid.fwsnoop=false
+endif

conf/init.lynx.rc

@@ -16,7 +16,7 @@ on early-boot
     wait_for_prop vendor.common.modules.ready 1
     start insmod_sh_lynx
 
-service insmod_sh_lynx /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.lynx.cfg
+service insmod_sh_lynx /vendor/bin/insmod.sh /vendor/etc/init.insmod.lynx.cfg
     class main
     user root
     group root system
@@ -102,12 +102,8 @@ on property:vendor.all.modules.ready=1
     chown system system /sys/bus/i2c/devices/8-0043/calibration/redc_stored
     chown system system /sys/bus/i2c/devices/8-0043/default/vibe_state
     chown system system /sys/bus/i2c/devices/8-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_bank
-    chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_index
-    chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_ms
     chown system system /sys/bus/i2c/devices/8-0043/default/f0_offset
     chown system system /sys/bus/i2c/devices/8-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/8-0043/default/owt_lib_compat
     chown system system /sys/bus/i2c/devices/8-0043/default/f0_comp_enable
     chown system system /sys/bus/i2c/devices/8-0043/default/redc_comp_enable
     chown system system /sys/bus/i2c/devices/8-0043/default/delay_before_stop_playback_us

device-evolution.mk

@@ -4,6 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-evolution
+# Overlays
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-evolution
 
+# Udfps
 TARGET_HAS_UDFPS += true

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 += \
@@ -21,33 +22,34 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     HbmSVManagerOverlayLynx
 
-# IWLAN
-PRODUCT_PACKAGES += \
-    Iwlan
+# Kernel
+TARGET_PREBUILT_KERNEL := device/google/lynx-kernel/Image.lz4
 
 # wireless_charger HAL service
 include device/google/gs-common/wireless_charger/wireless_charger.mk
 
 # Build necessary packages for vendor
 
-# Dumpstate
+# Codec2
 PRODUCT_PACKAGES += \
-    dump_gsc.sh
+    libacryl \
+    libacryl_hdr_plugin \
+    libexynosv4l2
 
 # Fingerprint
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
 
-# GNSS
-PRODUCT_PACKAGES += \
-    android.hardware.sensors-V2-ndk.vendor:64
-
 # Graphics
 PRODUCT_PACKAGES += \
     libEGL_angle \
     libGLESv1_CM_angle \
     libGLESv2_angle
 
+# Identity credential
+PRODUCT_PACKAGES += \
+    android.hardware.identity_credential.xml
+
 # Sensors
 PRODUCT_PACKAGES += \
     sensors.dynamic_sensor_hal
@@ -55,3 +57,6 @@ PRODUCT_PACKAGES += \
 # Wi-Fi
 PRODUCT_PACKAGES += \
     libwifi-hal-ctrl:64
+
+# Properties
+TARGET_VENDOR_PROP := $(LOCAL_PATH)/vendor.prop

device-lynx.mk

@@ -14,15 +14,31 @@
 # limitations under the License.
 #
 
-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_LYNX_VERSION)
-TARGET_KERNEL_DIR := device/google/lynx-kernels/evolution
-TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers
+TARGET_KERNEL_DIR ?= device/google/lynx-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/lynx-kernel/kernel-headers
+
+ifdef RELEASE_GOOGLE_LYNX_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_LYNX_KERNEL_VERSION)
+endif
+
+ifdef RELEASE_GOOGLE_LYNX_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_LYNX_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_LYNX_KERNEL_DIR)/kernel-headers
+endif
+
+$(call inherit-product-if-exists, vendor/google_devices/lynx/prebuilts/device-vendor-lynx.mk)
+$(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/lynx/device-vendor-lynx.mk)
+$(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/WallpapersLynx.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/lynx/lynx/overlay
 
 include device/google/lynx/audio/lynx/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
-include device/google/gs-common/touch/gti/predump_gti.mk
+include hardware/google/pixel/vibrator/cs40l26/device.mk
+include device/google/gs-common/touch/gti/gti.mk
 include device/google/gs-common/wlan/dump.mk
 
 # go/lyric-soong-variables
@@ -38,6 +54,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
         device/google/lynx/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.lynx.rc
 
+# insmod files
+PRODUCT_COPY_FILES += \
+	device/google/lynx/init.insmod.lynx.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.lynx.cfg
+
 # Camera
 PRODUCT_COPY_FILES += \
 	device/google/lynx/media_profiles_lynx.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
@@ -74,12 +94,6 @@ PRODUCT_PACKAGES += \
 	android.hardware.nfc-service.st \
 	NfcOverlayLynx
 
-# 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 \
@@ -141,11 +155,26 @@ include device/google/lynx/bluetooth/qti_default.mk
 # 	ro.hardware.keystore=software \
 # 	ro.hardware.gatekeeper=software
 
+# Fingerprint HAL
+GOODIX_CONFIG_BUILD_VERSION := g7_trusty
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q2
+else
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/trunk
+endif
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
+ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
+else
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk)
+endif
+
 # Vibrator HAL
-$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
-ACTUATOR_MODEL := legacy_zlra_actuator
 PRODUCT_VENDOR_PROPERTIES += \
+	ro.vendor.vibrator.hal.supported_primitives=243 \
 	ro.vendor.vibrator.hal.f0.comp.enabled=1 \
 	ro.vendor.vibrator.hal.redc.comp.enabled=0 \
 	persist.vendor.vibrator.hal.context.enable=false \
@@ -154,26 +183,31 @@ PRODUCT_VENDOR_PROPERTIES += \
 	persist.vendor.vibrator.hal.context.cooldowntime=1600 \
 	persist.vendor.vibrator.hal.context.settlingtime=5000
 
-# Override Output Distortion Gain
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.audio.hapticgenerator.distortion.output.gain=0.29
-
-# Location
-PRODUCT_COPY_FILES += \
-    device/google/lynx/location/lhd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-    device/google/lynx/location/scd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
-ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
-    PRODUCT_COPY_FILES += \
-        device/google/lynx/location/gps_user.6.1.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+# Trusty liboemcrypto.so
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q2
 else
-    PRODUCT_COPY_FILES += \
-        device/google/lynx/location/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/trunk
+endif
+
+# GPS xml
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+        PRODUCT_COPY_FILES += \
+                device/google/lynx/location/gps.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
+                device/google/lynx/location/lhd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+                device/google/lynx/location/scd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+else
+        PRODUCT_COPY_FILES += \
+                device/google/lynx/location/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
+                device/google/lynx/location/lhd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+                device/google/lynx/location/scd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 endif
 
 # Wifi HAL
-PRODUCT_SOONG_NAMESPACES += \
-    hardware/qcom/wlan \
-    hardware/qcom/wlan/wcn6740
+PRODUCT_SOONG_NAMESPACES += hardware/qcom/wlan/wcn6740
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -207,24 +241,6 @@ endif
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=$(TARGET_SVN)
 
-# Set device family property for SMR
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.build.device_family=P10C10L10
-
-# Set build properties for SMR builds
-ifeq ($(RELEASE_IS_SMR), true)
-    ifneq (,$(RELEASE_BASE_OS_LYNX))
-        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_LYNX)
-    endif
-endif
-
-# Set build properties for EMR builds
-ifeq ($(RELEASE_IS_EMR), true)
-    ifneq (,$(RELEASE_BASE_OS_LYNX))
-        PRODUCT_PROPERTY_OVERRIDES += \
-        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_LYNX)
-    endif
-endif
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_hide_display_cutout=true
@@ -236,7 +252,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Fingerprint als feed forward
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
-    persist.vendor.udfps.fps_touch_handler_supported=false \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
 # Hide cutout overlays
@@ -288,6 +303,12 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false
 
+# eng specific
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+    PRODUCT_COPY_FILES += \
+        device/google/gs201/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc
+endif
+
 # SKU specific RROs
 PRODUCT_PACKAGES += \
     SettingsOverlayG82U8 \
@@ -303,8 +324,3 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.quick_start.oem_id=00e0 \
     ro.quick_start.device_id=lynx
-
-# Bluetooth device id
-# Raven: 0x410B
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=16651

evolution.dependencies

@@ -4,13 +4,8 @@
     "target_path": "device/google/gs201"
   },
   {
-    "remote": "evo-tensor",
-    "repository": "device_google_lynx-kernels_evolution",
-    "target_path": "device/google/lynx-kernels/evolution"
-  },
-  {
-    "remote": "evo-tensor",
-    "repository": "vendor_google_lynx",
-    "target_path": "vendor/google/lynx"
+    "repository": "device/google/lynx-kernel",
+    "target_path": "device/google/lynx-kernel",
+    "remote": "aosp-lynx"
   }
 ]

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}/lynx"
-./extract-files.py $@
-popd

extract-files.sh

@@ -0,0 +1,151 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=lynx
+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
+    # lowi-server depends on libwpa_client, which is a gnu makefile target
+    set_disable_checkelf "vendor/bin/lowi-server" "${VENDOR_TXT}"
+    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"

factory-images/generate-factory-images-package.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Copyright 2023 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.
+
+source ../../../common/clear-factory-images-variables.sh
+BUILD=9456232
+DEVICE=lynx
+PRODUCT=lynx
+VERSION=td4a.221205.017
+SRCPREFIX=signed-
+BOOTLOADER=lynx-1.0-9450676
+RADIO=g5300n-221222-221226-b-9437664
+source ../../../common/generate-factory-images-common.sh

factory_lynx.mk

@@ -0,0 +1,40 @@
+#
+# Copyright 2021 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+TARGET_LINUX_KERNEL_VERSION := 5.10
+
+$(call inherit-product, device/google/gs201/factory_common.mk)
+$(call inherit-product, device/google/lynx/device-lynx.mk)
+include device/google/lynx/audio/lynx/factory-audio-tables.mk
+
+PRODUCT_NAME := factory_lynx
+PRODUCT_DEVICE := lynx
+PRODUCT_MODEL := Factory build on Lynx
+PRODUCT_BRAND := Android
+PRODUCT_MANUFACTURER := Google
+
+# default BDADDR for EVB only
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
+
+# Factory binaries of camera
+PRODUCT_PACKAGES += fatp_imx787_hat_tool
+
+# Factory binaries of wifi
+PRODUCT_PACKAGES += athdiag
+PRODUCT_PACKAGES += libdiag
+PRODUCT_PACKAGES += libtime_genoff
+PRODUCT_PACKAGES += cnss_diag

init.insmod.lynx.cfg

@@ -0,0 +1,18 @@
+##########################################################
+#           init.insmod.lynx.cfg                         #
+# This file contains lynx specific kernel modules        #
+# to load at init time by init.insmod.sh script          #
+##########################################################
+
+# Load device specific kernel modules
+# Modules here will be loaded *after* all common modules
+modprobe|snd-soc-cs35l41-spi.ko
+modprobe|goodix_brl_touch.ko
+modprobe|focal_touch.ko
+modprobe|cs40l26-i2c.ko
+modprobe|snd-soc-cs40l26.ko
+
+# All device specific modules loaded
+setprop|vendor.device.modules.ready
+setprop|vendor.all.modules.ready
+setprop|vendor.all.devices.ready

lineage_lynx.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 stuff
+# Inherit some common Evolution X stuff.
 TARGET_DISABLE_EPPE := true
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 # Inherit device configuration
-DEVICE_CODENAME := lynx
-DEVICE_PATH := device/google/lynx
-VENDOR_PATH := vendor/google/lynx
-$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
+$(call inherit-product, device/google/lynx/aosp_lynx.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/lynx/device-lineage.mk)
+$(call inherit-product, device/google/lynx/device-evolution.mk)
 
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 7a
-PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+PRODUCT_NAME := lineage_lynx
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 2400
 TARGET_SCREEN_WIDTH := 1080
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="lynx-user 16 BP2A.250805.005 13691446 release-keys" \
-    BuildFingerprint=google/lynx/lynx:16/BP2A.250805.005/13691446:user/release-keys \
-    DeviceProduct=$(DEVICE_CODENAME)
+    TARGET_PRODUCT=lynx \
+    PRIVATE_BUILD_DESC="lynx-user 14 AP2A.240905.003 12231197 release-keys"
 
-$(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)
+BUILD_FINGERPRINT := google/lynx/lynx:14/AP2A.240905.003/12231197:user/release-keys
+
+$(call inherit-product, vendor/google/lynx/lynx-vendor.mk)

location/gps.xml.l10

@@ -5,19 +5,20 @@
        BaudRate="921600"
        GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
        CustGpioDelayMs="250"
-       LogEnabled="false"
+       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="false"
+       SuplLogEnable="true"
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23"
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -34,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -48,24 +49,20 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
 
        AttributionAppPkgName="com.google.android.carrierlocation"
 
-       AssertEnabled="false"
+       AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
-       CpLppDisableUEAInLTE="true"
-       CpLppGalileoCapable="true"
-       CpLppGalileoIE="true"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
-       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
        SensorsMask="0x244"
        MaxThreadNum="13"
   />
@@ -73,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"
        MultiCarrLnaMask="L1_EXT_ON"
@@ -88,7 +85,7 @@
        RfPathLossDb_Cp="4"
        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="false"
+       EnableOnChipStopNotification="2"
        PowerMode="3"
        MinGpsWeekNumber="2216"
        OnChipAccMask="50"
@@ -98,11 +95,8 @@
   />
 
   <gll_features
-       EnableQzsAutoSwitch="false"
-       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />
 
 </glgps>
 
-

location/gps_user.xml.l10

@@ -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"
@@ -95,10 +94,7 @@
   />
 
   <gll_features
-       EnableQzsAutoSwitch="false"
-       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
-       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

location/lhd.conf.l10

@@ -0,0 +1,34 @@
+LheName=bbd
+
+LheRsmResetTimeoutMS=10000
+GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
+
+LhePatch=/vendor/firmware/SensorHub.patch
+Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
+LheConsole=/data/vendor/gps/LheConsole
+
+LogEnabled=true
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+
+LheBbdPacket=/dev/ttyBCM
+
+LheBbdControl=/dev/bbd_control
+
+# LheBbdSensor=/dev/bbd_sensor
+
+LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
+LogLevel=*:I
+
+NvStorageDir=/data/vendor/gps/
+
+# Enable BBD debugging at these stages:
+# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
+
+LheAutoBaudDelayMS=10
+TrafficLogEnabled=false
+SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
+
+SkipSensorWakeLock=true
+LoggerWakeLockEnable=false
+PpsEnable=true

location/scd.conf.l10

@@ -0,0 +1,6 @@
+LogEnabled=true
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+NvStorageDir=/data/vendor/gps/
+TcpConnectionTimeout=20
+SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf

lynx/Android.bp

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

lynx/BoardConfig.mk

@@ -18,9 +18,13 @@ TARGET_BOARD_INFO_FILE := device/google/lynx/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := lynx
 
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_LYNX_RADIO_DIR)
-RELEASE_GOOGLE_BOOTLOADER_LYNX_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_LYNX_DIR)
-$(call soong_config_set,lynx_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_LYNX_DIR))
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
+else
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
+endif
 
 ifdef PHONE_CAR_BOARD_PRODUCT
         include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
@@ -30,21 +34,17 @@ endif
 
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_LYNX := true
-$(call soong_config_set_bool,prebuilts_wlan,USES_DEVICE_GOOGLE_LYNX,$(USES_DEVICE_GOOGLE_LYNX))
 
 # 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
 
 include device/google/gs201/BoardConfig-common.mk
-include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
+-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
+-include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk
 include device/google/lynx/sepolicy/lynx-sepolicy.mk
 include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk
 
-DEVICE_PATH := device/google/lynx
-VENDOR_PATH := vendor/google/lynx
-include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
-include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
+include device/google/lynx/lynx/BoardConfigLineage.mk

lynx/BoardConfigEvolution.mk

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

lynx/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/lynx/BoardConfigLineage.mk
 
-include $(VENDOR_PATH)/BoardConfigVendor.mk
+include vendor/google/lynx/BoardConfigVendor.mk

lynx/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

lynx/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.lynx.touch.rc

lynx/extract-files.py

@@ -1,106 +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/lynx',
-    'hardware/google/av',
-    'hardware/google/interfaces',
-    'hardware/google/pixel',
-    'hardware/qcom/wlan/wcn6740',
-]
-
-
-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(
-    'lynx',
-    'google',
-    device_rel_path='device/google/lynx/lynx',
-    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()

lynx/init.recovery.touch.rc

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

lynx/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
-

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

@@ -23,8 +23,8 @@
     <dimen name="rounded_corner_radius_top">47px</dimen>
     <dimen name="rounded_corner_radius_bottom">48px</dimen>
 
-    <!-- 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">47px</dimen>
 
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.

lynx/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>

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

@@ -16,7 +16,7 @@
 */
 -->
 <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) -->
@@ -25,11 +25,15 @@
     <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
     <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
 
-    <!-- Margin on the left side of the carrier text on Keyguard -->
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</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>
 
-    <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
-    <dimen name="ongoing_appops_dot_min_padding">14dp</dimen>
+    <!-- Multi user switch has some intrinsic padding to it -->
+    <dimen name="multi_user_switch_keyguard_margin">6dp</dimen>
+
+    <dimen name="keyguard_carrier_text_margin">0px</dimen>
 
     <dimen name="config_rounded_mask_size">47px</dimen>
     <dimen name="config_rounded_mask_size_top">47px</dimen>

lynx/setup-makefiles.py

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

manifest.xml

@@ -0,0 +1,116 @@
+<manifest version="1.0" type="device" target-level="5">
+   <hal format="hidl">
+        <name>android.hardware.audio</name>
+        <transport>hwbinder</transport>
+        <version>7.0</version>
+        <interface>
+            <name>IDevicesFactory</name>
+            <instance>default</instance>
+        </interface>
+   </hal>
+   <hal format="hidl">
+        <name>android.hardware.audio.effect</name>
+        <transport>hwbinder</transport>
+        <version>7.0</version>
+        <interface>
+            <name>IEffectsFactory</name>
+            <instance>default</instance>
+        </interface>
+   </hal>
+   <hal format="hidl">
+        <name>android.hardware.soundtrigger</name>
+        <transport>hwbinder</transport>
+        <version>2.3</version>
+        <interface>
+            <name>ISoundTriggerHw</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.media.omx</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IOmx</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IOmxStore</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.graphics.allocator</name>
+        <transport>hwbinder</transport>
+        <version>4.0</version>
+        <interface>
+            <name>IAllocator</name>
+            <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>
+        <version>2.4</version>
+        <interface>
+            <name>IComposer</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.renderscript</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IDevice</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format = "hidl">
+        <name>android.hardware.dumpstate</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IDumpstateDevice</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.boot</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.2::IBootControl/default</fqname>
+    </hal>
+    <hal format="hidl">
+       <name>android.hardware.neuralnetworks</name>
+       <transport>hwbinder</transport>
+       <fqname>@1.3::IDevice/google-edgetpu</fqname>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.health</name>
+        <transport>hwbinder</transport>
+        <version>2.1</version>
+        <interface>
+            <name>IHealth</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+       <name>vendor.google.whitechapel.audio.audioext</name>
+       <transport>hwbinder</transport>
+       <version>4.0</version>
+       <interface>
+           <name>IAudioExt</name>
+           <instance>default</instance>
+       </interface>
+    </hal>
+    <kernel target-level="6"/>
+</manifest>

modules.blocklist.vendor_kernel_boot

@@ -1,3 +0,0 @@
-blocklist focal_touch.ko
-blocklist goodix_brl_touch.ko
-blocklist goog_touch_interface.ko

modules.load.vendor_kernel_boot

@@ -1,3 +0,0 @@
-extra/focal_touch.ko
-extra/goodix_brl_touch.ko
-extra/goog_touch_interface.ko

nfc/libnfc-hal-st-disable.conf

@@ -0,0 +1,152 @@
+########################### Start of libnf-hal-st_aosp.conf ###########################
+
+###############################################################################
+###############################################################################
+# ST HAL trace log level
+STNFC_HAL_LOGLEVEL=4
+NFC_DEBUG_ENABLED=1
+
+###############################################################################
+# Vendor specific mode to enable FW (RF & SWP) traces.
+STNFC_FW_DEBUG_ENABLED=0
+
+###############################################################################
+# File used for NFA storage
+NFA_STORAGE="/data/nfc"
+
+###############################################################################
+# Dev Node used for ST HAL
+ST_NFC_DEV_NODE="/dev/st_no_such_device"
+
+###############################################################################
+# Keep the nfa storage file.
+PRESERVE_STORAGE=1
+
+###############################################################################
+# In Switch OFF mode (phone switched-off), specify the desired CE mode to
+# the controller.
+# 0: No card-emulation; DEFAULT
+# 1: Switch-off card-emulation enabled
+CE_ON_SWITCH_OFF_STATE=1
+
+###############################################################################
+# Vendor specific mode to support the USB charging mode if VPSIO=1 in switch off.
+STNFC_USB_CHARGING_MODE=1
+
+###############################################################################
+# Vendor Specific Proprietary Protocol & Discovery Configuration
+# Set to 0xFF if unsupported
+#  byte[0] NCI_PROTOCOL_18092_ACTIVE
+#  byte[1] NCI_PROTOCOL_B_PRIME
+#  byte[2] NCI_PROTOCOL_DUAL
+#  byte[3] NCI_PROTOCOL_15693
+#  byte[4] NCI_PROTOCOL_KOVIO
+#  byte[5] NCI_PROTOCOL_MIFARE
+#  byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO
+#  byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME
+#  byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
+NFA_PROPRIETARY_CFG={05:FF:FF:06:8A:90:77:FF:FF}
+
+###############################################################################
+# Choose the presence-check algorithm for type-4 tag.  If not defined,
+# the default value is 1.
+# 0  NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm
+# 1  NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block
+# 2  NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate
+# 3  NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0
+# 4  NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3
+# 5  NFA_RW_PRES_CHK_ISO_DEP_NAK; presence check command ISO-DEP NAK as per NCI2.0
+PRESENCE_CHECK_ALGORITHM=5
+
+###############################################################################
+# Name of the NCI HAL module to use
+# If unset, falls back to nfc_nci.bcm2079x
+NCI_HAL_MODULE="nfc_nci.st21nfc"
+
+###############################################################################
+# White list to be set at startup.
+DEVICE_HOST_WHITE_LIST={02:C0}
+
+###############################################################################
+# BAIL OUT value for P2P
+# Implements algorithm for NFC-DEP protocol priority over ISO-DEP protocol.
+POLL_BAIL_OUT_MODE=1
+
+###############################################################################
+# Extended APDU length for ISO_DEP
+ISO_DEP_MAX_TRANSCEIVE=0xFEFF
+
+###############################################################################
+# Configure the NFC Extras to open and use a static pipe.  If the value is
+# not set or set to 0, then the default is use a dynamic pipe based on a
+# destination gate (see NFA_HCI_DEFAULT_DEST_GATE).  Note there is a value
+# for each EE (ESE/SIM)
+OFF_HOST_ESE_PIPE_ID=0x5E
+OFF_HOST_SIM_PIPE_ID=0x3E
+
+###############################################################################
+#Set the default Felica T3T System Code OffHost route Location :
+#This settings will be used when application does not set this parameter
+# host  0x00
+# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
+# UICC  0x81 (UICC_1), 0x85 (UICC_2)
+DEFAULT_SYS_CODE_ROUTE=0x86
+
+###############################################################################
+#Set the Felica T3T System Code supported power state:
+DEFAULT_SYS_CODE_PWR_STATE=0x3B
+
+###############################################################################
+# Path and Files used for FW update binaries storage
+STNFC_FW_PATH_STORAGE="/vendor/firmware"
+STNFC_FW_BIN_NAME="/st54j_fw.bin"
+STNFC_FW_CONF_NAME="/st54j_conf.bin"
+
+###############################################################################
+# Default off-host route for Felica.
+# This settings will be used when application does not set this parameter
+# host  0x00
+# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
+# UICC  0x81 (UICC_1), 0x85 (UICC_2)
+DEFAULT_NFCF_ROUTE=0x86
+
+###############################################################################
+# Configure the default off-host route.
+# used for technology A and B routing
+# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
+# UICC  0x81 (UICC_1), 0x85 (UICC_2)
+DEFAULT_OFFHOST_ROUTE=0x81
+
+###############################################################################
+# Configure the default AID route.
+# host  0x00
+# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
+# UICC  0x81 (UICC_1), 0x85 (UICC_2)
+DEFAULT_ROUTE=0x00
+
+###############################################################################
+# Configure the NFCEEIDs of offhost UICC.
+# UICC  0x81 (UICC_1), 0x85 (UICC_2)
+OFFHOST_ROUTE_UICC={81}
+
+###############################################################################
+# Configure the NFCEEIDs of offhost eSEs.
+# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
+OFFHOST_ROUTE_ESE={86}
+
+###############################################################################
+# Configure the list of NFCEE for the ISO-DEP routing.
+# host  0x00
+# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
+# UICC  0x81 (UICC_1), 0x85 (UICC_2)
+DEFAULT_ISODEP_ROUTE=0x81
+
+###############################################################################
+# Core configuration settings
+CORE_CONF_PROP={ 20, 02, 0a, 03,
+        a1, 01, 1e,
+        a2, 01, 19,
+        80, 01, 01
+}
+
+

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

nfc/libnfc-nci-cheetah.conf

@@ -0,0 +1,121 @@
+###############################################################################
+# Application options
+NFC_DEBUG_ENABLED=0
+
+###############################################################################
+# File used for NFA storage
+NFA_STORAGE="/data/nfc"
+
+###############################################################################
+# Force UICC to only listen to the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F
+UICC_LISTEN_TECH_MASK=0x00
+
+###############################################################################
+# Set HOST default listen to the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F
+# 0x07 = A + B + F
+HOST_LISTEN_TECH_MASK=0x07
+
+###############################################################################
+# AID for Empty Select command
+# If specified, this AID will be substituted when an Empty SELECT command is
+# detected.  The first byte is the length of the AID.  Maximum length is 16.
+AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00}
+
+###############################################################################
+# When screen is turned off, specify the desired power state of the controller.
+# 0: power-off-sleep state; DEFAULT
+# 1: full-power state
+# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used)
+SCREEN_OFF_POWER_STATE=1
+
+###############################################################################
+# Force tag polling for the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B |
+#            NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 |
+#            NFA_TECHNOLOGY_MASK_B_PRIME | NFA_TECHNOLOGY_MASK_KOVIO |
+#            NFA_TECHNOLOGY_MASK_ACTIVE
+#
+# Notable bits:
+# NFA_TECHNOLOGY_MASK_A             0x01    /* NFC Technology A             */
+# NFA_TECHNOLOGY_MASK_B             0x02    /* NFC Technology B             */
+# NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
+# NFA_TECHNOLOGY_MASK_ISO15693      0x08    /* Proprietary Technology       */
+# NFA_TECHNOLOGY_MASK_KOVIO         0x20    /* Proprietary Technology       */
+# NFA_TECHNOLOGY_MASK_ACTIVE        0x40    /* NFC Technology Active        */
+POLLING_TECH_MASK=0x2F
+
+###############################################################################
+# Force P2P to only listen for the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F |
+# NFA_TECHNOLOGY_MASK_ACTIVE
+#
+# Notable bits:
+# NFA_TECHNOLOGY_MASK_A             0x01    /* NFC Technology A             */
+# NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
+# NFA_TECHNOLOGY_MASK_ACTIVE         0x40    /* NFC Technology Active        */
+P2P_LISTEN_TECH_MASK=0x00
+
+PRESERVE_STORAGE=0x01
+
+###############################################################################
+# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h.
+# The value is set to 3 by default as it assumes we will discover 0xF2,
+# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced
+# so that the stack will not wait any longer than necessary.
+# Maximum EE supported number
+# NXP PN547C2 0x02
+# NXP PN65T 0x03
+# NXP PN548C2 0x02
+# NXP PN66T 0x03
+NFA_MAX_EE_SUPPORTED=0x01
+
+###############################################################################
+# AID_MATCHING constants
+# AID_MATCHING_EXACT_ONLY 0x00
+# AID_MATCHING_EXACT_OR_PREFIX 0x01
+# AID_MATCHING_PREFIX_ONLY 0x02
+# AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03
+AID_MATCHING_MODE=0x03
+
+###############################################################################
+#Set the default Felica T3T System Code :
+#This settings will be used when application does not set this parameter
+DEFAULT_SYS_CODE={FE:FE}
+
+###############################################################################
+# Value of NIC parameter NFCC_COFNIG_CONTROL
+# 0x00  NFCC is not allowed to manage RF configuration
+# 0x01  NFCC is allowed to manage RF configuration
+NFCC_CONFIG_CONTROL=0x01
+
+###############################################################################
+#Set if the AID routing should be blocked for the power modes not supported.
+NFA_AID_BLOCK_ROUTE=1
+
+###############################################################################
+#Set the OffHost AID supported power state:
+OFFHOST_AID_ROUTE_PWR_STATE=0x3B
+
+###############################################################################
+# Mifare Tag implementation
+# 0: General implementation
+# 1: Legacy implementation
+LEGACY_MIFARE_READER=0
+
+###############################################################################
+# Nfc recovery implementation
+# 0: Crash Nfc Service
+# 1: Toggle Nfc state
+RECOVERY_OPTION=1
+
+###############################################################################
+# NFCEE Power Supply and Communication Link Control Configuration
+# Set when SetAlwaysOn enabled
+# Default 0x00 when SetAlways on disabled
+ALWAYS_ON_SET_EE_POWER_AND_LINK_CONF=0x03

nfc/libnfc-nci.conf

@@ -0,0 +1,121 @@
+###############################################################################
+# Application options
+NFC_DEBUG_ENABLED=0
+
+###############################################################################
+# File used for NFA storage
+NFA_STORAGE="/data/nfc"
+
+###############################################################################
+# Force UICC to only listen to the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F
+UICC_LISTEN_TECH_MASK=0x07
+
+###############################################################################
+# Set HOST default listen to the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F
+# 0x07 = A + B + F
+HOST_LISTEN_TECH_MASK=0x07
+
+###############################################################################
+# AID for Empty Select command
+# If specified, this AID will be substituted when an Empty SELECT command is
+# detected.  The first byte is the length of the AID.  Maximum length is 16.
+AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00}
+
+###############################################################################
+# When screen is turned off, specify the desired power state of the controller.
+# 0: power-off-sleep state; DEFAULT
+# 1: full-power state
+# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used)
+SCREEN_OFF_POWER_STATE=1
+
+###############################################################################
+# Force tag polling for the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B |
+#            NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 |
+#            NFA_TECHNOLOGY_MASK_B_PRIME | NFA_TECHNOLOGY_MASK_KOVIO |
+#            NFA_TECHNOLOGY_MASK_ACTIVE
+#
+# Notable bits:
+# NFA_TECHNOLOGY_MASK_A             0x01    /* NFC Technology A             */
+# NFA_TECHNOLOGY_MASK_B             0x02    /* NFC Technology B             */
+# NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
+# NFA_TECHNOLOGY_MASK_ISO15693      0x08    /* Proprietary Technology       */
+# NFA_TECHNOLOGY_MASK_KOVIO         0x20    /* Proprietary Technology       */
+# NFA_TECHNOLOGY_MASK_ACTIVE        0x40    /* NFC Technology Active        */
+POLLING_TECH_MASK=0x2F
+
+###############################################################################
+# Force P2P to only listen for the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F |
+# NFA_TECHNOLOGY_MASK_ACTIVE
+#
+# Notable bits:
+# NFA_TECHNOLOGY_MASK_A             0x01    /* NFC Technology A             */
+# NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
+# NFA_TECHNOLOGY_MASK_ACTIVE         0x40    /* NFC Technology Active        */
+P2P_LISTEN_TECH_MASK=0x00
+
+PRESERVE_STORAGE=0x01
+
+###############################################################################
+# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h.
+# The value is set to 3 by default as it assumes we will discover 0xF2,
+# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced
+# so that the stack will not wait any longer than necessary.
+# Maximum EE supported number
+# NXP PN547C2 0x02
+# NXP PN65T 0x03
+# NXP PN548C2 0x02
+# NXP PN66T 0x03
+NFA_MAX_EE_SUPPORTED=0x02
+
+###############################################################################
+# AID_MATCHING constants
+# AID_MATCHING_EXACT_ONLY 0x00
+# AID_MATCHING_EXACT_OR_PREFIX 0x01
+# AID_MATCHING_PREFIX_ONLY 0x02
+# AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03
+AID_MATCHING_MODE=0x03
+
+###############################################################################
+#Set the default Felica T3T System Code :
+#This settings will be used when application does not set this parameter
+DEFAULT_SYS_CODE={FE:FE}
+
+###############################################################################
+# Value of NIC parameter NFCC_COFNIG_CONTROL
+# 0x00  NFCC is not allowed to manage RF configuration
+# 0x01  NFCC is allowed to manage RF configuration
+NFCC_CONFIG_CONTROL=0x01
+
+###############################################################################
+#Set if the AID routing should be blocked for the power modes not supported.
+NFA_AID_BLOCK_ROUTE=1
+
+###############################################################################
+#Set the OffHost AID supported power state:
+OFFHOST_AID_ROUTE_PWR_STATE=0x3B
+
+###############################################################################
+# Mifare Tag implementation
+# 0: General implementation
+# 1: Legacy implementation
+LEGACY_MIFARE_READER=0
+
+###############################################################################
+# Nfc recovery implementation
+# 0: Crash Nfc Service
+# 1: Toggle Nfc state
+RECOVERY_OPTION=1
+
+###############################################################################
+# NFCEE Power Supply and Communication Link Control Configuration
+# Set when SetAlwaysOn enabled
+# Default 0x00 when SetAlways on disabled
+ALWAYS_ON_SET_EE_POWER_AND_LINK_CONF=0x03

powerhint.json

@@ -215,54 +215,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "TAUclampMinOnNiceEnable",
-      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "TAUclampMinOnNiceHighValue",
-      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value",
-      "Values": [
-        "765",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "TAUclampMinOnNiceMidValue",
-      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value",
-      "Values": [
-        "600",
-        "590",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "TAUclampMinOnNiceHighPrio",
-      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio",
-      "Values": [
-        "110",
-        "119",
-        "120"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "TAUclampMinOnNiceMidPrio",
-      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio",
-      "Values": [
-        "128",
-        "139",
-        "130"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "FGUClampBoost",
       "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
@@ -355,35 +307,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "TAAutoPreferFit",
-      "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "TAPreferredIdleMaskMid",
-      "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
-      "Values": [
-        "0x3f",
-        "0xf0",
-        "0xff"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "TAPreferredIdleMaskLow",
-      "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
-      "Values": [
-        "0x3f",
-        "0xf0",
-        "0xff"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -412,6 +335,14 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "NewlyIdleBalancer",
+      "Path": "/proc/vendor_sched/idle_balancer",
+      "Values": [
+        "0",
+        "1"
+      ]
+    },
     {
       "Name": "DisplayWakeup",
       "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
@@ -731,26 +662,6 @@
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
-    },
-    {
-      "Name": "AAModeProperty",
-      "Path": "vendor.powerhal.mode.aa",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "ResetOnInit": true,
-      "Type": "Property"
-    },
-    {
-      "Name": "SYSTEM_UI_ADPF_PROFILES",
-      "Path": "<AdpfConfig>:SYSTEM_UI",
-      "Values": [
-        "SYSTEM_UI_PROFILE"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": true,
-      "Type": "Event"
     }
   ],
   "Actions": [
@@ -862,54 +773,6 @@
       "Duration": 5000,
       "Value": "0"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "TAAutoPreferFit",
-      "Duration": 5000,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "TAPreferredIdleMaskMid",
-      "Duration": 5000,
-      "Value": "0x3f"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "TAPreferredIdleMaskLow",
-      "Duration": 5000,
-      "Value": "0x3f"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "TAUclampMinOnNiceEnable",
-      "Duration": 5000,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "TAUclampMinOnNiceHighValue",
-       "Duration": 5000,
-       "Value": "765"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "TAUclampMinOnNiceHighPrio",
-      "Duration": 5000,
-      "Value": "110"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "TAUclampMinOnNiceMidValue",
-       "Duration": 5000,
-       "Value": "590"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "TAUclampMinOnNiceMidPrio",
-      "Duration": 5000,
-      "Value": "139"
-    },
     {
       "PowerHint": "LAUNCH",
       "Type": "DoHint",
@@ -1185,18 +1048,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",
       "Node": "TAPreferHighCap",
@@ -1353,6 +1204,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_POLL",
@@ -1461,6 +1318,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -1515,6 +1378,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "PowerHALCameraRunning",
@@ -1575,6 +1444,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",
@@ -1823,12 +1698,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "AUTOMOTIVE_PROJECTION",
-      "Node": "AAModeProperty",
-      "Duration": 0,
-      "Value": "1"
-    },
     {
       "PowerHint": "DISPLAY_IDLE",
       "Node": "FGPreferIdle",
@@ -1846,24 +1715,24 @@
       "Type": "EndHint",
       "Value": "DISPLAY_UPDATE_IMMINENT"
     },
-    {
-      "PowerHint": "DISPLAY_IDLE",
-      "Type": "MaskHint",
-      "Value":"DISPLAY_UPDATE_IMMINENT",
-      "EnableProperty": "vendor.powerhal.mode.aa"
-    },
-    {
-      "PowerHint": "DISPLAY_IDLE",
-      "Type": "MaskHint",
-      "Value":"CPU_LOAD_RESET",
-      "EnableProperty": "vendor.powerhal.mode.aa"
-    },
     {
       "PowerHint": "DISPLAY_UPDATE_IMMINENT",
       "Node": "DisplayWakeup",
       "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",
@@ -2022,20 +1891,20 @@
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 500,
-      "Value": "9999999"
+      "Node": "CPU_LITTLE_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPUBigClusterMinFreq",
-      "Duration": 500,
-      "Value": "1826000"
+      "Node": "CPU_MID_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 500,
+      "Duration": 1000,
       "Value": "1"
     },
     {
@@ -2107,28 +1976,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",
@@ -2143,28 +2000,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",
@@ -2179,64 +2024,88 @@
       "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": "SYSTEM_UI_PROFILE",
-      "PID_On": true,
-      "PID_Po": 2.0,
-      "PID_Pu": 1.0,
-      "PID_I": 0.0,
-      "PID_I_Init": 200,
-      "PID_I_High": 512,
-      "PID_I_Low": -30,
-      "PID_Do": 500.0,
-      "PID_Du": 0.0,
-      "UclampMin_On": true,
-      "UclampMin_Init": 232,
-      "UclampMin_LoadUp": 730,
-      "UclampMin_LoadReset": 730,
-      "UclampMin_High": 480,
-      "UclampMin_Low": 2,
-      "UclampMax_EfficientBase": 500,
-      "UclampMax_EfficientOffset": 200,
+      "Name": "UiHighBoostWithoutPid",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
       "SamplingWindow_P": 1,
-      "SamplingWindow_I": 0,
+      "SamplingWindow_I": 1,
       "SamplingWindow_D": 1,
-      "ReportingRateLimitNs": 166666660,
+      "UclampMin_On": true,
+      "UclampMin_Init": 250,
+      "UclampMin_High": 197,
+      "UclampMin_Low": 197,
+      "ReportingRateLimitNs": 1,
+      "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": 5.0
+    },
+    {
+      "Name": "UiLowBoostWithoutPid",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Init": 250,
+      "UclampMin_High": 53,
+      "UclampMin_Low": 53,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    },
+    {
+      "Name": "UiLowNoneBoost",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Init": 250,
+      "UclampMin_High": 0,
+      "UclampMin_Low": 0,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
     }
   ]
 }

proprietary-files-carriersettings.txt

@@ -1,25 +1,16 @@
 # 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
 product/etc/CarrierSettings/a1_hr.pb
 product/etc/CarrierSettings/a1_mk.pb
 product/etc/CarrierSettings/a1_si.pb
-product/etc/CarrierSettings/a1mpn_at.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/alestra_mx.pb
-product/etc/CarrierSettings/aliv_bs.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
@@ -27,18 +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/att4g_mx.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_mx.pb
 product/etc/CarrierSettings/attmvnos_us.pb
-product/etc/CarrierSettings/axis_id.pb
-product/etc/CarrierSettings/bait_mx.pb
-product/etc/CarrierSettings/bark_us.pb
 product/etc/CarrierSettings/base_be.pb
 product/etc/CarrierSettings/batelco_bh.pb
 product/etc/CarrierSettings/bell_ca.pb
@@ -59,17 +44,12 @@ product/etc/CarrierSettings/celcom_my.pb
 product/etc/CarrierSettings/cellcom_il.pb
 product/etc/CarrierSettings/cellcom_us.pb
 product/etc/CarrierSettings/cellcommno_us.pb
-product/etc/CarrierSettings/cellfie_ge.pb
 product/etc/CarrierSettings/celluarone_us.pb
 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
@@ -84,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
@@ -93,23 +72,17 @@ 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/esimgo_gb.pb
 product/etc/CarrierSettings/esn_gb.pb
 product/etc/CarrierSettings/etisalat_ae.pb
 product/etc/CarrierSettings/euskaltel_es.pb
@@ -117,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
@@ -125,11 +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/fliggsmobile_us.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
@@ -138,38 +107,23 @@ 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/gta_us.pb
 product/etc/CarrierSettings/guuk_es.pb
 product/etc/CarrierSettings/h3_at.pb
 product/etc/CarrierSettings/h3_gb.pb
 product/etc/CarrierSettings/h3_ie.pb
-product/etc/CarrierSettings/h3_lk.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
-product/etc/CarrierSettings/humane_us.pb
 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/izziatt_mx.pb
-product/etc/CarrierSettings/jazz_pk.pb
 product/etc/CarrierSettings/jazztel_es.pb
-product/etc/CarrierSettings/jcommobile_jp.pb
-product/etc/CarrierSettings/joonto_us.pb
-product/etc/CarrierSettings/kajeetmvno_us.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
@@ -177,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
@@ -187,41 +140,21 @@ 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/megamovil_mx.pb
-product/etc/CarrierSettings/melita_mt.pb
 product/etc/CarrierSettings/meo_pt.pb
 product/etc/CarrierSettings/metropcs_us.pb
-product/etc/CarrierSettings/mettel_us.pb
-product/etc/CarrierSettings/mobifone_vn.pb
 product/etc/CarrierSettings/mobily_sa.pb
 product/etc/CarrierSettings/monacotelecom_mc.pb
-product/etc/CarrierSettings/movistar_cl.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/newww_mx.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
-product/etc/CarrierSettings/nymobile_us.pb
 product/etc/CarrierSettings/o2_cz.pb
 product/etc/CarrierSettings/o2_de.pb
 product/etc/CarrierSettings/o2_sk.pb
@@ -229,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
@@ -246,35 +176,24 @@ product/etc/CarrierSettings/orange_re.pb
 product/etc/CarrierSettings/orange_ro.pb
 product/etc/CarrierSettings/orange_sk.pb
 product/etc/CarrierSettings/others.pb
-product/etc/CarrierSettings/oxio_us.pb
 product/etc/CarrierSettings/paradisemobile_bm.pb
 product/etc/CarrierSettings/partner_il.pb
 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/reach_us.pb
-product/etc/CarrierSettings/reallycommunications_us.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/roccstar_us.pb
-product/etc/CarrierSettings/rockisland_us.pb
 product/etc/CarrierSettings/rogers5g_ca.pb
 product/etc/CarrierSettings/rogers_ca.pb
 product/etc/CarrierSettings/rogerswpn_ca.pb
@@ -291,49 +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/sky_mx.pb
 product/etc/CarrierSettings/skylo_zz.pb
 product/etc/CarrierSettings/smart_ph.pb
-product/etc/CarrierSettings/smartfren_id.pb
-product/etc/CarrierSettings/smartless_us.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
@@ -345,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
@@ -364,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
@@ -390,29 +285,23 @@ product/etc/CarrierSettings/truphone_zz.pb
 product/etc/CarrierSettings/tstar_tw.pb
 product/etc/CarrierSettings/turkcell_tr.pb
 product/etc/CarrierSettings/turktelekom_tr.pb
-product/etc/CarrierSettings/tusass_gl.pb
 product/etc/CarrierSettings/twm_tw.pb
 product/etc/CarrierSettings/u264a_ca.pb
 product/etc/CarrierSettings/u264a_us.pb
 product/etc/CarrierSettings/u264ab_ca.pb
 product/etc/CarrierSettings/u264ao_at.pb
 product/etc/CarrierSettings/u264ap_at.pb
-product/etc/CarrierSettings/ubixatt_mx.pb
 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
 product/etc/CarrierSettings/verizon_us.pb
-product/etc/CarrierSettings/verizononsitelte_us.pb
 product/etc/CarrierSettings/verymobile_it.pb
 product/etc/CarrierSettings/viaero_us.pb
-product/etc/CarrierSettings/vianova_it.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
@@ -422,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
@@ -433,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
@@ -442,22 +328,16 @@ 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/wim_mx.pb
 product/etc/CarrierSettings/windtre_it.pb
-product/etc/CarrierSettings/wom_cl.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
 product/etc/CarrierSettings/yettel_hu.pb
 product/etc/CarrierSettings/yoigo_es.pb
-product/etc/CarrierSettings/yomobile_mx.pb
 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-astrea_20240329.00_RC02/DeviceIntelligenceNetworkPrebuilt-astrea_20240329.00_RC02.apk;PRESIGNED
-product/priv-app/DevicePersonalizationPrebuiltPixel2022-bfinal_aiai_20250217.00_RC08/DevicePersonalizationPrebuiltPixel2022-bfinal_aiai_20250217.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
@@ -57,7 +52,6 @@ product/etc/sysconfig/pixel_experience_2021.xml
 product/etc/sysconfig/pixel_experience_2021_midyear.xml
 product/etc/sysconfig/pixel_experience_2022.xml
 product/etc/sysconfig/pixel_experience_2022_midyear.xml
-product/etc/sysconfig/pixel_experience_2023_midyear.xml
 
 # Radio
 product/etc/permissions/com.android.sdm.plugins.connmo.xml
@@ -67,7 +61,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_53.0.733201674/CarrierSettings_signed_53.0.733201674.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
@@ -96,23 +90,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
+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
@@ -146,11 +132,6 @@ system_ext/framework/google-ril.jar
 system_ext/priv-app/CarrierSetup/CarrierSetup.apk;PRESIGNED
 system_ext/priv-app/ConnectivityThermalPowerManager/ConnectivityThermalPowerManager.apk
 system_ext/priv-app/EuiccGoogleOverlay/EuiccGoogleOverlay.apk
-system_ext/priv-app/EuiccSupportPixel/DKA_0105_P22_DVT.in
-system_ext/priv-app/EuiccSupportPixel/DKA_0105_P22_DVT.up
-system_ext/priv-app/EuiccSupportPixel/DKA_0105_P22_EVT.in
-system_ext/priv-app/EuiccSupportPixel/DKA_0105_P22_EVT.up
-system_ext/priv-app/EuiccSupportPixel/DKA_0109_P22_DVT.up
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_DVT.in
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_DVT.up
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_EVT.up
@@ -160,7 +141,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/OWNERS

@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS

rro_overlays/NfcOverlay/res/values/config.xml

@@ -30,7 +30,7 @@
     <item>36</item>
   </integer-array>
   <integer-array name="antenna_y">
-    <item>48</item>
+    <item>102</item>
   </integer-array>
   <bool name="nfc_observe_mode_supported">true</bool>
 </resources>

rro_overlays/WifiOverlay/OWNERS

@@ -0,0 +1,3 @@
+# People who can approve changes for submission
+kumachang@google.com
+hsuvictor@google.com

rro_overlays/WifiOverlay/res/values/config.xml

@@ -157,7 +157,4 @@
     <!-- Configure the max number of new channels to add into the initial partial scan list per network.
          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 trigger bugreport for WiFi subsystem restart issue -->
-    <bool translatable="false" name ="config_wifi_subsystem_restart_bugreport_enabled">false</bool>
 </resources>

self-extractors/METADATA

@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}

self-extractors/PART1

@@ -0,0 +1,12 @@
+#
+# Usage is subject to the enclosed license agreement
+
+echo
+echo The license for this software will now be displayed.
+echo You must agree to this license before using this software.
+echo
+echo -n Press Enter to view the license
+read dummy
+echo
+
+more << __EOF__

self-extractors/PART2

@@ -0,0 +1,22 @@
+__EOF__
+
+if test $? != 0
+then
+  echo ERROR: Couldn\'t display license file 1>&2
+  exit 1
+fi
+
+echo
+
+echo -n Type \"I ACCEPT\" if you agree to the terms of the license:\ 
+read typed
+
+if test "$typed" != I\ ACCEPT
+then
+  echo
+  echo You didn\'t accept the license. Extraction aborted.
+  exit 2
+fi
+
+echo
+

self-extractors/PART3

@@ -0,0 +1,12 @@
+
+if test $? != 0
+then
+  echo
+  echo ERROR: Couldn\'t extract files. 1>&2
+  exit 3
+else
+  echo
+  echo Files extracted successfully.
+fi
+exit 0
+

self-extractors/PROLOGUE

@@ -0,0 +1,2 @@
+#!/bin/bash
+#

self-extractors/extract-lists.txt

@@ -0,0 +1,15 @@
+  google_devices)
+    TO_EXTRACT="\
+            IMAGES/vbmeta_vendor.img \
+            IMAGES/vendor.img \
+            IMAGES/vendor_dlkm.img \
+            RADIO/bootloader.img \
+            RADIO/radio.img \
+            system_ext/etc/permissions/com.shannon.imsservice.xml \
+            system_ext/etc/permissions/com.shannon.rcsservice.xml \
+            system_ext/lib64/libmediaadaptor.so \
+            system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
+            system_ext/priv-app/ShannonIms/ShannonIms.apk \
+            "
+    ;;
+

self-extractors/google_devices/COPYRIGHT

@@ -0,0 +1 @@
+# (C) Google Inc.

self-extractors/google_devices/LICENSE

@@ -0,0 +1,264 @@
+THIS DEVELOPER SOFTWARE LICENSE AGREEMENT (THE "AGREEMENT") IS A LEGALLY
+BINDING AGREEMENT BETWEEN Google Inc. ("LICENSOR") AND
+YOU OR THE LEGAL ENTITY YOU REPRESENT ("You" or its possessive, "Your"). BY
+TYPING "I ACCEPT" WHERE INDICATED YOU ACKNOWLEDGE THAT YOU HAVE READ THIS
+AGREEMENT, UNDERSTAND IT AND AGREE TO BE BOUND BY ITS TERMS AND CONDITIONS.
+IF YOU DO NOT AGREE TO THESE TERMS YOU MUST DISCONTINUE THE INSTALLATION
+PROCESS AND YOU SHALL NOT USE THE SOFTWARE OR RETAIN ANY COPIES OF THE
+SOFTWARE OR DOCUMENTATION. ANY USE OR POSSESSION OF THE SOFTWARE BY YOU IS
+SUBJECT TO THE TERMS AND CONDITIONS SET FORTH IN THIS AGREEMENT. IF THE
+SOFTWARE IS INSTALLED ON A COMPUTER OWNED BY A CORPORATION OR OTHER LEGAL
+ENTITY, THEN YOU REPRESENT AND WARRANT THAT YOU HAVE THE AUTHORITY TO BIND
+SUCH ENTITY TO THE TERMS AND CONDITIONS OF THIS AGREEMENT.
+
+   1.  Special Definitions
+
+      a.  The term "Android" means the open source mobile platform, software
+          stack, operating system, middleware, application programming
+          interfaces and mobile applications under the trade-name "Android"
+          distributed at Android.com.
+
+      b.  The term "Android Applications" means a software application or
+          open-source contribution developed by You, designed to operate with
+          Android that does not contain or incorporate any of the Software.
+
+      c.  The term "Authorized Android Enabled Device" means only the device
+          identified on the site from which You downloaded the Software.
+          The term "Software" means the Licensor's proprietary software and
+          libraries in object code form, designed for use on the Authorized
+          Android Enabled Device.
+
+      d.  The term "Authorized Android Enabled Device Software" means a
+          packaged build for Authorized Android Enabled Devices, consisting
+          of files suitable for installation on an Authorized Android Enabled
+          Device using a mechanism such as fastboot mode or recovery mode.
+
+   2.  License Grant
+
+      a.  Subject to the terms of this Agreement, Licensor hereby grants to
+          You, free of charge, a non-exclusive, non-sublicensable,
+          non-transferable, limited copyright license, during the term of
+          this Agreement, to download, install and use the Software
+          internally in machine-readable (i.e., object code) form and the
+          Documentation for non-commercial use on an Authorized Android
+          Enabled Device and non-commercial redistribution for academic
+          purposes only of a reasonable number of copies of the Authorized
+          Android Enabled Device Software (the "Limited Purpose"). You may
+          grant your end users the right to use the Software for
+          non-commercial purposes on an Authorized Android Enabled Device.
+          The license to the Software granted to You hereunder is solely for
+          the Limited Purpose set forth in this section, and the Software
+          shall not be used for any other purpose.
+
+   3.  Restrictions
+
+      a.  Retention of Rights. The entire right, title and interest in the
+          Software shall remain with Licensor and, unless specified in
+          writing hereunder, no rights are granted to any of the Software.
+          Except for the right to use the Software for the Limited Purpose,
+          the delivery of the Software to You does not convey to You any
+          intellectual property rights in the Software, including, but not
+          limited to any rights under any patent, trademark, copyright, or
+          trade secret. Neither the delivery of the Software to You nor any
+          terms set forth herein shall be construed to grant to You, either
+          expressly, by implication or by way of estoppel, any license under
+          any patents or other intellectual property rights covering or
+          relating to any other product or invention or any combination of
+          the Software with any other product. Any rights not expressly
+          granted to You herein are reserved by Licensor.
+
+      b.  No Commercialization or Distribution of the Software and
+          Documentation. Except as expressly provided in Section 2 of this
+          Agreement, You shall have no right to (i) copy, disclose,
+          distribute, publically perform, publically display, transfer,
+          alter, modify, translate, disassemble, decompile, reverse engineer,
+          or adapt the Software and Documentation, or any portion thereof, or
+          create any derivative works based thereon; (ii) rent, lease,
+          assign, sublicense, resell, disclose or otherwise transfer the
+          Software and Documentation in whole or in part to any third party
+          (iii) use the Software and Documentation except for the Limited
+          Purpose, (iv) remove or alter any of the copyright or proprietary
+          notices contained in any of the Software and Documentation. For the
+          purposes of clarity, nothing in this Agreement prohibits You from
+          making and distributing Android Applications under commercial or
+          non-commercial terms, provided that You shall not contain,
+          incorporate, and/or compile the Software or any of its derivative
+          works, in whole or in part, into Your Android Applications and/or
+          any software/devices created by You or by third parties acting on
+          Your behalf. You and any such third party shall comply with all of
+          the terms and conditions of this Agreement.
+
+      c.  No Reverse Engineering. Except for any portions of the Software
+          provided to You in source code format and except for any third
+          party code distributed with the Software that is licensed under
+          contrary terms, You will not reverse engineer, disassemble,
+          decompile, or translate the Software, or otherwise attempt to
+          derive the source code version of the Software, except if and to
+          the extent expressly permitted under any applicable law.
+
+      d.  Third Party Software. You agree that Android may contain third
+          party software. You agree that you may not distribute such third
+          party software for any purpose without appropriate licenses from
+          the applicable third party or parties.
+
+      e.  No Transfer or Assignment. You shall not assign any of its rights
+          or obligations under this Agreement. Any attempted assignment in
+          contravention of this Section shall be void.
+
+      f.  Licensor shall retain all title, ownership and Intellectual
+          Property Rights in and to the Software and any derivative thereof.
+          "Intellectual Property Rights" shall mean all patent, copyright,
+          trade secret, trademark and other proprietary and intellectual
+          property rights, including moral rights.
+
+      g.  Neither this Agreement, nor any act by Licensor or its Affiliates
+          persuant to this Agreement or relating to the Software (including,
+          without limitation, the provision by Licensor or its Affiliates of
+          the Software) shall provide to You any license or any other rights
+          whatsoever under any patents, trademarks, trade secrets, copyrights
+          or any other intellectual property rights of Licensor or its
+          Affiliates, except for the copyrights expressly set forth in this
+          Agreement. You understand and agree that:
+
+      h.  Neither this Agreement, nor delivery of the Software alone or in
+          combination with any Licensor ASIC grants you any right to
+          practice, or any other right at all with respect to, any patent of
+          Licensor or its Affiliates, and
+
+      i.  A separating license agreement from Motorola Incorporated is needed
+          to use or practice any patent of Licensor or its Affiliates.
+
+      j.  You agree not to contend in any context that, as a result of the
+          provision or use of this software, either Licensor or Affiliate has
+          any obligation to extend, or Licensor or any other party has
+          obtained any right to, any license, whether express or implied,
+          with respect to any patent of Licensor or its Affiliates for any
+          purpose. For the purposes of this agreement, "Affiliate" means
+          (i) any corporation or any other legal entity that owns, directly
+          or indirectly, more than fifty percent (50%) of the shares, equity
+          interest or other securities of any entity entitled to vote for
+          election of directors (or other managing authority), or (ii) any
+          corporation or any other legal entity fifty percent (50%) or more
+          of whose shares, equity interest, or other securities entitled to
+          vote for election of directors (or other managing authority) is
+          owned or controlled by an entity, either directly or indirectly.
+
+   4.  Indemnity
+
+      a.  You agree to indemnify and hold harmless Licensor, Google, and
+          their officers, directors, customers, employees and successors and
+          assigns (each an "Indemnified Party") against any and all claims,
+          demands, causes of action, losses, liabilities, damages, costs and
+          expenses, incurred by the Indemnified Party (including but not
+          limited to costs of defense, investigation and reasonable
+          attorney's fees) arising out of, resulting from or related to
+          (i) any software, products, documentation, content, materials or
+          derivative works created or developed by You using the Software
+          which causes an infringement of any patent, copyright, trademark,
+          trade secret, or other property, publicity or privacy rights of any
+          third parties arising in any jurisdiction anywhere in the world,
+          (ii) the download, distribution, installation, storage, execution,
+          use or transfer of such software, products, documentation, content,
+          materials or derivative works by any person or entity, and/or
+          (iii) any breach of this Agreement by You. If requested by an
+          Indemnified Party, You agree to defend such Indemnified Party in
+          connection with any third party claims, demands, or causes of
+          action resulting from, arising out of or in connection with any of
+          the foregoing.
+
+   5.  Limitation of Liability
+
+      a.  TO THE MAXIMUM EXTENT PERMITTED UNDER APPLICABLE LAWS, UNDER NO
+          CIRCUMSTANCES, INCLUDING WITHOUT LIMITATION NEGLIGENCE, SHALL
+          LICENSOR, GOOGLE, THEIR AFFILIATES AND/OR ITS DIRECTORS, OFFICERS,
+          EMPLOYEES OR AGENTS BE LIABLE FOR ANY INDIRECT, INCIDENTAL,
+          SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES (INCLUDING BUT NOT
+          LIMITED TO DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
+          INTERRUPTION, LOSS OF BUSINESS INFORMATION AND THE LIKE) ARISING
+          OUT OF OR IN CONNECTION WITH THE SOFTWARE OR ANY DOWNLOAD,
+          INSTALLATION OR USE OF, OR INABILITY TO USE, THE SOFTWARE, EVEN IF
+          LICENSOR OR GOOGLE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
+          DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OR
+          EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES SO
+          THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY OR MAY BE LIMITED.
+          IN NO EVENT SHALL LICENSOR'S OR GOOGLE'S TOTAL AGGREGATE LIABILITY
+          TO YOU FOR ANY AND ALL DAMAGES, LOSSES, CLAIMS AND CAUSES OF
+          ACTIONS (WHETHER IN CONTRACT, TORT, INCLUDING NEGLIGENCE,
+          INDEMNIFICATION OR OTHERWISE) EXCEED ONE HUNDRED U.S. DOLLARS
+          (US$100). THE LIMITATIONS SET FORTH IN THIS PARAGRAPH SHALL BE
+          DEEMED TO APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW.
+          THE PARTIES HAVE FULLY CONSIDERED THE FOREGOING ALLOCATION OF RISK
+          AND FIND IT REASONABLE, AND THAT THE FOREGOING LIMITATIONS IN THIS
+          PARAGRAPH ARE AN ESSENTIAL BASIS OF THE BARGAIN BETWEEN THE
+          PARTIES.
+
+   6.  No Warranty
+
+      a.  LICENSOR AND GOOGLE MAKE NO WARRANTIES, EXPRESS OR IMPLIED, WITH
+          RESPECT TO THE SOFTWARE AND DOCUMENTATION PROVIDED UNDER THIS
+          AGREEMENT, INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF
+          MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE OR AGAINST
+          INFRINGEMENT, OR ANY EXPRESS OR IMPLIED WARRANTY ARISING OUT OF
+          TRADE USAGE OR OUT OF A COURSE OF DEALING OR COURSE OF PERFORMANCE.
+          NOTHING CONTAINED IN THIS AGREEMENT SHALL BE CONSTRUED AS A
+          WARRANTY OR REPRESENTATION BY LICENSOR (I) AS TO THE VALIDITY OR
+          SCOPE OF ANY PATENT, COPYRIGHT OR OTHER INTELLECTUAL PROPERTY RIGHT
+          AND (II) THAT ANY MANUFACTURE OR USE WILL BE FREE FROM INFRINGEMENT
+          OF PATENTS, COPYRIGHTS OR OTHER INTELLECTUAL PROPERTY RIGHTS OF
+          OTHERS, AND IT SHALL BE THE SOLE RESPONSIBILITY OF YOU TO MAKE SUCH
+          DETERMINATION AS IS NECESSARY WITH RESPECT TO THE ACQUISITION OF
+          LICENSES UNDER PATENTS AND OTHER INTELLECTUAL PROPERTY OF THIRD
+          PARTIES. LICENSOR AND GOOGLE SHALL NOT HAVE ANY OBLIGATION TO
+          PROVIDE ANY TECHNICAL SUPPORT OF THE SOFTWARE UNDER THIS AGREEMENT.
+
+   7.  Term and Termination
+
+      a.  This Agreement shall be effective on the date You accept this
+          Agreement and shall remain in effect until terminated as provided
+          herein. You may terminate the Agreement at any time by deleting and
+          destroying all copies of the Software and all related information
+          in Your possession or control. This Agreement terminates
+          immediately and automatically, with or without notice, if You fail
+          to comply with any provision hereof. Additionally, Licensor may at
+          any time terminate this Agreement, without cause, upon notice to
+          You. Upon termination You must delete or destroy all copies of the
+          Software in Your possession, and the license granted to You in this
+          Agreement shall terminate. Sections 3, 4, 5, 6 and 8 shall survive
+          the termination of this Agreement.
+
+   8.  Miscellaneous
+
+      a.  Governing Law. This Agreement is governed and interpreted in
+          accordance with the laws of the State of California without giving
+          effect to its conflict of laws provisions. The United Nations
+          Convention on Contracts for the International Sale of Goods is
+          expressly disclaimed and shall not apply. Any claim arising out of
+          or related to this Agreement must be brought exclusively in a
+          federal or state court located in Santa Clara County, California
+          and You consent to the jurisdiction and venue of such courts.
+
+      b.  Waiver and Severability. The failure of either party to require
+          performance by the other party of any provision of this Agreement
+          shall not affect the full right to require such performance at any
+          time thereafter; nor shall the waiver by either party of a breach
+          of any provision of this Agreement be taken or held to be a waiver
+          of the provision itself. Severability. If any provision of this
+          Agreement is unenforceable or invalid under any applicable law or
+          is so held by applicable court decision, such unenforceability or
+          invalidity shall not render this Agreement unenforceable or invalid
+          as a whole, and such provision shall be changed and interpreted so
+          as to best accomplish the objectives of such unenforceable or
+          invalid provision within the limits of applicable law or
+          applicable court decisions.
+
+      c.  Amendment and Modification. This Agreement and any of its terms and
+          provisions may only be amended, modified, supplemented or waived in
+          a writing signed by both parties hereto.
+
+      d.  Compliance with Laws. You shall comply with all applicable laws,
+          rules, and regulations in connection with its activities under this
+          Agreement.
+
+      e.  Entire Agreement. This Agreement completely and exclusively states
+          the agreement between You and Licensor regarding this subject
+          matter.

self-extractors/google_devices/staging/Android.bp.txt

@@ -0,0 +1,41 @@
+// Copyright (C) 2023 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.
+
+soong_namespace {
+}
+
+cc_prebuilt_library_shared {
+    name: "libmediaadaptor",
+    arch: {
+        arm64: {
+            srcs: ["lib64/libmediaadaptor.so"],
+            shared_libs: [
+                "libandroid_runtime",
+                "libbinder",
+                "libc++",
+                "liblog",
+                "libmedia",
+                "libnativehelper",
+                "libstagefright",
+                "libutils",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    system_ext_specific: true,
+    strip: {
+        none: true,
+    },
+}
+

self-extractors/google_devices/staging/Android.mk.template

@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2023 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+ifneq ($(filter lynx,$(TARGET_DEVICE)),)
+  $(call add-radio-file,bootloader.img)
+  $(call add-radio-file,radio.img)
+endif
+
+ifneq ($(filter lynx,$(TARGET_DEVICE)),)
+include $(CLEAR_VARS)
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE := ShannonIms
+LOCAL_MODULE_TAGS := optional
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_SYSTEM_EXT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_OWNER := samsung
+LOCAL_MODULE_CLASS := APPS
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE := ShannonRcs
+LOCAL_MODULE_TAGS := optional
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_SYSTEM_EXT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_OWNER := samsung
+LOCAL_MODULE_CLASS := APPS
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
+include $(BUILD_PREBUILT)
+
+endif

self-extractors/google_devices/staging/BoardConfigPartial.mk

@@ -0,0 +1,37 @@
+# Copyright 2023 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.
+
+BOARD_PREBUILT_VENDORIMAGE := vendor/google_devices/lynx/proprietary/vendor.img
+
+BOARD_PREBUILT_VENDOR_DLKMIMAGE := vendor/google_devices/lynx/proprietary/vendor_dlkm.img
+
+TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm
+
+BOARD_AVB_VBMETA_VENDOR := vendor
+BOARD_AVB_VBMETA_VENDOR_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
+BOARD_AVB_VBMETA_VENDOR_ALGORITHM := SHA256_RSA2048
+BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION := 3
+
+AB_OTA_PARTITIONS += \
+    vbmeta_vendor \
+    vendor \
+    vendor_dlkm \
+
+-include vendor/google/tools/android-info.mk
+ifdef USE_ANDROID_INFO
+  TARGET_BOARD_INFO_FILE := vendor/google_devices/lynx/android-info.txt
+endif
+
+VENDOR_BLOBS_LICENSE := vendor/google_devices/lynx/LICENSE

self-extractors/google_devices/staging/device-partial.mk

@@ -0,0 +1,30 @@
+# Copyright 2023 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.
+
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/google_devices/lynx/proprietary \
+
+# AOSP packages required by the blobs
+PRODUCT_PACKAGES := \
+    ShannonIms \
+    ShannonRcs \
+
+PRODUCT_PACKAGES += \
+    libmediaadaptor \
+
+#  blob(s) necessary for lynx hardware
+PRODUCT_COPY_FILES := \
+    vendor/google_devices/lynx/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
+    vendor/google_devices/lynx/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \
+

self-extractors/root/android-info.txt

@@ -0,0 +1,8 @@
+require board=lynx
+require partition-exists=vendor_kernel_boot
+
+require version-bootloader=lynx-1.0-9450676
+
+
+
+require version-baseband=g5300n-221222-221226-B-9437664

self-extractors/root/proprietary/BoardConfigVendor.mk

@@ -0,0 +1,15 @@
+# Copyright 2023 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.
+
+-include vendor/google_devices/lynx/BoardConfigPartial.mk

self-extractors/root/proprietary/device-vendor.mk

@@ -0,0 +1,15 @@
+# Copyright 2023 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.
+
+$(call inherit-product-if-exists, vendor/google_devices/lynx/device-partial.mk)

sepolicy/bluetooth/hal_bluetooth_default.te

@@ -1,5 +1,3 @@
-# Bluetooth hal
-
 allow hal_bluetooth_default bt_device:chr_file rw_file_perms;
 
 add_hwservice(hal_bluetooth_default, hal_bluetooth_coexistence_hwservice)
@@ -12,6 +10,3 @@ userdebug_or_eng(`
   allow hal_bluetooth_default sscoredump_vendor_data_coredump_file:file create_file_perms;
   set_prop(hal_bluetooth_default, vendor_ssrdump_prop)
 ')
-
-set_prop(hal_bluetooth_default, vendor_bluetooth_prop)
-set_prop(vendor_init, vendor_bluetooth_prop)

sepolicy/lynx-sepolicy.mk

@@ -1,6 +1,3 @@
 # sepolicy that are shared among devices using whitechapel
 BOARD_SEPOLICY_DIRS += device/google/lynx/sepolicy/vendor
 BOARD_SEPOLICY_DIRS += device/google/lynx/sepolicy/tracking_denials
-
-BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/common
-BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/cs40l26

sepolicy/tracking_denials/bug_map

@@ -1,8 +1,2 @@
-dump_modem sscoredump_vendor_data_coredump_file dir b/361725767
-dump_modem sscoredump_vendor_data_logcat_file dir b/361725767
-hal_bluetooth_default vendor_data_file dir b/318453067
-hal_bluetooth_default vendor_default_prop property_service b/359428216
-hal_vibrator_default default_android_service service_manager b/361726059
 kernel vendor_charger_debugfs dir b/305600791
-vendor_init default_prop property_service b/359428217
-vendor_init default_prop property_service b/359428463
+hal_bluetooth_default vendor_data_file dir b/318453067

sepolicy/vendor/property_contexts

@@ -1 +0,0 @@
-persist.vendor.service.bdroid. u:object_r:vendor_bluetooth_prop: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}/lynx"
-./setup-makefiles.py
-popd

setup-makefiles.sh

@@ -0,0 +1,84 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=lynx
+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/lynx",
+		"hardware/google/av",
+		"hardware/google/gchips",
+		"hardware/google/graphics/common",
+		"hardware/google/interfaces",
+		"hardware/google/pixel",
+		"hardware/qcom/wlan/wcn6740",
+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 | \
+            libwpa_client) ;;
+        *)
+            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

thermal_info_config_charge_lynx.json

@@ -9,17 +9,20 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"gnss_tcxo_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -27,6 +30,7 @@
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001
         },
         {
@@ -34,6 +38,7 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 29.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
+            "TempPath":"/dev/thermal/tz-by-name/skin_therm1/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -41,16 +46,19 @@
         {
             "Name":"skin_therm2",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/skin_therm2/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001
         },
         {

thermal_info_config_lynx.json

@@ -9,17 +9,20 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"gnss_tcxo_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -27,6 +30,7 @@
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001
         },
         {
@@ -34,6 +38,7 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 27.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
+            "TempPath":"/dev/thermal/tz-by-name/skin_therm1/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -41,16 +46,19 @@
         {
             "Name":"skin_therm2",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/skin_therm2/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001
         },
         {
@@ -445,28 +453,347 @@
             "Type":"NPU",
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "Multiplier":0.001
+        },
+        {
+            "Name":"battery_cycle",
+            "Type":"BCL_VOLTAGE",
+            "Multiplier":1,
+            "Monitor":false
+        },
+        {
+            "Name":"critical-battery-cell",
+            "Type":"BCL_VOLTAGE",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "vdroop1",
+            "Combination":["battery", "battery_cycle", "vdroop1"],
+            "Coefficient":[-10000, 400, 1000],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"],
+            "Multiplier":1,
+            "Monitor":true
+        },
+        {
+            "Name":"FLASH_LED_REDUCE",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "vdroop1",
+            "Combination":["battery", "battery_cycle", "vdroop1"],
+            "Coefficient":[-10000, 400, 1000],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "SendPowerHint":true
+        },
+        {
+            "Name":"soc",
+            "Type":"BCL_PERCENTAGE",
+            "HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true
+        },
+        {
+            "Name":"BCL_TPU_LOW_TEMP",
+            "Type":"BCL_CURRENT",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "TriggerSensor": "ocp_tpu",
+            "Combination":["ocp_tpu", "battery"],
+            "Coefficient":[1, -10],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "PassiveDelay":500,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
+                }
+            ]
+        },
+        {
+            "Name":"BCL_GPU_LOW_TEMP",
+            "Type":"BCL_CURRENT",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "TriggerSensor": "ocp_gpu",
+            "Combination":["ocp_gpu", "battery"],
+            "Coefficient":[1, -10],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "PassiveDelay":500,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 11, 11, 11]
+                }
+            ]
+        },
+        {
+            "Name":"BCL_BATOILO_GPU_LOW_TEMP",
+            "Type":"BCL_CURRENT",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "batoilo",
+            "Combination":["batoilo", "ocp_gpu", "battery"],
+            "Coefficient":[5000, 12000, -1000],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN",  3.0, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "PassiveDelay":500,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 11, 11, 11]
+                }
+            ]
+        },
+        {
+            "Name":"BCL_BATOILO_TPU_LOW_TEMP",
+            "Type":"BCL_CURRENT",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "batoilo",
+            "Combination":["batoilo", "ocp_tpu", "battery"],
+            "Coefficient":[5000, 12000, -1000],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "PassiveDelay":500,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
+                }
+            ]
+        },
+        {
+            "Name":"BCL_BATOILO_GPU",
+            "Type":"BCL_CURRENT",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "batoilo",
+            "Combination":["batoilo", "ocp_gpu"],
+            "Coefficient":[5000, 12000],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "PassiveDelay":500,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
+                }
+            ]
+        },
+        {
+            "Name":"BCL_BATOILO_TPU",
+            "Type":"BCL_CURRENT",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "batoilo",
+            "Combination":[
+                "batoilo",
+                "ocp_tpu"
+            ],
+            "Coefficient":[5000, 12000],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "PassiveDelay":500,
+            "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,
+            "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, 5, 5, 5]
+                }
+            ]
+        },
+        {
+            "Name":"BCL_AUDIO_BAACL",
+            "Type":"BCL_VOLTAGE",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "soc",
+            "Combination":["battery", "soc"],
+            "Coefficient":[-25000, 80],
+            "HotThreshold":["NAN", "NAN",  "NAN", "NAN", 2.0, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true
+        },
+        {
+            "Name":"vdroop1",
+            "Type":"BCL_VOLTAGE",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "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,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-cpufreq-2",
+                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
+                },
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
+                },
+                {
+                    "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,
+            "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":"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,
+            "Monitor":true
+        },
+        {
+            "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,
+            "Monitor":true
+        },
+        {
+            "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,
+            "Monitor":true
+        },
+        {
+            "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,
+            "Monitor":true
+        },
+        {
+            "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":[1100, 1050, 1000, 950, 900, 850, 800, 750, 700, 650, 600]
         },
         {
             "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":[1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750]
         },
         {
             "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":[1450, 1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750]
         },
         {
             "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":[4599, 3727, 3259, 2378, 2044, 1813, 1449, 1223, 1007, 804, 633, 452]
         },
         {
             "Name":"fcc",

vendor.prop

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