redfin: Set status_bar_header_height_keyguard to status_bar_height_default value

Merge branch 'lineage-21' of https://github.com/LineageOS/android_device_google_redfin into udc
redfin: Enable wireless charger and dreamliner overlays
2025-01-27 01:45:44 +09:00 · 2024-07-27 11:05:33 +05:30 · 2024-05-14 19:25:22 +05:30 · 2024-05-04 10:35:34 +05:30
37 changed files with 2064 additions and 333 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -2,6 +2,7 @@ soong_namespace {
    imports: [
        "hardware/google/interfaces",
        "hardware/google/pixel",
+        "hardware/qcom/bootctrl",
    ],
 }

--- a/Android.mk
+++ b/Android.mk
@@ -0,0 +1,38 @@
+#
+# Copyright 2018 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)
+
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,ueventd.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,hals.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,media_profiles_V1_0.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,media_codecs_performance.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,device_state_configuration.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,task_profiles.json,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,p2p_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/redfin,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+
+$(eval $(call declare-1p-copy-files,device/google/redfin,audio_policy_configuration.xml))
+
+ifeq ($(USES_DEVICE_GOOGLE_REDFIN),true)
+  subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
+  $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))
+endif
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -25,4 +25,4 @@ PRODUCT_MAKEFILES := \
 COMMON_LUNCH_CHOICES := \
    aosp_redfin-trunk_staging-userdebug \
    aosp_redfin_vf-trunk_staging-userdebug \
-    lineage_redfin-trunk_staging-userdebug
+    lineage_redfin-userdebug
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -0,0 +1,58 @@
+# Copyright 2020 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.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list.  These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list.  E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# Vibrator HAL switch to AIDL
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.vibrator@1.3-service.redfin.rc)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.vibrator@1.3-service.redfin)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.vibrator@1.3-service.redfin.xml)
+
+# Update to USB HAL 1.3
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.usb@1.2-service.redfin)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.usb@1.2-service.redfin.rc)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.usb@1.2-service.redfin.xml)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.usb@1.3-service.redfin)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.usb@1.3-service.redfin.rc)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.usb@1.3-service.redfin.xml)
--- a/2
+++ b/2
@@ -1 +1 @@
-per-file thermal_info_config_redfin.json = tstrudel@google.com,wvw@google.com,joaodias@google.com,paillon@google.com,jychen@google.com,kamewang@google.com,yihocheng@google.com,davidchao@google.com,jenhaochen@google.com,liumartin@google.com
+per-file thermal_info_config_redfin.json = tstrudel@google.com,wvw@google.com,joaodias@google.com,paillon@google.com,jychen@google.com,kamewang@google.com,yihocheng@google.com,mandyshen@google.com,davidchao@google.com,jenhaochen@google.com,liumartin@google.com
--- a/aosp_redfin.mk
+++ b/aosp_redfin.mk
@@ -24,8 +24,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 endif
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)

-# Enable mainline checking
-PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict
+# Disable mainline checking
+#PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict
+DISABLE_ARTIFACT_PATH_REQUIREMENTS := true

 #
 # All components inherited here go to system_ext image
@@ -42,7 +43,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
 # All components inherited here go to vendor image
 #
 # TODO(b/136525499): move *_vendor.mk into the vendor makefile later
-TARGET_SUPPORTS_OMX_SERVICE := false
 $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)

@@ -58,6 +58,9 @@ ifneq ($(PRODUCT_VENDOR_FREEZE_SYSTEM_BUILD),true)
 endif
 endif

+# Don't build super.img.
+PRODUCT_BUILD_SUPER_PARTITION := false
+
 # b/113232673 STOPSHIP deal with Qualcomm stuff later
 # PRODUCT_RESTRICT_VENDOR_FILES := all

--- a/audio/acdbdata/workspaceFile.qwsp
+++ b/audio/acdbdata/workspaceFile.qwsp
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -9,8 +9,10 @@ $(call inherit-product, device/google/redbull/device-lineage.mk)
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/redfin/overlay-lineage

-# CHRE
-$(call soong_config_set,chre,chre_daemon_dsp_library,//vendor/google/redfin:libadsprpc)
+# Camera
+PRODUCT_PACKAGES += \
+    android.hardware.camera.device-V2-ndk.vendor:64 \
+    android.hardware.camera.provider-V2-ndk.vendor:64

 # HBM
 PRODUCT_PACKAGES += \
@@ -19,5 +21,9 @@ PRODUCT_PACKAGES += \
 # PowerShare
 include hardware/google/pixel/powershare/device.mk

+# Wi-Fi
+PRODUCT_PACKAGES += \
+    android.hardware.wifi-V2-ndk.vendor:64
+
 # wireless_charger HAL service
 include device/google/redfin/wireless_charger/wireless_charger.mk
--- a/device-redfin.mk
+++ b/device-redfin.mk
@@ -61,6 +61,12 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/acdbdata/Headset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Headset_cal.acdb \
     $(LOCAL_PATH)/audio/acdbdata/Speaker_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Speaker_cal.acdb \
     $(LOCAL_PATH)/audio/acdbdata/adsp_avs_config.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/adsp_avs_config.acdb
+
+# Audio ACDB workspace files for QACT
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_COPY_FILES += \
+     $(LOCAL_PATH)/audio/acdbdata/workspaceFile.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/workspaceFile.qwsp
+endif
 endif

 # CS35L41 B0 SPEAKER AMP
@@ -90,6 +96,10 @@ PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-prot.wmfw:$(TARGET_COPY_OUT_VENDOR)/firmware/cs35l41-revB2-dsp1-spk-prot.wmfw \
    $(LOCAL_PATH)/audio/cs35l41/B2/R-cs35l41-revB2-dsp1-spk-prot.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/R-cs35l41-revB2-dsp1-spk-prot.bin

+# Audio CS35L41 speaker calibration tool
+PRODUCT_PACKAGES_DEBUG += \
+    crus_sp_cal
+
 # Audio audiozoom config data
 PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/audio/audiozoom.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audiozoom.xml
@@ -151,6 +161,12 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/thermal_info_config_$(PRODUCT_HARDWARE).json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json

+# Support to disable thermal protection at run time
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+    PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_PLATFORM).wlc.rc
+endif
+
 # GPS ANTENNA_INFO configuration file
 #PRODUCT_COPY_FILES += \
 #    $(LOCAL_PATH)/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf
@@ -215,6 +231,3 @@ PRODUCT_PACKAGES += \

 PRODUCT_PACKAGES += \
    NfcOverlayRedfin
-
-# Set soong config variable to control module build
-$(call soong_config_set,ctpm,enable_nr_dual_connectivity_qcril,true)
--- a/dumpstate/Android.bp
+++ b/dumpstate/Android.bp
@@ -1,48 +0,0 @@
-//
-// Copyright 2016 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.
-//
-
-package {
-    // See: http://go/android-license-faq
-    default_applicable_licenses: [
-        "Android-Apache-2.0",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.dumpstate@1.1-service.redfin",
-    init_rc: ["android.hardware.dumpstate@1.1-service.redfin.rc"],
-    relative_install_path: "hw",
-
-    srcs: [
-        "DumpstateDevice.cpp",
-        "service.cpp",
-    ],
-    shared_libs: [
-        "android.hardware.dumpstate@1.0",
-        "android.hardware.dumpstate@1.1",
-        "libbase",
-        "libcutils",
-        "libdumpstateutil",
-        "libhidlbase",
-        "liblog",
-        "libutils",
-    ],
-    cflags: [
-        "-Werror",
-        "-Wall",
-    ],
-    proprietary: true,
-}
--- a/dumpstate/Android.mk
+++ b/dumpstate/Android.mk
@@ -0,0 +1,44 @@
+#
+# Copyright 2016 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)
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.dumpstate@1.1-service.redfin
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_INIT_RC := android.hardware.dumpstate@1.1-service.redfin.rc
+LOCAL_MODULE_RELATIVE_PATH := hw
+
+LOCAL_SRC_FILES := \
+    DumpstateDevice.cpp \
+    service.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+    android.hardware.dumpstate@1.0 \
+    android.hardware.dumpstate@1.1 \
+    libbase \
+    libcutils \
+    libdumpstateutil \
+    libhidlbase \
+    liblog \
+    libutils
+
+LOCAL_CFLAGS := -Werror -Wall
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
+
+include $(BUILD_EXECUTABLE)
--- a/evolution.dependencies
+++ b/evolution.dependencies
@@ -1,21 +1,18 @@
-[
-  {
-    "repository": "device_google_gs-common",
-    "target_path": "device/google/gs-common"
-  },
-  {
-    "repository": "device_google_redbull",
-    "target_path": "device/google/redbull",
-    "branch": "vic"
-  },
-  {
-    "repository": "apelete/proprietary_vendor_google_redfin",
-    "target_path": "vendor/google/redfin",
-    "remote" : "github-non-los",
-    "branch": "lineage-22.2"
-  },
-  {
-    "repository": "kernel_google_redbull",
-    "target_path": "kernel/google/redbull"
-  }
-]
+[
+   {
+     "repository": "LineageOS/android_device_google_gs-common",
+     "target_path": "device/google/gs-common"
+   },
+   {
+     "repository": "device_google_redbull",
+     "target_path": "device/google/redbull"
+   },
+   {
+     "repository": "vendor_google_redfin",
+     "target_path": "vendor/google/redfin"
+   },
+   {
+     "repository": "kernel_google_redbull",
+     "target_path": "kernel/google/redbull"
+   }
+]
--- a/extract-files.py
+++ b/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}/redfin"
-./extract-files.py $@
-popd
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2023 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=redfin
+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}/../../.."
+
+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
+
+KANG=
+SECTION=
+
+while [ "${#}" -gt 0 ]; do
+    case "${1}" in
+        -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)
+        sed -i -e '$a00000018,1' -e '/^00000014/d' -e '/^00000015/d' "${2}"
+        ;;
+    # Fix typo in qcrilmsgtunnel whitelist
+    product/etc/sysconfig/nexus.xml)
+        sed -i 's/qulacomm/qualcomm/' "${2}"
+        ;;
+    esac
+}
+
+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}"
+
+extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+extract "${MY_DIR}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+
+if [ -z "${SECTION}" ]; then
+    extract_firmware "${MY_DIR}/proprietary-firmware.txt" "${SRC}"
+fi
+
+"${MY_DIR}/setup-makefiles.sh"
--- a/init.hardware.wlc.rc.userdebug
+++ b/init.hardware.wlc.rc.userdebug
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2018 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.
+#
+
+on property:sys.boot_completed=1 && property:persist.vendor.limit.wlc.current=1
+    write /sys/class/power_supply/dc/current_max 75000
+
+on property:sys.boot_completed=1 && property:persist.vendor.limit.wlc.current=0
+    write /sys/class/power_supply/dc/current_max 1100000
+
+on property:vendor.disable.wlc=1
+    write /sys/class/power_supply/wireless/online 0
--- a/lineage_redfin.mk
+++ b/lineage_redfin.mk
@@ -13,32 +13,19 @@ $(call inherit-product, device/google/redbull/lineage_common.mk)

 include device/google/redfin/device-lineage.mk

+EVO_BUILD_TYPE := Official
+TARGET_BOOT_ANIMATION_RES := 1080
+WITH_GMS := true
+
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 5
 PRODUCT_NAME := lineage_redfin

-# Boot animation
-TARGET_SCREEN_HEIGHT := 2340
-TARGET_SCREEN_WIDTH := 1080
-
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="redfin-user 14 UP1A.231105.001.B2 11260668 release-keys" \
-    BuildFingerprint=google/redfin/redfin:14/UP1A.231105.001.B2/11260668:user/release-keys \
-    DeviceProduct=redfin
+    TARGET_PRODUCT=redfin \
+    PRIVATE_BUILD_DESC="redfin-user 14 UP1A.231105.001.B2 11260668 release-keys"

-ifeq ($(WITH_GMS),true)
-TARGET_USES_MINI_GAPPS := true
-
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
-    system/app/GoogleExtShared/GoogleExtShared.apk \
-    system/app/GooglePrintRecommendationService/GooglePrintRecommendationService.apk \
-    system/etc/permissions/privapp-permissions-google.xml \
-    system/priv-app/DocumentsUIGoogle/DocumentsUIGoogle.apk \
-    system/priv-app/TagGoogle/TagGoogle.apk
-endif
-
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
-    system/priv-app/OmniStyle/OmniStyle.apk
+BUILD_FINGERPRINT := google/redfin/redfin:14/UP1A.231105.001.B2/11260668:user/release-keys

 $(call inherit-product, vendor/google/redfin/redfin-vendor.mk)
--- a/redfin/proprietary-files-carriersettings.txt
+++ b/redfin/proprietary-files-carriersettings.txt
@@ -1,4 +1,4 @@
-# All blobs below are extracted from the release mentioned in proprietary-files.txt
+# All blobs are extracted from Google factory images for each new ASB
 product/etc/CarrierSettings/1and1_de.pb
 product/etc/CarrierSettings/2degrees_nz.pb
 product/etc/CarrierSettings/a1_at.pb
--- a/redfin/proprietary-files-vendor.txt
+++ b/redfin/proprietary-files-vendor.txt
@@ -1,5 +1,4 @@
-# All blobs below are extracted from the release mentioned in proprietary-files.txt
-
+# All blobs are extracted from Google factory images for each new ASB
 vendor/app/CACertService/CACertService.apk
 vendor/app/CneApp/CneApp.apk;REQUIRED=CneApp.libvndfwk_detect_jni.qti_symlink
 vendor/app/IWlanService/IWlanService.apk
@@ -55,6 +54,7 @@ vendor/bin/imsdatadaemon
 vendor/bin/imsqmidaemon
 vendor/bin/imsrcsd
 vendor/bin/init.qti.chg_policy.sh
+vendor/bin/ipacm
 vendor/bin/irsc_util
 vendor/bin/loc_launcher
 vendor/bin/lowi-server
@@ -197,6 +197,7 @@ vendor/dsp/cdsp/libvpt_action_recognition.so
 vendor/dsp/cdsp/libvpt_preproc.so
 vendor/dsp/cdsp/libvpt_preproc_postproc.so
 vendor/dsp/cdsp/ubwcdma_dynlib.so
+vendor/etc/IPACM_cfg.xml
 vendor/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb
 vendor/etc/acdbdata/MTP/MTP_General_cal.acdb
 vendor/etc/acdbdata/MTP/MTP_Global_cal.acdb
@@ -282,7 +283,6 @@ vendor/etc/gpfspath_oem_config.xml
 vendor/etc/init/android.hardware.authsecret-service.citadel.rc
 vendor/etc/init/android.hardware.biometrics.fingerprint@2.2-service.fpc.rc
 vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
-vendor/etc/init/android.hardware.camera.provider@2.7-service-google.rc
 vendor/etc/init/android.hardware.confirmationui@1.0-service-google.rc
 vendor/etc/init/android.hardware.drm-service.widevine-v17.rc
 vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc
@@ -308,6 +308,7 @@ vendor/etc/init/init-ramoops.rc
 vendor/etc/init/init.time_daemon.rc
 vendor/etc/init/init.vendor.sensors.rc
 vendor/etc/init/init_citadel.rc
+vendor/etc/init/ipacm.rc
 vendor/etc/init/netmgrd.rc
 vendor/etc/init/port-bridge.rc
 vendor/etc/init/qcrild.rc
@@ -408,13 +409,14 @@ vendor/etc/sensors/config/sns_smd.json
 vendor/etc/sensors/config/sns_tilt.json
 vendor/etc/sensors/config/tcs3701.json
 vendor/etc/sensors/hals.conf
+vendor/etc/sensors/proto/sns_direct_channel.proto
+vendor/etc/sensors/proto/sns_formatter_notify.proto
 vendor/etc/sensors/sns_reg_config
 vendor/etc/ssg/ta_config.json
 vendor/etc/ssg/tz_whitelist.json
 vendor/etc/thermal.mps
 vendor/etc/twoshay_config.json
 vendor/etc/vintf/manifest/android.hardware.authsecret-service.citadel.xml
-vendor/etc/vintf/manifest/android.hardware.camera.provider@2.7-service-google.xml
 vendor/etc/vintf/manifest/android.hardware.confirmationui@1.0-service-google.xml
 vendor/etc/vintf/manifest/android.hardware.identity.strongbox.xml
 vendor/etc/vintf/manifest/android.hardware.keymaster@4.1-service.citadel.xml
@@ -636,12 +638,32 @@ vendor/lib/lib-rtpcore.so
 vendor/lib/lib-rtpsl.so
 vendor/lib/lib-siputility.so
 vendor/lib/lib-uceservice.so
+vendor/lib/libAlacSwDec.so
+vendor/lib/libApeSwDec.so
 vendor/lib/libC2D2.so
 vendor/lib/libCB.so
+vendor/lib/libFlacSwDec.so
 vendor/lib/libGPQTEEC_vendor.so
 vendor/lib/libGPTEE_vendor.so
 vendor/lib/libGPreqcancel.so
 vendor/lib/libGPreqcancel_svc.so
+vendor/lib/libI420colorconvert.so
+-vendor/lib/libMpeg4SwEncoder.so
+vendor/lib/libMpeghSwEnc.so
+vendor/lib/libOmxAacDec.so
+vendor/lib/libOmxAlacDec.so
+vendor/lib/libOmxAlacDecSw.so
+vendor/lib/libOmxAmrDec.so
+vendor/lib/libOmxAmrwbplusDec.so
+vendor/lib/libOmxApeDec.so
+vendor/lib/libOmxApeDecSw.so
+vendor/lib/libOmxDsdDec.so
+vendor/lib/libOmxEvrcDec.so
+vendor/lib/libOmxG711Dec.so
+vendor/lib/libOmxMpeghDecSw.so
+vendor/lib/libOmxMpeghEncSw.so
+vendor/lib/libOmxQcelp13Dec.so
+vendor/lib/libOmxWmaDec.so
 vendor/lib/libOpenCL-pixel.so
 vendor/lib/libOpenCL.so
 vendor/lib/libQSEEComAPI.so
@@ -662,7 +684,7 @@ vendor/lib/libadm.so
 vendor/lib/libadpcmdec.so
 vendor/lib/libadreno_utils.so
 vendor/lib/libadsp_default_listener.so
-vendor/lib/libadsprpc.so
+-vendor/lib/libadsprpc.so
 vendor/lib/libaoa.so
 vendor/lib/libash.so
 vendor/lib/libasn1cper.so
@@ -722,12 +744,13 @@ vendor/lib/libdpps.so
 vendor/lib/libdrc.so
 vendor/lib/libdrmfs.so
 vendor/lib/libdrmtime.so
+vendor/lib/libdsd2pcm.so
 vendor/lib/libdsi_netctrl.so
 vendor/lib/libdsutils.so
 vendor/lib/libexthwplugin.so
 vendor/lib/libfastcrc.so
 vendor/lib/libfastcvdsp_stub.so
-vendor/lib/libfastcvopt.so
+-vendor/lib/libfastcvopt.so
 vendor/lib/libgcs-calwrapper.so
 vendor/lib/libgcs-ipc.so
 vendor/lib/libgcs-osal.so
@@ -979,7 +1002,7 @@ vendor/lib/vendor.qti.hardware.soter@1.0.so
 vendor/lib/vendor.qti.hardware.trustedui@1.0.so
 vendor/lib/vendor.qti.hardware.trustedui@1.1.so
 vendor/lib/vendor.qti.hardware.trustedui@1.2.so
-vendor/lib/vendor.qti.hardware.tui_comm@1.0.so;MODULE_SUFFIX=_vendor
+vendor/lib/vendor.qti.hardware.tui_comm@1.0.so
 vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so
 vendor/lib/vendor.qti.hardware.wigig.netperftuner@1.0.so
 vendor/lib/vendor.qti.ims.callcapability@1.0.so
@@ -991,7 +1014,7 @@ vendor/lib/vendor.qti.ims.rcsconfig@1.1.so
 vendor/lib/vendor.qti.ims.rcsconfig@2.0.so
 vendor/lib/vendor.qti.ims.rcsconfig@2.1.so
 vendor/lib/vendor.qti.imsrtpservice@3.0-service-Impl.so
-vendor/lib/vendor.qti.imsrtpservice@3.0.so;MODULE_SUFFIX=_vendor
+vendor/lib/vendor.qti.imsrtpservice@3.0.so
 vendor/lib/vendor.qti.latency@2.0.so
 vendor/lib/vendor.qti.latency@2.1.so
 vendor/lib/vendor.qti.latency@2.2.so
@@ -1159,12 +1182,30 @@ vendor/lib64/lib-rtpcore.so
 vendor/lib64/lib-rtpsl.so
 vendor/lib64/lib-siputility.so
 vendor/lib64/lib-uceservice.so
+vendor/lib64/libAlacSwDec.so
+vendor/lib64/libApeSwDec.so
 vendor/lib64/libC2D2.so
 vendor/lib64/libCB.so
+vendor/lib64/libFlacSwDec.so
 vendor/lib64/libGPQTEEC_vendor.so
 vendor/lib64/libGPTEE_vendor.so
 vendor/lib64/libGPreqcancel.so
 vendor/lib64/libGPreqcancel_svc.so
+vendor/lib64/libI420colorconvert.so
+-vendor/lib64/libMpeg4SwEncoder.so
+vendor/lib64/libMpeghSwEnc.so
+vendor/lib64/libOmxAacDec.so
+vendor/lib64/libOmxAlacDec.so
+vendor/lib64/libOmxAlacDecSw.so
+vendor/lib64/libOmxAmrDec.so
+vendor/lib64/libOmxAmrwbplusDec.so
+vendor/lib64/libOmxApeDec.so
+vendor/lib64/libOmxApeDecSw.so
+vendor/lib64/libOmxEvrcDec.so
+vendor/lib64/libOmxG711Dec.so
+vendor/lib64/libOmxMpeghEncSw.so
+vendor/lib64/libOmxQcelp13Dec.so
+vendor/lib64/libOmxWmaDec.so
 vendor/lib64/libOpenCL-pixel.so
 vendor/lib64/libOpenCL.so
 vendor/lib64/libQSEEComAPI.so
@@ -1178,8 +1219,6 @@ vendor/lib64/libVkLayer_q3dtools.so
 vendor/lib64/lib_aion_buffer.so
 vendor/lib64/lib_goog_chi_node_utils.so
 vendor/lib64/lib_goog_metadata_utils.so
-vendor/lib64/lib_profiler.so
-vendor/lib64/lib_sensor_listener.so
 vendor/lib64/liba2dpoffload.so
 vendor/lib64/libacdb-fts.so
 vendor/lib64/libacdbloader.so
@@ -1187,7 +1226,7 @@ vendor/lib64/libacdbrtac.so
 vendor/lib64/libadiertac.so
 vendor/lib64/libadreno_utils.so
 vendor/lib64/libadsp_default_listener.so
-vendor/lib64/libadsprpc.so
+-vendor/lib64/libadsprpc.so
 vendor/lib64/libaoa.so
 vendor/lib64/libash.so
 vendor/lib64/libasn1cper.so
@@ -1258,7 +1297,7 @@ vendor/lib64/libdysco_core.so
 vendor/lib64/libembmsservice.so
 vendor/lib64/libexthwplugin.so
 vendor/lib64/libfastcvdsp_stub.so
-vendor/lib64/libfastcvopt.so
+-vendor/lib64/libfastcvopt.so
 vendor/lib64/libg3a_gabc.so
 vendor/lib64/libg3a_gaf_v3.so
 vendor/lib64/libg3a_ghawb.so
@@ -1305,6 +1344,7 @@ vendor/lib64/libhexagon_nn_stub.so
 vendor/lib64/libhfp.so
 vendor/lib64/libhta_hexagon_runtime.so
 vendor/lib64/libidl.so
+vendor/lib64/libipanat.so
 vendor/lib64/libipebpsstriping.so
 vendor/lib64/libizat_core.so
 vendor/lib64/libjnihelper.so
@@ -1349,6 +1389,7 @@ vendor/lib64/libnosprotos.so
 vendor/lib64/libnpu.so
 vendor/lib64/liboemcrypto.so
 vendor/lib64/libofflinelog.so
+vendor/lib64/liboffloadhal.so
 vendor/lib64/libopenvx.so
 vendor/lib64/libops.so
 vendor/lib64/libos.so
@@ -1439,7 +1480,7 @@ vendor/lib64/libswvdec.so
 vendor/lib64/libsynx.so
 vendor/lib64/libsysmon_cdsp_skel.so
 vendor/lib64/libsystem_health_mon.so
-vendor/lib64/libthermalclient.so
+-vendor/lib64/libthermalclient.so
 vendor/lib64/libthermallistener.so
 vendor/lib64/libthreadutils.so
 vendor/lib64/libtime_genoff.so
@@ -1571,7 +1612,7 @@ vendor/lib64/vendor.qti.hardware.soter@1.0.so
 vendor/lib64/vendor.qti.hardware.trustedui@1.0.so
 vendor/lib64/vendor.qti.hardware.trustedui@1.1.so
 vendor/lib64/vendor.qti.hardware.trustedui@1.2.so
-vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so;MODULE_SUFFIX=_vendor
+vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so
 vendor/lib64/vendor.qti.hardware.vpp@1.1.so
 vendor/lib64/vendor.qti.hardware.vpp@1.2.so
 vendor/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so
@@ -1585,7 +1626,7 @@ vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so
 vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so
 vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so
 vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so
-vendor/lib64/vendor.qti.imsrtpservice@3.0.so;MODULE_SUFFIX=_vendor
+vendor/lib64/vendor.qti.imsrtpservice@3.0.so
 vendor/lib64/vendor.qti.latency@2.0.so
 vendor/lib64/vendor.qti.latency@2.1.so
 vendor/lib64/vendor.qti.latency@2.2.so
--- a/redfin/proprietary-files.txt
+++ b/redfin/proprietary-files.txt
@@ -102,15 +102,15 @@ product/priv-app/WfcActivation/WfcActivation.apk;PRESIGNED
 system_ext/etc/permissions/com.google.android.camera.extensions.xml
 system_ext/framework/com.google.android.camera.extensions.jar

-# HBM
-system_ext/priv-app/HbmSVManager/HbmSVManager.apk
+# HBM - from barbet AP2A.240605.024
+system_ext/priv-app/HbmSVManager/HbmSVManager.apk|c1a7aa6051cc79b98e2241711953d148f391eb63

 # Hotword
 system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
 system_ext/framework/com.android.hotwordenrollment.common.util.jar

-# Permissions - from barbet AP2A.240805.005
-system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-lineage.xml|c1d5e4252e534432d2f204b8f0196b7b9f79025e
+# Permissions
+system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-lineage.xml

 # Qualcomm IMS
 system_ext/etc/permissions/org_codeaurora_ims.xml
@@ -154,8 +154,8 @@ system_ext/priv-app/EuiccSupportPixelPermissions/EuiccSupportPixelPermissions.ap
 system_ext/priv-app/RilConfigService/RilConfigService.apk
 system_ext/priv-app/grilservice/grilservice.apk;PRESIGNED

-# Radio - from barbet AP2A.240805.005
-system_ext/priv-app/ConnectivityThermalPowerManager/ConnectivityThermalPowerManager.apk|682ec8729ecb0f80a173cfa28d970678d14731ed
+# Radio - from barbet AP1A.240405.002
+system_ext/priv-app/ConnectivityThermalPowerManager/ConnectivityThermalPowerManager.apk|7624c30babbbe250f0e557a2566c22fac9c9d303

 # SecureUI
 system_ext/app/com.qualcomm.qti.services.secureui/com.qualcomm.qti.services.secureui.apk
@@ -169,3 +169,11 @@ system_ext/etc/permissions/vzw_mvs_permissions.xml
 system_ext/priv-app/MyVerizonServices/MyVerizonServices.apk;PRESIGNED
 system_ext/priv-app/OBDM_Permissions/OBDM_Permissions.apk;PRESIGNED
 system_ext/priv-app/obdm_stub/obdm_stub.apk;PRESIGNED
+
+# vendor partition
+
+# Wi-Fi service - from barbet AP2A.240605.024
+vendor/bin/hw/vendor.google.wifi_ext-service-vendor|2f00a17b75612cbf8fb3685fe0d183148a70dd03
+vendor/etc/init/vendor.google.wifi_ext-service.rc|8565ca57da131819441d6fb87abfcae134ed2ef9
+vendor/etc/vintf/manifest/manifest_wifi_ext_aidl.xml|f273a6ab68268f73935c36bdecea0aad97cbe70f
+vendor/lib64/vendor.google.wifi_ext-V3-ndk.so|9fcddf2e1eab7978f6c57270170b3f4a9aea04b8
--- a/redfin/proprietary-firmware.txt
+++ b/redfin/proprietary-firmware.txt
--- a/redfin/AndroidBoard.mk
+++ b/redfin/AndroidBoard.mk
@@ -0,0 +1,26 @@
+LOCAL_PATH := $(call my-dir)
+
+#A/B builds require us to create the mount points at compile time.
+#Just creating it for all cases since it does not hurt.
+FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware_mnt
+ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT)
+
+$(FIRMWARE_MOUNT_POINT):
+	@echo "Creating $(FIRMWARE_MOUNT_POINT)"
+	@mkdir -p $(TARGET_OUT_VENDOR)/firmware_mnt
+
+# copy kernel headers to the build tree
+$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr: $(wildcard $(PRODUCT_VENDOR_KERNEL_HEADERS)/*)
+	rm -rf $@
+	mkdir -p $@/include
+	cp -a $(PRODUCT_VENDOR_KERNEL_HEADERS)/. $@/include
+
+#----------------------------------------------------------------------
+# build and sign the final stage of bootloader
+#----------------------------------------------------------------------
+.PHONY: aboot
+ifeq ($(USESECIMAGETOOL), true)
+aboot: gensecimage_target gensecimage_install
+else
+aboot: $(INSTALLED_BOOTLOADER_MODULE)
+endif
--- a/redfin/HbmSVManager.patch
+++ b/redfin/HbmSVManager.patch
@@ -1,67 +0,0 @@
--- a/smali/com/android/hbmsvmanager/filter/AmbientFilterFactory.smali
-+++ b/smali/com/android/hbmsvmanager/filter/AmbientFilterFactory.smali
-@@ -35,14 +35,22 @@
- .method public static createBrightnessFilter(Ljava/lang/String;Landroid/content/res/Resources;)Lcom/android/hbmsvmanager/filter/AmbientFilter;
-     .locals 2
- 
-    const v0, 0x10e005f
-+    const v0, 0
-+
-+    invoke-static {p1}, Lcom/android/hbmsvmanager/filter/AmbientFilterFactory;->getFilterHorizonIdentifier(Landroid/content/res/Resources;)I
-+
-+    move-result v0
- 
-     .line 53
-     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getInteger(I)I
- 
-     move-result v0
- 
-    const v1, 0x10500b4
-+    const v1, 0
-+
-+    invoke-static {p1}, Lcom/android/hbmsvmanager/filter/AmbientFilterFactory;->getFilterInterceptIdentifier(Landroid/content/res/Resources;)I
-+
-+    move-result v1
- 
-     .line 60
-     invoke-static {p1, v1}, Lcom/android/hbmsvmanager/filter/AmbientFilterFactory;->getFloat(Landroid/content/res/Resources;I)F
-@@ -89,3 +97,39 @@
- 
-     return p0
- .end method
-+
-+.method private static getFilterHorizonIdentifier(Landroid/content/res/Resources;)I
-+    .registers 4
-+    .param p0, "resources"    # Landroid/content/res/Resources;
-+
-+    .line 7
-+    const-string v0, "integer"
-+
-+    const-string v1, "android"
-+
-+    const-string v2, "config_displayWhiteBalanceBrightnessFilterHorizon"
-+
-+    invoke-virtual {p0, v2, v0, v1}, Landroid/content/res/Resources;->getIdentifier(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
-+
-+    move-result v0
-+
-+    return v0
-+.end method
-+
-+.method private static getFilterInterceptIdentifier(Landroid/content/res/Resources;)I
-+    .registers 4
-+    .param p0, "resources"    # Landroid/content/res/Resources;
-+
-+    .line 11
-+    const-string v0, "dimen"
-+
-+    const-string v1, "android"
-+
-+    const-string v2, "config_displayWhiteBalanceBrightnessFilterIntercept"
-+
-+    invoke-virtual {p0, v2, v0, v1}, Landroid/content/res/Resources;->getIdentifier(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
-+
-+    move-result v0
-+
-+    return v0
-+.end method
--- a/redfin/extract-files.py
+++ b/redfin/extract-files.py
@@ -1,90 +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.fixups_blob import (
-    blob_fixup,
-    blob_fixups_user_type,
-)
-from extract_utils.fixups_lib import (
-    lib_fixups,
-    lib_fixups_user_type,
-)
-from extract_utils.main import (
-    ExtractUtils,
-    ExtractUtilsModule,
-)
-
-namespace_imports = [
-    'hardware/google/interfaces',
-    'hardware/google/pixel',
-    'hardware/qcom/sm7250/display',
-    'hardware/qcom/sm7250/gps',
-    'hardware/qcom/wlan/legacy',
-    'vendor/qcom/opensource/display',
-]
-
-
-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,
-    (
-        'vendor.qti.hardware.tui_comm@1.0',
-        'vendor.qti.imsrtpservice@3.0',
-    ): lib_fixup_vendor_suffix,
-}
-
-blob_fixups: blob_fixups_user_type = {
-    'product/etc/felica/common.cfg': blob_fixup()
-        .patch_file('osaifu-keitai.patch'),
-    'product/etc/sysconfig/nexus.xml': blob_fixup()
-        .regex_replace('qulacomm', 'qualcomm'),
-    'system_ext/priv-app/HbmSVManager/HbmSVManager.apk': blob_fixup()
-        .apktool_patch('HbmSVManager.patch'),
-    (
-        'vendor/bin/hw/android.hardware.rebootescrow-service.citadel',
-        'vendor/lib64/android.hardware.keymaster@4.1-impl.nos.so',
-    ): blob_fixup()
-        .add_needed('libcrypto_shim.so'),
-    'vendor/lib/libmmcamera_faceproc.so': blob_fixup()
-        .clear_symbol_version('__aeabi_memcpy')
-        .clear_symbol_version('__aeabi_memset')
-        .clear_symbol_version('__gnu_Unwind_Find_exidx'),
-    'vendor/lib64/libgooglecamerahal.so': blob_fixup()
-        .add_needed('libmeminfo_shim.so'),
-}  # fmt: skip
-
-extract_fns: extract_fns_user_type = {
-    pixel_factory_image_regex: extract_pixel_factory_image,
-    pixel_firmware_regex: extract_pixel_firmware,
-}
-
-module = ExtractUtilsModule(
-    'redfin',
-    'google',
-    device_rel_path='device/google/redfin/redfin',
-    blob_fixups=blob_fixups,
-    lib_fixups=lib_fixups,
-    namespace_imports=namespace_imports,
-    add_firmware_proprietary_file=True,
-    extract_fns=extract_fns,
-)
-
-module.add_proprietary_file('proprietary-files-carriersettings.txt')
-module.add_proprietary_file('proprietary-files-vendor.txt')
-
-if __name__ == '__main__':
-    utils = ExtractUtils.device(module)
-    utils.run()
--- a/redfin/osaifu-keitai.patch
+++ b/redfin/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
-
--- a/redfin/overlay-lineage/frameworks/base/packages/SystemUI/res/res/values/config.xml
+++ b/redfin/overlay-lineage/frameworks/base/packages/SystemUI/res/res/values/config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <bool name="config_nfc_conflict_with_usb_audio">true</bool>
+    <bool name="config_nfc_conflict_with_wlc">true</bool>
+    <bool name="config_wlc_support_enabled">true</bool>
+    <string name="config_dockComponent">com.google.android.systemui.dreamliner.WirelessChargerImpl</string>
+</resources>
--- a/redfin/overlay-lineage/packages/apps/Settings/res/values/config.xml
+++ b/redfin/overlay-lineage/packages/apps/Settings/res/values/config.xml
@@ -21,4 +21,9 @@
    <!-- Whether to show Smooth Display feature in Settings Options -->
    <bool name="config_show_smooth_display">true</bool>

+    <!-- Reverse charging -->
+    <bool name="config_show_reverse_charging">true</bool>
+
+    <!-- Wireless charger -->
+    <bool name="config_nfc_conflict_with_wlc">true</bool>
 </resources>
--- a/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -60,7 +60,7 @@
    <bool name="doze_double_tap_reports_touch_coordinates">true</bool>

    <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_default</dimen>

    <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
               to brightness values; -1 means keeping the current brightness. -->
--- a/redfin/setup-makefiles.py
+++ b/redfin/setup-makefiles.py
@@ -1 +0,0 @@
-#!./extract-files.py --regenerate_makefiles
--- a/regen-carriersettings.sh
+++ b/regen-carriersettings.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+#
+# Copyright (C) 2019-2023 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+# 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}/../../.."
+
+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}"
+
+_input_image="${1}"
+_output_file="${2}"
+
+if [ -z "${_input_image}" ]; then
+    echo "No input image supplied"
+    exit 1
+fi
+
+if [ -z "${_output_file}" ]; then
+    echo "No output filename supplied"
+    exit 1
+fi
+
+CARRIER_SKIP_FILES=()
+
+# Initialize the helper
+setup_vendor_deps "${ANDROID_ROOT}"
+
+generate_prop_list_from_image "${_input_image}" "${_output_file}" CARRIER_SKIP_FILES carriersettings
+
+function header() {
+    sed -i "1s/^/${1}\n/" "${_output_file}"
+}
+
+header "# All blobs are extracted from Google factory images for each new ASB"
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
--- a/sepolicy/tracking_denials/dumpstate.te
+++ b/sepolicy/tracking_denials/dumpstate.te
@@ -0,0 +1,2 @@
+# b/277155912
+dontaudit dumpstate default_android_service:service_manager { find };
--- a/sepolicy/vendor/google/vndservice.te
+++ b/sepolicy/vendor/google/vndservice.te
@@ -1 +0,0 @@
-type eco_service,                  vndservice_manager_type;
--- a/sepolicy/vendor/google/vndservice_contexts
+++ b/sepolicy/vendor/google/vndservice_contexts
@@ -1 +0,0 @@
-media.ecoservice                        u:object_r:eco_service:s0
--- a/setup-makefiles.py
+++ b/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}/redfin"
-./setup-makefiles.py
-popd
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2023 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=redfin
+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}/../../.."
+
+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}"
+
+# Initialize the helper
+setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
+
+# Warning headers and guards
+write_headers
+
+write_makefiles "${MY_DIR}/proprietary-files.txt" true
+write_makefiles "${MY_DIR}/proprietary-files-carriersettings.txt" true
+write_makefiles "${MY_DIR}/proprietary-files-vendor.txt" true
+
+append_firmware_calls_to_makefiles "${MY_DIR}/proprietary-firmware.txt"
+
+# Finish
+write_footers
--- a/vibrator/OWNERS
+++ b/vibrator/OWNERS
@@ -1 +1,3 @@
-file:platform/hardware/google/pixel:/vibrator/OWNERS
+chasewu@google.com
+eliptus@google.com
+michaelwr@google.com
--- a/wireless_charger/wireless_charger.mk
+++ b/wireless_charger/wireless_charger.mk
@@ -1,4 +1,5 @@
 # This wireless_charger folder is used to keep the compatibility for later google devices
+PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces
 PRODUCT_PACKAGES += vendor.google.wireless_charger-default
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/redfin/wireless_charger/compatibility_matrix.xml
Author	SHA1	Message	Date
Joey Huab	89153d5280	redfin: Set `status_bar_header_height_keyguard` to `status_bar_height_default` value	2025-01-27 01:45:44 +09:00
sukrut-kelkaarr	6a1e80bcf5	Merge branch 'lineage-21' of https://github.com/LineageOS/android_device_google_redfin into udc	2024-07-27 11:05:33 +05:30
jhenrique09	f4f7683e3d	redfin: Enable wireless charger and dreamliner overlays Signed-off-by: Sukrut4778 <sukrut4778@gmail.com>	2024-05-14 19:25:22 +05:30
Sukrut4778	05a443c84a	redfin: Initialize for Evolution X 9.x Signed-off-by: Sukrut4778 <sukrut4778@gmail.com>	2024-05-04 10:35:34 +05:30
				`@@ -1 +0,0 @@`
				`#!./extract-files.py --regenerate_makefiles`