akita: Initialize for Evolution X 9.x

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

Android.mk

@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2011 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.
+#
+
+# WARNING: Everything listed here will be built on ALL platforms,
+# including x86, the universal, and the SDK.  Modules must be uniquely
+# named (liblights.panda), and must build everywhere, or limit themselves
+# to only building on ARM if they include assembly. Individual makefiles
+# are responsible for having their own logic, for fine-grained control.
+
+LOCAL_PATH := $(call my-dir)
+
+# if some modules are built directly from this directory (not subdirectories),
+# their rules should be written here.
+
+ifneq (,$(filter $(TARGET_DEVICE),akita))
+  include $(call all-makefiles-under,$(LOCAL_PATH))
+endif

AndroidProducts.mk

@@ -16,7 +16,6 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_akita.mk \
-    $(LOCAL_DIR)/aosp_akita_16k.mk \
     $(LOCAL_DIR)/aosp_akita_fullmte.mk \
     $(LOCAL_DIR)/factory_akita.mk \
     $(LOCAL_DIR)/lineage_akita.mk

BoardConfigEvolution.mk

@@ -1,4 +1,5 @@
 #
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# Copyright (C) 2024 The Evolution X Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #

BoardConfigLineage.mk

@@ -1,13 +1,7 @@
 #
-# 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_PRODUCT_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/aam_compatibility_matrix.xml
-
-# 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)))
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/akita/aam_compatibility_matrix.xml

OWNERS

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

akita/Android.bp

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

akita/BoardConfig.mk

@@ -18,7 +18,6 @@
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 
 # The modules which need to be loaded in sequential
-BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
 BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1
@@ -28,9 +27,13 @@ RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_AKITA_RADIOCFG_DIR)
 
 TARGET_BOARD_INFO_FILE := device/google/akita/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := akita
-RELEASE_GOOGLE_BOOTLOADER_AKITA_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_AKITA_DIR)
-$(call soong_config_set,akita_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_AKITA_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
 TARGET_SCREEN_DENSITY := 420
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_AKITA := true
@@ -39,16 +42,9 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on
 
 include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
-include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/akita/proprietary/BoardConfigVendor.mk
 include device/google/akita/sepolicy/akita-sepolicy.mk
 include device/google/akita/wifi/BoardConfig-wifi.mk
 
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
--include device/google/common/etm/5_15/BoardUserdebugModules.mk
-endif
-
-DEVICE_PATH := device/google/akita
-VENDOR_PATH := vendor/google/akita
-include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
-include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
+include device/google/akita/akita/BoardConfigLineage.mk
+include device/google/akita/akita/BoardConfigEvolution.mk

akita/BoardConfigEvolution.mk

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

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

akita/device-evolution.mk

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

akita/device-lineage.mk

@@ -1,18 +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
 #
 
-$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
+TARGET_VENDOR_PROP += device/google/akita/akita/vendor.prop
 
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
-
-PRODUCT_PACKAGES += \
-    PixelDisplayServiceOverlayAkita
-
-TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop
-
-# Init
-PRODUCT_PACKAGES += \
-    init.recovery.akita.touch.rc
+$(call inherit-product, device/google/akita/device-lineage.mk)

akita/extract-files.py

@@ -1,98 +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_fixups,
-    lib_fixups_user_type,
-)
-from extract_utils.main import (
-    ExtractUtils,
-    ExtractUtilsModule,
-)
-
-namespace_imports = [
-    'device/google/akita',
-    'hardware/google/av',
-    'hardware/google/gchips',
-    'hardware/google/graphics/common',
-    'hardware/google/interfaces',
-    'hardware/google/pixel',
-]
-
-
-def lib_fixup_vendor_suffix(lib: str, partition: str, *args, **kwargs):
-    return f'{lib}_{partition}' if partition == 'vendor' else None
-
-
-lib_fixups: lib_fixups_user_type = {
-    **lib_fixups,
-    (
-        'com.google.edgetpu_app_service-V4-ndk',
-        'com.google.edgetpu_vendor_service-V2-ndk',
-        'vendor.google.whitechapel.audio.audioext@4.0',
-        'vendor.google.whitechapel.audio.extension-V4-ndk',
-    ): lib_fixup_vendor_suffix,
-}
-
-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(
-    'akita',
-    'google',
-    device_rel_path='device/google/akita/akita',
-    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):
-    module_suffix_file_paths = [
-        'vendor/lib64/com.google.edgetpu_app_service-V4-ndk.so',
-        'vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so',
-        'vendor/lib64/vendor.google.whitechapel.audio.audioext@4.0.so',
-        'vendor/lib64/vendor.google.whitechapel.audio.extension-V4-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()

akita/extract-files.sh

@@ -0,0 +1,133 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=akita
+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
+
+    # libExynosC2*Dec & libExynosC2*Enc depend on libacryl & libexynosv4l2, which are gnu makefile targets
+    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/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"

akita/init.recovery.touch.rc

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

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

akita/overlay/frameworks/base/core/res/res/values-mcc310/config.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2024, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Whether safe headphone volume is enabled or not (country specific). -->
-    <bool name="config_safe_media_volume_enabled">true</bool>
-
-</resources>

akita/overlay/frameworks/base/core/res/res/values-mcc311/config.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2024, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Whether safe headphone volume is enabled or not (country specific). -->
-    <bool name="config_safe_media_volume_enabled">true</bool>
-
-</resources>

akita/overlay/frameworks/base/core/res/res/values-mcc312/config.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2024, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Whether safe headphone volume is enabled or not (country specific). -->
-    <bool name="config_safe_media_volume_enabled">true</bool>
-
-</resources>

akita/overlay/frameworks/base/core/res/res/values-mcc313/config.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2024, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Whether safe headphone volume is enabled or not (country specific). -->
-    <bool name="config_safe_media_volume_enabled">true</bool>
-
-</resources>

akita/overlay/frameworks/base/core/res/res/values-mcc314/config.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2024, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Whether safe headphone volume is enabled or not (country specific). -->
-    <bool name="config_safe_media_volume_enabled">true</bool>
-
-</resources>

akita/overlay/frameworks/base/core/res/res/values-mcc315/config.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2024, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Whether safe headphone volume is enabled or not (country specific). -->
-    <bool name="config_safe_media_volume_enabled">true</bool>
-
-</resources>

akita/overlay/frameworks/base/core/res/res/values-mcc316/config.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2024, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Whether safe headphone volume is enabled or not (country specific). -->
-    <bool name="config_safe_media_volume_enabled">true</bool>
-
-</resources>

akita/proprietary-files-carriersettings.txt

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

akita/proprietary-files.txt

@@ -4,8 +4,8 @@
 
 # AiAi
 product/priv-app/AICorePrebuilt/AICorePrebuilt.apk;PRESIGNED
-product/priv-app/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01.apk;PRESIGNED
-product/priv-app/DevicePersonalizationPrebuiltPixel2023-U.32_V.7_playstore_aiai_20240725.00_RC08/DevicePersonalizationPrebuiltPixel2023-U.32_V.7_playstore_aiai_20240725.00_RC08.apk;PRESIGNED
+product/priv-app/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore.apk;PRESIGNED
+product/priv-app/DevicePersonalizationPrebuiltPixel2023-v.U.14.playstore/DevicePersonalizationPrebuiltPixel2023-v.U.14.playstore.apk;PRESIGNED
 
 # Audio
 product/etc/ambient/matcher_tah.leveldb
@@ -21,11 +21,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
@@ -60,7 +55,6 @@ product/etc/sysconfig/pixel_experience_2022.xml
 product/etc/sysconfig/pixel_experience_2022_midyear.xml
 product/etc/sysconfig/pixel_experience_2023.xml
 product/etc/sysconfig/pixel_experience_2023_midyear.xml
-product/etc/sysconfig/pixel_experience_2024_midyear.xml
 
 # Radio
 product/etc/permissions/com.android.sdm.plugins.connmo.xml
@@ -68,7 +62,7 @@ product/etc/permissions/com.android.sdm.plugins.dcmo.xml
 product/etc/permissions/com.android.sdm.plugins.diagmon.xml
 product/lib64/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmengine.so
 product/lib64/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmjavaplugin.so
-product/priv-app/CarrierSettings_signed_51.0.707712815/CarrierSettings_signed_51.0.707712815.apk;PRESIGNED
+product/priv-app/CarrierSettings_signed_45.0.591154042/CarrierSettings_signed_45.0.591154042.apk;PRESIGNED
 product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
 product/priv-app/ConnMO/ConnMO.apk
 product/priv-app/DCMO/DCMO.apk
@@ -89,33 +83,14 @@ product/priv-app/AppDirectedSMSService/AppDirectedSMSService.apk;PRESIGNED
 product/priv-app/OemDmTrigger/OemDmTrigger.apk
 product/priv-app/WfcActivation/WfcActivation.apk;PRESIGNED
 
-# system partition
-
-# IMS
-system/bin/oem-iptables-init.sh
-
 # system_ext partition
 
-# Audio
-system_ext/bin/hw/vendor.google.whitechapel.audio.hal.parserservice
-system_ext/etc/init/vendor.google.whitechapel.audio.hal.parserservice.rc
-
 # Camera extensions
 system_ext/etc/permissions/com.google.android.camera.extensions.xml
 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
-
 # Display
 system_ext/lib64/libpixeldisplaymanager_jni.so;SYMLINK=system_ext/priv-app/PixelDisplayService/lib/arm64/libpixeldisplaymanager_jni.so
 system_ext/priv-app/PixelDisplayService/PixelDisplayService.apk
@@ -125,8 +100,9 @@ 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/lib64/com.google.edgetpu_app_service-V4-ndk.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
 
 # Hotword
 system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
@@ -137,19 +113,10 @@ system_ext/etc/permissions/com.android.qns.xml
 system_ext/etc/permissions/com.shannon.imsservice.xml
 system_ext/etc/permissions/com.shannon.rcsservice.xml
 system_ext/lib64/libmediaadaptor.so
-system_ext/lib64/libpixelimsmedia.so
-system_ext/lib64/vendor.google.whitechapel.audio.audioext@4.0.so
-system_ext/lib64/vendor.google.whitechapel.audio.extension-V4-ndk.so
-system_ext/priv-app/PixelImsMediaService/PixelImsMediaService.apk
 system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk
 system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED
 system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED
 
-# IWLAN
-system_ext/etc/permissions/privapp-permlist_com.google.pixel.iwlan.xml
-system_ext/etc/sysconfig/sysconfig_com.google.pixel.iwlan.xml
-system_ext/priv-app/PixelIwlan/PixelIwlan.apk
-
 # Permissions
 system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-evolution.xml
 

akita/rro_overlays/PixelDisplayServiceOverlay/Android.bp

@@ -1,9 +0,0 @@
-//
-// Copyright (C) 2024 The Android Open Source Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "PixelDisplayServiceOverlayAkita",
-    product_specific: true,
-}

akita/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2024 The Android Open Source Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.pixeldisplayservice.overlay.akita">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="1"
-        android:targetPackage="com.android.pixeldisplayservice" />
-</manifest>

akita/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2024 The Android Open Source Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources>
-    <array name="config_za_compensation_brightness_thresholds_list">
-        <item>@array/config_za_primary_display_brightness_thresholds_list</item>
-    </array>
-    <array name="config_za_compensation_images_list">
-        <item>@array/config_za_primary_display_compensation_images_list</item>
-    </array>
-    <array name="config_za_compensation_opr_thresholds">
-        <item>0.4</item>
-    </array>
-    <array name="config_za_compensation_with_shadow_compensation_images">
-        <item>@drawable/SCI_0_cal0</item>
-        <item>@drawable/SCI_1_cal0</item>
-        <item>@drawable/SCI_2_cal0</item>
-        <item>@drawable/SCI_3_cal0</item>
-        <item>@drawable/SCI_4_cal0</item>
-        <item>@drawable/SCI_5_cal0</item>
-    </array>
-    <integer-array name="config_za_compensation_with_shadow_compensation_thresholds">
-        <item>7000</item>
-        <item>10000</item>
-        <item>35000</item>
-        <item>50000</item>
-        <item>80000</item>
-        <item>100000</item>
-    </integer-array>
-    <array name="config_za_primary_display_brightness_thresholds_list">
-        <item>@array/config_za_primary_display_condition1_brightness_thresholds</item>
-        <item>@array/config_za_primary_display_condition2_brightness_thresholds</item>
-    </array>
-    <array name="config_za_primary_display_compensation_images_list">
-        <item>@array/config_za_primary_display_condition1_compensation_images</item>
-        <item>@array/config_za_primary_display_condition2_compensation_images</item>
-    </array>
-    <array name="config_za_primary_display_condition1_brightness_thresholds">
-        <item>0.60714287</item>
-        <item>0.625</item>
-        <item>0.64285713</item>
-        <item>0.66071427</item>
-        <item>0.6785714</item>
-        <item>0.71428573</item>
-        <item>0.75</item>
-        <item>0.85714287</item>
-        <item>0.9285714</item>
-        <item>0.9464286</item>
-        <item>0.96428573</item>
-        <item>0.98214287</item>
-        <item>1.0</item>
-    </array>
-    <array name="config_za_primary_display_condition1_compensation_images">
-        <item>@drawable/ZACI_0_ZA9162</item>
-        <item>@drawable/ZACI_1_ZA8938</item>
-        <item>@drawable/ZACI_2_ZA8712</item>
-        <item>@drawable/ZACI_3_ZA8488</item>
-        <item>@drawable/ZACI_5_ZA8262</item>
-        <item>@drawable/ZACI_6_ZA8150</item>
-        <item>@drawable/ZACI_7_ZA8038</item>
-        <item>@drawable/ZACI_8_ZA7812</item>
-        <item>@drawable/ZACI_9_ZA7700</item>
-        <item>@drawable/ZACI_10_ZA7588</item>
-        <item>@drawable/ZACI_11_ZA7475</item>
-        <item>@drawable/ZACI_12_ZA7362</item>
-        <item>@drawable/ZACI_13_ZA7250</item>
-    </array>
-    <array name="config_za_primary_display_condition2_brightness_thresholds">
-        <item>0.57214284</item>
-        <item>0.75</item>
-        <item>0.78571427</item>
-        <item>0.8214286</item>
-        <item>0.85714287</item>
-        <item>0.9285714</item>
-        <item>0.96428573</item>
-        <item>0.98214287</item>
-        <item>1.0</item>
-    </array>
-    <array name="config_za_primary_display_condition2_compensation_images">
-        <item>@drawable/ZACI_0_ZA9162</item>
-        <item>@drawable/ZACI_1_ZA8938</item>
-        <item>@drawable/ZACI_2_ZA8712</item>
-        <item>@drawable/ZACI_3_ZA8488</item>
-        <item>@drawable/ZACI_4_ZA8375</item>
-        <item>@drawable/ZACI_6_ZA8150</item>
-        <item>@drawable/ZACI_7_ZA8038</item>
-        <item>@drawable/ZACI_8_ZA7812</item>
-        <item>@drawable/ZACI_10_ZA7588</item>
-    </array>
-    <bool name="config_compensation_animation_enabled">true</bool>
-    <item type="dimen" name="config_compensation_filter_intercept">10.0</item>
-    <item type="dimen" name="config_za_compensation_brightness_enter_threshold">0.5</item>
-    <integer name="config_ambient_brightness_changed_debounce_ms">500</integer>
-    <integer name="config_compensation_filter_horizon">1500</integer>
-</resources>

akita/setup-makefiles.py

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

akita/setup-makefiles.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=akita
+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/akita",
+		"hardware/google/av",
+		"hardware/google/gchips",
+		"hardware/google/graphics/common",
+		"hardware/google/interfaces",
+		"hardware/google/pixel",
+EOF
+}
+
+function lib_to_package_fixup_vendor_variants() {
+    if [ "$2" != "vendor" ]; then
+        return 1
+    fi
+
+    case "$1" in
+        com.google.edgetpu_app_service-V3-ndk | \
+            com.google.edgetpu_vendor_service-V2-ndk)
+            echo "$1-vendor"
+            ;;
+        libprotobuf-cpp-full-21.12)
+            echo "libprotobuf-cpp-full"
+            ;;
+        libprotobuf-cpp-lite-21.12)
+            echo "libprotobuf-cpp-lite"
+            ;;
+        libacryl | \
+            libexynosv4l2) ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+function lib_to_package_fixup() {
+    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
+        lib_to_package_fixup_proto_3_9_1 "$1" ||
+        lib_to_package_fixup_vendor_variants "$@"
+}
+
+# Initialize the helper
+setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
+
+# Warning headers and guards
+write_headers
+
+write_makefiles "${MY_DIR}/proprietary-files.txt"
+write_makefiles "${MY_DIR}/proprietary-files-carriersettings.txt"
+write_makefiles "${MY_DIR}/proprietary-files-vendor.txt"
+
+append_firmware_calls_to_makefiles "${MY_DIR}/proprietary-firmware.txt"
+
+# Finish
+write_footers

akita/skip-files-vendor.txt

@@ -5,7 +5,6 @@ bin/acpi
 bin/awk
 bin/base64
 bin/basename
-bin/blkdiscard
 bin/blockdev
 bin/boringssl_self_test64
 bin/brctl
@@ -23,13 +22,11 @@ bin/cksum
 bin/clear
 bin/cmp
 bin/comm
-bin/copy_efs_files_to_data
 bin/cp
 bin/cpio
 bin/cut
 bin/date
 bin/dd
-bin/defrag.f2fs
 bin/devmem
 bin/df
 bin/diff
@@ -37,13 +34,12 @@ bin/dirname
 bin/dmesg
 bin/dos2unix
 bin/du
-bin/dump.f2fs
 bin/dump/dump_aoc
 bin/dump/dump_devfreq
 bin/dump/dump_display
 bin/dump/dump_display_logbuffer
-bin/dump/dump_fingerprint
-bin/dump/dump_modem
+bin/dump/dump_gti0.sh
+bin/dump/dump_modem.sh
 bin/dump/dump_modemlog
 bin/dump/dump_pcie.sh
 bin/dump/dump_perf
@@ -53,11 +49,9 @@ bin/dump/dump_sensors
 bin/dump/dump_soc
 bin/dump/dump_storage
 bin/dump/dump_thermal.sh
-bin/dump/dump_touch.sh
 bin/dump/dump_trusty.sh
 bin/dump/dump_umfw_stat
 bin/dump/dump_wlan.sh
-bin/dump_touch/predump_gti0.sh
 bin/dumpsys
 bin/echo
 bin/egrep
@@ -72,13 +66,11 @@ bin/find
 bin/flock
 bin/fmt
 bin/free
-bin/fsck.f2fs
 bin/fsync
 bin/getconf
 bin/getenforce
 bin/getevent
 bin/getfattr
-bin/getopt
 bin/getprop
 bin/gpiodetect
 bin/gpiofind
@@ -92,13 +84,14 @@ bin/gunzip
 bin/gzip
 bin/head
 bin/hostname
+bin/hw/android.hardware.audio.service
 bin/hw/android.hardware.boot-service.default-pixel
 bin/hw/android.hardware.composer.hwc3-service.pixel
 bin/hw/android.hardware.drm-service.clearkey
 bin/hw/android.hardware.dumpstate-service
 bin/hw/android.hardware.gatekeeper-service.trusty
 bin/hw/android.hardware.gnss-service
-bin/hw/android.hardware.graphics.allocator-V2-service
+bin/hw/android.hardware.graphics.allocator-V1-service
 bin/hw/android.hardware.health-service.zuma
 bin/hw/android.hardware.health.storage-service.default
 bin/hw/android.hardware.memtrack-service.pixel
@@ -107,11 +100,11 @@ bin/hw/android.hardware.power-service.pixel-libperfmgr
 bin/hw/android.hardware.power.stats-service.pixel
 bin/hw/android.hardware.secure_element-service.thales
 bin/hw/android.hardware.security.keymint-service.rust.trusty
-bin/hw/android.hardware.security.secretkeeper.trusty
 bin/hw/android.hardware.sensors-service.multihal
 bin/hw/android.hardware.thermal-service.pixel
 bin/hw/android.hardware.usb-service
 bin/hw/android.hardware.usb.gadget-service
+bin/hw/android.hardware.vibrator-service.cs40l26
 bin/hw/android.hardware.wifi-service
 bin/hw/disable_contaminant_detection.sh
 bin/hw/gnssd
@@ -178,7 +171,6 @@ bin/pidof
 bin/pixelstats-vendor
 bin/pkill
 bin/pmap
-bin/predump_touch.sh
 bin/printenv
 bin/printf
 bin/ps
@@ -188,7 +180,6 @@ bin/readlink
 bin/realpath
 bin/rebalance_interrupts-vendor
 bin/renice
-bin/resize.f2fs
 bin/restorecon
 bin/rm
 bin/rmdir
@@ -234,7 +225,6 @@ bin/timeout
 bin/toolbox
 bin/top
 bin/touch
-bin/touch_gti_ical
 bin/toybox_vendor
 bin/tr
 bin/true
@@ -266,12 +256,14 @@ bin/xargs
 bin/xxd
 bin/yes
 bin/zcat
-boot_otas/boot_ota_16k.zip
-boot_otas/boot_ota_4k.zip
 build.prop
 etc/NOTICE.xml.gz
+etc/a2dp_audio_policy_configuration_7_0.xml
+etc/a2dp_in_audio_policy_configuration_7_0.xml
 etc/aconfig_flags.pb
+etc/aidl/le_audio/aidl_audio_set_configurations.bfbs
 etc/aidl/le_audio/aidl_audio_set_configurations.json
+etc/aidl/le_audio/aidl_audio_set_scenarios.bfbs
 etc/aidl/le_audio/aidl_audio_set_scenarios.json
 etc/aoc/BLUETOOTH.dat
 etc/aoc/HANDSET.dat
@@ -283,8 +275,13 @@ etc/aoc/smartfeature.gstf
 etc/atrace/atrace_categories.txt
 etc/audio_effects.xml
 etc/audio_platform_configuration.xml
+etc/audio_policy_configuration.xml
+etc/audio_policy_configuration_a2dp_offload_disabled.xml
+etc/audio_policy_configuration_bluetooth_legacy_hal.xml
+etc/audio_policy_configuration_le_offload_disabled.xml
 etc/audio_policy_volumes.xml
 etc/bluetooth/bt_vendor_overlay.conf
+etc/bluetooth_audio_policy_configuration_7_0.xml
 etc/bluetooth_power_limits.csv
 etc/bluetooth_power_limits_G576D_CA.csv
 etc/bluetooth_power_limits_G576D_EU.csv
@@ -302,7 +299,6 @@ etc/boringssl_self_test.no_zygote.rc
 etc/boringssl_self_test.zygote32.rc
 etc/boringssl_self_test.zygote64.rc
 etc/boringssl_self_test.zygote64_32.rc
-etc/bpf/filterPowerSupplyEvents.o
 etc/build_flags.json
 etc/default_volume_tables.xml
 etc/display_colordata_cal0.pb
@@ -312,8 +308,6 @@ etc/display_golden_external_display_cal2.pb
 etc/display_golden_google-ak3b_cal0.pb
 etc/fs_config_dirs
 etc/fs_config_files
-etc/fstab.efs
-etc/fstab.efs.from_data
 etc/fstab.modem
 etc/fstab.persist
 etc/fstab.zram.2g
@@ -331,52 +325,42 @@ etc/fstab.zuma-fips
 etc/gnss/ca.pem
 etc/gnss/gps.cfg
 etc/group
+etc/hearing_aid_audio_policy_configuration_7_0.xml
 etc/init.common.cfg
+etc/init/android.hardware.audio.service.rc
 etc/init/android.hardware.boot-service.default-pixel.rc
 etc/init/android.hardware.drm-service.clearkey.rc
 etc/init/android.hardware.dumpstate-service.rc
 etc/init/android.hardware.gatekeeper-service.trusty.rc
-etc/init/android.hardware.graphics.allocator2-aidl-service.rc
+etc/init/android.hardware.graphics.allocator-aidl-service.rc
 etc/init/android.hardware.health-service.zuma.rc
 etc/init/android.hardware.power-service.pixel-libperfmgr.rc
 etc/init/android.hardware.power.stats-service.pixel.rc
 etc/init/android.hardware.secure_element_gto.rc
 etc/init/android.hardware.security.keymint-service.rust.trusty.rc
-etc/init/android.hardware.security.secretkeeper.trusty.rc
 etc/init/android.hardware.sensors-service-multihal.rc
 etc/init/android.hardware.thermal-service.pixel.rc
 etc/init/android.hardware.usb-service.rc
 etc/init/android.hardware.usb.gadget-service.rc
+etc/init/android.hardware.vibrator-service.cs40l26.rc
 etc/init/android.hardware.wifi-service.rc
 etc/init/android.hardware.wifi.supplicant-service.rc
 etc/init/atrace_categories.rc
 etc/init/boringssl_self_test.rc
-etc/init/dump_power.rc
 etc/init/gpu_probe.rc
 etc/init/health-storage-default.rc
 etc/init/hostapd.android.rc
 etc/init/hw/init.akita.rc
 etc/init/hw/init.zuma.rc
-etc/init/hw/init.zuma.storage.rc
 etc/init/hw/init.zuma.usb.rc
 etc/init/hwc3-pixel.rc
 etc/init/init.aoc.rc
 etc/init/init.display_logbuffer.rc
-etc/init/init.efs.rc
-etc/init/init.fingerprint.dump.rc
 etc/init/init.gnss.rc
 etc/init/init.module.rc
-etc/init/init.persist.rc
-etc/init/init.pixel-mm-gs.rc
-etc/init/init.pixel-perf.rc
 etc/init/init.pixel.rc
-etc/init/init.power-gs.rc
 etc/init/init.storage.rc
 etc/init/init.touch.gti0.rc
-etc/init/init.touch.predump.rc
-etc/init/libg3a_gabc.rc
-etc/init/libg3a_gaf.rc
-etc/init/libg3a_ghawb.rc
 etc/init/memtrack.rc
 etc/init/nfc-service-default.rc
 etc/init/pixel-mm-gki.rc
@@ -385,9 +369,6 @@ etc/init/pixelstats-vendor.zuma.rc
 etc/init/rebalance_interrupts-vendor.gs101.rc
 etc/init/vndservicemanager.rc
 etc/le_audio_codec_capabilities.xml
-etc/libg3a_standalone_gabc_rc
-etc/libg3a_standalone_gaf_rc
-etc/libg3a_standalone_ghawb_rc
 etc/libnfc-hal-st.conf
 etc/libse-gto-hal.conf
 etc/linker.config.pb
@@ -396,7 +377,6 @@ etc/media_codecs_c2.xml
 etc/media_codecs_performance.xml
 etc/media_codecs_performance_c2.xml
 etc/mixer_paths.xml
-etc/mixer_paths_aidl.xml
 etc/mixer_paths_ti.xml
 etc/mkshrc
 etc/modem/Pixel_stability.cfg
@@ -422,7 +402,7 @@ etc/permissions/android.hardware.camera.full.xml
 etc/permissions/android.hardware.camera.raw.xml
 etc/permissions/android.hardware.context_hub.xml
 etc/permissions/android.hardware.device_unique_attestation.xml
-etc/permissions/android.hardware.hardware_keystore_V3.xml
+etc/permissions/android.hardware.hardware_keystore.xml
 etc/permissions/android.hardware.keystore.app_attest_key.xml
 etc/permissions/android.hardware.location.gps.prebuilt.xml
 etc/permissions/android.hardware.nfc.ese.xml
@@ -454,6 +434,7 @@ etc/permissions/android.hardware.wifi.direct.xml
 etc/permissions/android.hardware.wifi.passpoint.xml
 etc/permissions/android.hardware.wifi.rtt.xml
 etc/permissions/android.hardware.wifi.xml
+etc/permissions/android.software.contextualsearch.xml
 etc/permissions/android.software.device_id_attestation.xml
 etc/permissions/android.software.ipsec_tunnel_migration.xml
 etc/permissions/android.software.ipsec_tunnels.xml
@@ -463,10 +444,10 @@ etc/permissions/android.software.verified_boot.xml
 etc/permissions/android.software.vulkan.deqp.level.xml
 etc/permissions/aosp_excluded_hardware.xml
 etc/permissions/com.nxp.mifare.xml
-etc/permissions/features_com.android.virt.xml
 etc/permissions/handheld_core_hardware.xml
 etc/permissions/vendor.android.hardware.camera.preview-dis.xml
 etc/powerhint.json
+etc/r_submix_audio_policy_configuration.xml
 etc/radio/log_masks/default/default_modem_log_mask.cfg
 etc/radio/log_masks/default/default_modem_log_mask.conf
 etc/radio/log_masks/default/default_modem_log_mask.nprf
@@ -476,7 +457,6 @@ etc/radio/log_masks/empty/empty_modem_log_mask.conf
 etc/radio/log_masks/empty/empty_modem_log_mask.nprf
 etc/radio/log_masks/empty/empty_modem_log_mask.xml
 etc/radio/log_masks/lassen_default/lassen_default.conf
-etc/selinux/genfs_labels_version.txt
 etc/selinux/plat_pub_versioned.cil
 etc/selinux/plat_sepolicy_vers.txt
 etc/selinux/precompiled_sepolicy
@@ -486,17 +466,13 @@ etc/selinux/precompiled_sepolicy.system_ext_sepolicy_and_mapping.sha256
 etc/selinux/selinux_denial_metadata
 etc/selinux/vendor_file_contexts
 etc/selinux/vendor_hwservice_contexts
-etc/selinux/vendor_keystore2_key_contexts
 etc/selinux/vendor_mac_permissions.xml
 etc/selinux/vendor_property_contexts
 etc/selinux/vendor_seapp_contexts
 etc/selinux/vendor_sepolicy.cil
 etc/selinux/vendor_service_contexts
 etc/selinux/vndservice_contexts
-etc/spatializer/base
-etc/spatializer/mode_2_ch
-etc/spatializer/mode_6_ch
-etc/spatializer/mode_xaural
+etc/sound_trigger_configuration.xml
 etc/sysconfig/component-overrides.xml
 etc/task_profiles.json
 etc/thermal_info_config.json
@@ -504,6 +480,7 @@ etc/thermal_info_config_charge.json
 etc/thermal_info_config_charge_proto.json
 etc/thermal_info_config_proto.json
 etc/ueventd.rc
+etc/usb_audio_policy_configuration.xml
 etc/vintf/compatibility_matrix.xml
 etc/vintf/manifest.xml
 etc/vintf/manifest/android.hardware.drm-service.clearkey.xml
@@ -515,18 +492,18 @@ etc/vintf/manifest/android.hardware.power-service.pixel.xml
 etc/vintf/manifest/android.hardware.power.stats-service.pixel.xml
 etc/vintf/manifest/android.hardware.secure_element_gto.xml
 etc/vintf/manifest/android.hardware.security.keymint-service.rust.trusty.xml
-etc/vintf/manifest/android.hardware.security.secretkeeper.trusty.xml
 etc/vintf/manifest/android.hardware.sensors-multihal.xml
 etc/vintf/manifest/android.hardware.thermal-service.pixel.xml
 etc/vintf/manifest/android.hardware.usb-service.xml
 etc/vintf/manifest/android.hardware.usb.gadget-service.xml
+etc/vintf/manifest/android.hardware.vibrator-service.cs40l26.xml
 etc/vintf/manifest/android.hardware.wifi-service.xml
 etc/vintf/manifest/android.hardware.wifi.hostapd.xml
 etc/vintf/manifest/android.hardware.wifi.supplicant.xml
+etc/vintf/manifest/bluetooth_audio.xml
 etc/vintf/manifest/health-storage-default.xml
 etc/vintf/manifest/hwc3-default.xml
-etc/vintf/manifest/manifest.xml
-etc/vintf/manifest/manifest_gralloc_aidl2.xml
+etc/vintf/manifest/manifest_gralloc_aidl.xml
 etc/vintf/manifest/memtrack.xml
 etc/vintf/manifest/nfc-service-default.xml
 etc/vintf/manifest/pixel-display-default.xml
@@ -563,7 +540,6 @@ lib/modules/aoc_unit_test_dev.ko
 lib/modules/aoc_uwb_platform_drv.ko
 lib/modules/aoc_uwb_service_dev.ko
 lib/modules/arm_dsu_pmu.ko
-lib/modules/bbd_pps_gpio.ko
 lib/modules/bcm_dbg.ko
 lib/modules/bcmdhd4383.ko
 lib/modules/cfg80211.ko
@@ -572,10 +548,11 @@ lib/modules/cp_thermal_zone.ko
 lib/modules/cs40l26-core.ko
 lib/modules/cs40l26-i2c.ko
 lib/modules/dbgcore-dump.ko
+lib/modules/exynos-seclog.ko
+lib/modules/ftm5.ko
 lib/modules/goodix_brl_touch.ko
 lib/modules/goodixfp.ko
 lib/modules/goog_touch_interface.ko
-lib/modules/google_ccd.ko
 lib/modules/google_dock.ko
 lib/modules/google_dual_batt_gauge.ko
 lib/modules/gxp.ko
@@ -587,7 +564,6 @@ lib/modules/mali_kutf.ko
 lib/modules/mali_kutf_clk_rate_trace_test_portal.ko
 lib/modules/max77729_charger.ko
 lib/modules/max77729_uic.ko
-lib/modules/max77779-fwupdate.ko
 lib/modules/modules.alias
 lib/modules/modules.blocklist
 lib/modules/modules.dep
@@ -597,7 +573,8 @@ lib/modules/nitrous.ko
 lib/modules/panel-boe-nt37290.ko
 lib/modules/pinctrl-slg51002.ko
 lib/modules/rio.ko
-lib/modules/rt9471_charger.ko
+lib/modules/rt6160-regulator.ko
+lib/modules/sec_touch.ko
 lib/modules/snd-soc-cs35l41-i2c.ko
 lib/modules/snd-soc-cs35l41-spi.ko
 lib/modules/snd-soc-cs35l41.ko
@@ -605,36 +582,53 @@ lib/modules/snd-soc-cs40l26.ko
 lib/modules/snd-soc-tas256x.ko
 lib/modules/snd-soc-wm-adsp.ko
 lib/modules/softdog.ko
-lib/modules/sscoredump_sample_test.ko
-lib/modules/sscoredump_test.ko
 lib/modules/st33spi.ko
 lib/modules/stmvl53l1.ko
 lib/modules/vh_preemptirq_long.ko
+lib64/PixelVibratorFlagsL26.so
+lib64/PixelVibratorStats.so
 lib64/android.frameworks.sensorservice-V1-ndk.so
 lib64/android.frameworks.sensorservice@1.0.so
 lib64/android.frameworks.stats-V1-ndk.so
 lib64/android.frameworks.stats-V2-ndk.so
-lib64/android.hardware.audio.common-V4-ndk.so
-lib64/android.hardware.audio.effect-V3-ndk.so
+lib64/android.hardware.audio.common-V3-ndk.so
+lib64/android.hardware.audio.common-util.so
+lib64/android.hardware.audio.common@2.0.so
+lib64/android.hardware.audio.common@5.0.so
+lib64/android.hardware.audio.common@7.0-enums.so
+lib64/android.hardware.audio.common@7.0-util.so
+lib64/android.hardware.audio.common@7.0.so
+lib64/android.hardware.audio.common@7.1-enums.so
+lib64/android.hardware.audio.common@7.1-util.so
+lib64/android.hardware.audio.effect@7.0-util.so
+lib64/android.hardware.audio.effect@7.0.so
+lib64/android.hardware.audio@7.0.so
+lib64/android.hardware.audio@7.1-util.so
+lib64/android.hardware.audio@7.1.so
+lib64/android.hardware.bluetooth.audio-V4-ndk.so
+lib64/android.hardware.bluetooth.audio-impl.so
+lib64/android.hardware.bluetooth.audio@2.0.so
+lib64/android.hardware.bluetooth.audio@2.1.so
 lib64/android.hardware.boot-V1-ndk.so
 lib64/android.hardware.boot@1.0.so
 lib64/android.hardware.boot@1.1.so
 lib64/android.hardware.common-V2-ndk.so
 lib64/android.hardware.common.fmq-V1-ndk.so
 lib64/android.hardware.drm-V1-ndk.so
-lib64/android.hardware.drm.common-V1-ndk.so
 lib64/android.hardware.dumpstate-V1-ndk.so
 lib64/android.hardware.gatekeeper-V1-ndk.so
 lib64/android.hardware.gnss-V3-ndk.so
+lib64/android.hardware.graphics.allocator-V1-ndk.so
 lib64/android.hardware.graphics.allocator-V2-ndk.so
 lib64/android.hardware.graphics.allocator@2.0.so
 lib64/android.hardware.graphics.allocator@3.0.so
 lib64/android.hardware.graphics.allocator@4.0.so
-lib64/android.hardware.graphics.common-V6-ndk.so
+lib64/android.hardware.graphics.common-V3-ndk.so
+lib64/android.hardware.graphics.common-V5-ndk.so
 lib64/android.hardware.graphics.common@1.0.so
 lib64/android.hardware.graphics.common@1.1.so
 lib64/android.hardware.graphics.common@1.2.so
-lib64/android.hardware.graphics.composer3-V4-ndk.so
+lib64/android.hardware.graphics.composer3-V3-ndk.so
 lib64/android.hardware.graphics.composer@2.1-resources.so
 lib64/android.hardware.graphics.composer@2.1.so
 lib64/android.hardware.graphics.composer@2.2-resources.so
@@ -645,13 +639,13 @@ lib64/android.hardware.graphics.mapper@2.0.so
 lib64/android.hardware.graphics.mapper@2.1.so
 lib64/android.hardware.graphics.mapper@3.0.so
 lib64/android.hardware.graphics.mapper@4.0.so
-lib64/android.hardware.health-V4-ndk.so
+lib64/android.hardware.health-V3-ndk.so
 lib64/android.hardware.health.storage-V1-ndk.so
 lib64/android.hardware.memtrack-V1-ndk.so
 lib64/android.hardware.nfc-V1-ndk.so
 lib64/android.hardware.power-V1-ndk.so
 lib64/android.hardware.power-V2-ndk.so
-lib64/android.hardware.power-V6-ndk.so
+lib64/android.hardware.power-V5-ndk.so
 lib64/android.hardware.power.stats-V2-ndk.so
 lib64/android.hardware.power.stats-impl.gs-common.so
 lib64/android.hardware.power.stats-impl.pixel.so
@@ -661,54 +655,71 @@ lib64/android.hardware.radio@1.1.so
 lib64/android.hardware.secure_element-V1-ndk.so
 lib64/android.hardware.secure_element.thales.libse.so
 lib64/android.hardware.security.keymint-V1-ndk.so
-lib64/android.hardware.security.keymint-V4-ndk.so
+lib64/android.hardware.security.keymint-V3-ndk.so
 lib64/android.hardware.security.secureclock-V1-ndk.so
-lib64/android.hardware.sensors-V3-ndk.so
+lib64/android.hardware.sensors-V2-ndk.so
 lib64/android.hardware.sensors@1.0.so
 lib64/android.hardware.sensors@2.0-ScopedWakelock.so
 lib64/android.hardware.sensors@2.0.so
 lib64/android.hardware.sensors@2.1.so
+lib64/android.hardware.soundtrigger@2.0-core.so
+lib64/android.hardware.soundtrigger@2.0.so
+lib64/android.hardware.soundtrigger@2.1.so
+lib64/android.hardware.soundtrigger@2.2.so
+lib64/android.hardware.soundtrigger@2.3.so
 lib64/android.hardware.thermal-V1-ndk.so
-lib64/android.hardware.thermal-V3-ndk.so
+lib64/android.hardware.thermal-V2-ndk.so
 lib64/android.hardware.thermal@1.0.so
 lib64/android.hardware.thermal@2.0.so
 lib64/android.hardware.usb-V3-ndk.so
 lib64/android.hardware.usb.gadget-V1-ndk.so
 lib64/android.hardware.usb.gadget@1.0.so
-lib64/android.hardware.wifi-V3-ndk.so
-lib64/android.hardware.wifi.common-V2-ndk.so
-lib64/android.hardware.wifi.hostapd-V3-ndk.so
-lib64/android.hardware.wifi.supplicant-V4-ndk.so
+lib64/android.hardware.vibrator-V2-ndk.so
+lib64/android.hardware.wifi-V2-ndk.so
+lib64/android.hardware.wifi.common-V1-ndk.so
+lib64/android.hardware.wifi.hostapd-V2-ndk.so
+lib64/android.hardware.wifi.supplicant-V3-ndk.so
+lib64/android.hidl.allocator@1.0.so
+lib64/android.hidl.memory.token@1.0.so
 lib64/android.hidl.memory@1.0.so
-lib64/android.media.audio.common.types-V4-ndk.so
-lib64/android.media.audio.eraser.types-V1-ndk.so
+lib64/android.hidl.safe_union@1.0.so
+lib64/android.media.audio.common.types-V3-ndk.so
 lib64/android.system.keystore2-V1-ndk.so
 lib64/android.system.suspend-V1-ndk.so
 lib64/arm.graphics-V1-ndk.so
-lib64/com.google.hardware.pixel.display-V13-ndk.so
+lib64/com.google.hardware.pixel.display-V10-ndk.so
+lib64/hw/android.hardware.audio.effect@7.0-impl.so
+lib64/hw/android.hardware.audio@7.1-impl.so
 lib64/hw/android.hardware.graphics.allocator-aidl-impl.so
+lib64/hw/android.hardware.graphics.mapper@4.0-impl.so
+lib64/hw/android.hardware.soundtrigger@2.3-impl.so
+lib64/hw/android.hardware.vibrator-impl.cs40l26.so
 lib64/hw/android.hidl.memory@1.0-impl.so
+lib64/hw/audio.bluetooth.default.so
 lib64/hw/audio.primary.default.so
+lib64/hw/audio.r_submix.default.so
+lib64/hw/audio.usb.default.so
+lib64/hw/audio.usbv2.default.so
 lib64/hw/gralloc.default.so
 lib64/hw/local_time.default.so
-lib64/hw/mapper.pixel.so
 lib64/hw/power.default.so
 lib64/hw/vibrator.default.so
 lib64/libExynosHWCService.so
-lib64/libOpenCL.so
-lib64/libaconfig_storage_read_api_cc.so
 lib64/libacryl.so
 lib64/libacryl_hdr_plugin.so
+lib64/libalsautils.so
+lib64/libalsautilsv2.so
 lib64/libandroid_log_sys.dylib.so
 lib64/libandroid_logger.dylib.so
-lib64/libaudio_aidl_conversion_common_ndk.so
-lib64/libaudioaidlcommon.so
 lib64/libaudioutils.so
 lib64/libbase.so
 lib64/libbinder.so
 lib64/libbinderdebug.so
+lib64/libbluetooth_audio_session.so
+lib64/libbluetooth_audio_session_aidl.so
 lib64/libc++.so
 lib64/libcfg_if.dylib.so
+lib64/libclang_rt.ubsan_standalone-aarch64-android.so
 lib64/libcrypto.so
 lib64/libcurl.so
 lib64/libcutils.so
@@ -721,14 +732,15 @@ lib64/libdumpstateutil.so
 lib64/libeffects.so
 lib64/libeffectsconfig.so
 lib64/libenv_logger.dylib.so
-lib64/libext2_uuid.so
 lib64/libexynosdisplay.so
+lib64/libflatbuffers-cpp.so
 lib64/libfmq.so
 lib64/libgatekeeper.so
 lib64/libgralloctypes.so
 lib64/libhardware.so
 lib64/libhardware_legacy.so
 lib64/libhidlbase.so
+lib64/libhidlmemory.so
 lib64/libhwjpeg.so
 lib64/libion_google.so
 lib64/libjsoncpp.so
@@ -736,7 +748,10 @@ lib64/libkeystore-engine-wifi-hidl.so
 lib64/liblibloading.dylib.so
 lib64/liblog_rust.dylib.so
 lib64/libmedia_helper.so
+lib64/libmediautils_vendor.so
 lib64/libmemtrack-pixel.so
+lib64/libmemunreachable.so
+lib64/libnbaio_mono.so
 lib64/libnl.so
 lib64/libonce_cell.dylib.so
 lib64/libperfmgr.so
@@ -752,11 +767,12 @@ lib64/libreference-ril.so
 lib64/libril.so
 lib64/librilutils.so
 lib64/libsensorndkbridge.so
-lib64/libsparse.so
 lib64/libspeexresampler.so
 lib64/libssl.so
 lib64/libstagefright_foundation.so
 lib64/libstd.dylib.so
+lib64/libtinyalsa.so
+lib64/libtinyalsav2.so
 lib64/libtinyxml2.so
 lib64/libtrusty.so
 lib64/libui.so
@@ -780,41 +796,28 @@ lib64/pixel_stateresidency_provider_aidl_interface-ndk.so
 lib64/pixelatoms-cpp.so
 lib64/server_configurable_flags.so
 lib64/soundfx/libaudiopreprocessing.so
-lib64/soundfx/libbundleaidl.so
 lib64/soundfx/libbundlewrapper.so
 lib64/soundfx/libdownmix.so
-lib64/soundfx/libdownmixaidl.so
-lib64/soundfx/libdynamicsprocessingaidl.so
 lib64/soundfx/libdynproc.so
 lib64/soundfx/libeffectproxy.so
 lib64/soundfx/libhapticgenerator.so
-lib64/soundfx/libhapticgeneratoraidl.so
 lib64/soundfx/libldnhncr.so
-lib64/soundfx/libloudnessenhanceraidl.so
-lib64/soundfx/libreverbaidl.so
 lib64/soundfx/libreverbwrapper.so
 lib64/soundfx/libvisualizer.so
-lib64/soundfx/libvisualizeraidl.so
 odm/etc/build.prop
 odm/etc/group
 odm/etc/passwd
-odm/etc/selinux/odm_file_contexts
-odm/etc/selinux/odm_hwservice_contexts
-odm/etc/selinux/odm_mac_permissions.xml
-odm/etc/selinux/odm_property_contexts
-odm/etc/selinux/odm_seapp_contexts
-odm/etc/selinux/odm_sepolicy.cil
-odm/etc/selinux/odm_service_contexts
 odm_dlkm/etc/build.prop
-vendor_dlkm/etc/16kb/init.insmod.akita.cfg
+overlay/EmergencyInfo__akita__auto_generated_rro_vendor.apk
+overlay/NfcNci__akita__auto_generated_rro_vendor.apk
+overlay/Settings__akita__auto_generated_rro_vendor.apk
+overlay/StorageManager__akita__auto_generated_rro_vendor.apk
+overlay/SystemUI__akita__auto_generated_rro_vendor.apk
+overlay/TeleService__akita__auto_generated_rro_vendor.apk
+overlay/Traceur__akita__auto_generated_rro_vendor.apk
+overlay/framework-res__akita__auto_generated_rro_vendor.apk
 vendor_dlkm/etc/build.prop
-vendor_dlkm/etc/debug_api/init.insmod.akita.cfg
-vendor_dlkm/etc/debug_kmemleak/init.insmod.akita.cfg
-vendor_dlkm/etc/debug_locking/init.insmod.akita.cfg
-vendor_dlkm/etc/debug_memory/init.insmod.akita.cfg
-vendor_dlkm/etc/debug_memory_accounting/init.insmod.akita.cfg
 vendor_dlkm/etc/init.insmod.akita.cfg
-vendor_dlkm/etc/kasan/init.insmod.akita.cfg
 
 # Exclude overlays, symlinks and extra files that we override
 
@@ -824,19 +827,6 @@ overlay/Flipendo__akita__auto_generated_rro_vendor.apk
 overlay/SettingsGoogle__akita__auto_generated_rro_vendor.apk
 overlay/StorageManagerGoogle__akita__auto_generated_rro_vendor.apk
 overlay/SystemUIGoogle__akita__auto_generated_rro_vendor.apk
-overlay/TeleService__akita__auto_generated_rro_vendor.apk
-overlay/Traceur__akita__auto_generated_rro_vendor.apk
-overlay/framework-res__akita__auto_generated_rro_vendor.apk
-
-# beta
-overlay/DeviceDiagnostics__akita_beta__auto_generated_rro_vendor.apk
-overlay/Flipendo__akita_beta__auto_generated_rro_vendor.apk
-overlay/SettingsGoogle__akita_beta__auto_generated_rro_vendor.apk
-overlay/StorageManagerGoogle__akita_beta__auto_generated_rro_vendor.apk
-overlay/SystemUIGoogle__akita_beta__auto_generated_rro_vendor.apk
-overlay/TeleService__akita_beta__auto_generated_rro_vendor.apk
-overlay/Traceur__akita_beta__auto_generated_rro_vendor.apk
-overlay/framework-res__akita_beta__auto_generated_rro_vendor.apk
 
 # Symlinks
 lib/modules
@@ -844,48 +834,23 @@ lib/modules
 # Exclude files that compile with BUILD_WITHOUT_VENDOR := false
 # or manually added as build targets in device-lineage.mk
 
-# AIDL audio
-etc/aidl/hfp/hfp_codec_capabilities.xml
-etc/aidl/le_audio/aidl_audio_set_configurations.bfbs
-etc/aidl/le_audio/aidl_audio_set_scenarios.bfbs
-etc/aidl/le_audio/aidl_default_audio_set_configurations.json
-etc/aidl/le_audio/aidl_default_audio_set_scenarios.json
-etc/vintf/manifest/bluetooth_audio.xml
-lib64/android.hardware.audio.common@5.0.so
-lib64/android.hardware.bluetooth.audio-V5-ndk.so
-lib64/android.hardware.bluetooth.audio-impl.so
-lib64/android.hardware.bluetooth.audio@2.0.so
-lib64/android.hardware.bluetooth.audio@2.1.so
-lib64/android.hidl.memory.token@1.0.so
-lib64/android.hidl.safe_union@1.0.so
-lib64/libalsautilsv2.so
-lib64/libbluetooth_audio_session_aidl.so
-lib64/libclang_rt.ubsan_standalone-aarch64-android.so
-lib64/libflatbuffers-cpp.so
-lib64/libhidlmemory.so
-lib64/libmediautils_vendor.so
-lib64/libmemunreachable.so
-lib64/libnbaio_mono.so
-lib64/libtinyalsa.so
-lib64/libtinyalsav2.so
-
 # Audio
-lib64/android.hardware.audio.core-V3-ndk.so
-lib64/android.hardware.audio.core.sounddose-V3-ndk.so
-lib64/android.hardware.soundtrigger3-V3-ndk.so
-lib64/android.media.soundtrigger.types-V3-ndk.so
-lib64/libaudioaidlranges.so
+lib64/android.hardware.audio.core.sounddose-V2-ndk.so
+lib64/android.hardware.audio.sounddose-V2-ndk.so
+lib64/libaudio_aidl_conversion_common_ndk.so
 lib64/libaudioroutev2.so
-lib64/libaudioserviceexampleimpl.so
 lib64/libexpat.so
 lib64/libtinycompress.so
+lib64/libutils_binder.so
 
 # Bluetooth
 lib64/android.hardware.bluetooth-V1-ndk.so
-lib64/android.hardware.bluetooth.finder-V1-ndk.so
-lib64/android.hardware.bluetooth.ranging-V1-ndk.so
 lib64/hardware.google.bluetooth.bt_channel_avoidance@1.0.so
 
+# Camera
+lib64/libGralloc4Wrapper.so
+lib64/libcamera2ndk_vendor.so
+
 # Charger
 etc/res/images/charger/battery_fail.png
 etc/res/images/charger/battery_scale.png
@@ -893,6 +858,7 @@ etc/res/images/charger/main_font.png
 etc/res/values/charger/animation.txt
 
 # Codec2
+lib64/android.hardware.media.bufferpool2-V1-ndk.so
 lib64/android.hardware.media.bufferpool2-V2-ndk.so
 lib64/android.hardware.media.bufferpool@2.0.so
 lib64/android.hardware.media.c2-V1-ndk.so
@@ -904,7 +870,6 @@ lib64/android.hardware.media@1.0.so
 lib64/libavservices_minijail.so
 lib64/libcap.so
 lib64/libcodec2.so
-lib64/libcodec2_aidl.so
 lib64/libcodec2_hal_common.so
 lib64/libcodec2_hidl@1.0.so
 lib64/libcodec2_hidl@1.1.so
@@ -933,25 +898,18 @@ lib64/libteeui_hal_support.so
 
 # Contexthub
 lib64/android.hardware.contexthub-V3-ndk.so
-lib64/android.hardware.contexthub-V4-ndk.so
 lib64/chre_atoms_log.so
+lib64/chre_metrics_reporter.so
 lib64/chremetrics-cpp.so
 
-# Experiments
-bin/pixel-experiments-recovery.sh
-etc/init/pixel-apf-experiment.rc
-etc/init/pixel-experiments-recovery.rc
-etc/init/pixel-kswapd-experiment.rc
-
-# GPS
-lib64/liblzma.so
-lib64/libunwindstack.so
-
 # HIDL
 lib64/libhidltransport.so
 lib64/libhwbinder.so
 
 # Identity credential
+etc/permissions/android.hardware.identity_credential.xml
+lib64/android.hardware.identity-V5-ndk.so
+lib64/android.hardware.identity-support-lib.so
 lib64/libpuresoftkeymasterdevice.so
 lib64/libsoft_attestation_cert.so
 
@@ -959,15 +917,14 @@ lib64/libsoft_attestation_cert.so
 lib64/libjson.so
 
 # Nos
-lib64/android.hardware.security.keymint-V3-ndk.so
 lib64/lib_android_keymaster_keymint_utils.so
-lib64/libcppbor.so
+lib64/libcppbor_external.so
 lib64/libcppcose_rkp.so
+lib64/libkeymaster4support.so
 lib64/libkeymaster_messages.so
 lib64/libkeymaster_portable.so
 lib64/libkeymint.so
 lib64/libkeymint_support.so
-lib64/libkeymint_support_V3.so
 lib64/libnos.so
 lib64/libnos_client_citadel.so
 lib64/libnos_datagram.so
@@ -976,7 +933,9 @@ lib64/libnos_feature.so
 lib64/libnos_transport.so
 lib64/libnosprotos.so
 lib64/nos_app_avb.so
+lib64/nos_app_identity.so
 lib64/nos_app_keymaster.so
+lib64/nos_app_keymaster_ctdl.so
 lib64/nos_app_weaver.so
 lib64/pixelpowerstats_provider_aidl_interface-cpp.so
 
@@ -987,17 +946,13 @@ lib64/libziparchive.so
 lib64/modem_clock_manager.so
 lib64/modem_clock_manager_impl.so
 
-# Secretkeeper
-bin/hw/android.hardware.security.secretkeeper.trusty
-etc/init/android.hardware.security.secretkeeper.trusty.rc
-etc/vintf/manifest/android.hardware.security.secretkeeper.trusty.xml
-
 # Sensors
 lib64/hw/sensors.dynamic_sensor_hal.so
 lib64/libhidparser.so
 
 # Trusty
 lib64/android.trusty.stats.nw.setter-cpp.so
+lib64/lib_sensor_listener.so
 lib64/libbinder_trusty.so
 lib64/libtrusty_metrics.so
 
@@ -1005,6 +960,8 @@ lib64/libtrusty_metrics.so
 lib64/android.frameworks.stats-V1-cpp.so
 lib64/android.hardware.authsecret-V1-ndk.so
 lib64/android.hardware.biometrics.common-V3-ndk.so
+lib64/android.hardware.biometrics.face-V3-ndk.so
+lib64/android.hardware.biometrics.face@1.0.so
 lib64/android.hardware.biometrics.fingerprint-V3-ndk.so
 lib64/android.hardware.gnss.measurement_corrections@1.0.so
 lib64/android.hardware.gnss.measurement_corrections@1.1.so
@@ -1018,9 +975,11 @@ lib64/android.hardware.graphics.bufferqueue@2.0.so
 lib64/android.hardware.health-V1-ndk.so
 lib64/android.hardware.input.common-V1-ndk.so
 lib64/android.hardware.input.processor-V1-ndk.so
+lib64/android.hardware.keymaster-V3-ndk.so
 lib64/android.hardware.keymaster-V4-ndk.so
 lib64/android.hardware.keymaster@3.0.so
 lib64/android.hardware.keymaster@4.0.so
+lib64/android.hardware.keymaster@4.1.so
 lib64/android.hardware.neuralnetworks-V4-ndk.so
 lib64/android.hardware.neuralnetworks@1.0.so
 lib64/android.hardware.neuralnetworks@1.1.so
@@ -1051,12 +1010,11 @@ lib64/android.hardware.radio@1.5.so
 lib64/android.hardware.radio@1.6.so
 lib64/android.hardware.security.rkp-V3-ndk.so
 lib64/android.hardware.security.sharedsecret-V1-ndk.so
-lib64/android.hardware.thermal-V2-ndk.so
-lib64/android.hardware.vibrator-V3-ndk.so
 lib64/android.hardware.weaver-V2-ndk.so
 lib64/android.hidl.token@1.0-utils.so
 lib64/android.hidl.token@1.0.so
 lib64/com.google.hardware.pixel.display-V4-ndk.so
+lib64/com.google.hardware.pixel.display-V6-ndk.so
 lib64/com.google.hardware.pixel.display-V9-ndk.so
 lib64/hardware.google.ril_ext-V1-ndk.so
 
@@ -1065,10 +1023,6 @@ bin/dump/dump_gsc.sh
 lib64/libevent.so
 lib64/libion.so
 
-# Odex
-framework/oat/arm64/com.google.android.camera.experimental2023.odex
-framework/oat/arm64/com.google.android.camera.experimental2023.vdex
-
 # Completely skip files that are not required
 
 # Google

akita/vendor.prop

@@ -5,12 +5,12 @@ media.mediadrmservice.enable=true
 # Fingerprint
 ro.vendor.fingerprint.ta.name=g7a.app
 
-# GPS
-persist.vendor.gps.hal.service.name=vendor
-
 # Radio
 persist.vendor.ril.ecc.use.xml=1
 persist.vendor.ril.support_nr_ds=1
 persist.vendor.ril.use_radio_hal=2.1
 ro.vendor.config.build_carrier=europen
 vendor.rild.libpath=libsitril.so
+
+# SSR
+vendor.debug.ssrdump.type=sscoredump

akita_generic.mk

@@ -1,20 +0,0 @@
-#
-# Copyright 2024 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/akita/device-akita.mk)
-
-# preloaded_nanoapps.json
-PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common

aosp_akita.mk

@@ -20,7 +20,7 @@ USE_SWIFTSHADER := true
 BOARD_USES_SWIFTSHADER := true
 
 $(call inherit-product, device/google/zuma/aosp_common.mk)
-$(call inherit-product, device/google/akita/akita_generic.mk)
+$(call inherit-product, device/google/akita/device-akita.mk)
 
 PRODUCT_NAME := aosp_akita
 PRODUCT_DEVICE := akita

aosp_akita_16k.mk

@@ -1,8 +0,0 @@
-$(call inherit-product, device/google/akita/aosp_akita.mk)
-
-PRODUCT_NAME := aosp_akita_16k
-
-TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
-TARGET_RW_FILE_SYSTEM_TYPE := ext4
-TARGET_BOOTS_16K := true
-

audio/akita/aidl_config/Android.bp

@@ -1,63 +0,0 @@
-// Copyright (C) 2024 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 {
-    imports: [
-        "frameworks/av/services/audiopolicy/config",
-    ],
-}
-
-package {
-    default_applicable_licenses: [
-        "Android-Apache-2.0",
-    ],
-}
-
-prebuilt_etc {
-    name: "audio_policy_volumes.xml",
-    src: "audio_policy_volumes.xml",
-    soc_specific: true,
-}
-
-prebuilt_etc {
-    name: "imported_default_volume_tables.xml",
-    src: "//frameworks/av/services/audiopolicy/config:default_volume_tables.xml",
-    soc_specific: true,
-    filename_from_src: true,
-}
-
-prebuilt_etc {
-    name: "audio_platform_configuration.xml",
-    src: "audio_platform_configuration.xml",
-    soc_specific: true,
-    required: [
-        "audio_policy_volumes.xml",
-        "imported_default_volume_tables.xml",
-    ],
-}
-
-prebuilt_etc {
-    name: "mixer_paths_aidl.xml",
-    src: "mixer_paths_aidl.xml",
-    soc_specific: true,
-}
-
-phony {
-    name: "audio_aidl_configs",
-    soc_specific: true,
-    required: [
-        "audio_platform_configuration.xml",
-        "mixer_paths_aidl.xml",
-    ],
-}

audio/akita/aidl_config/audio_platform_configuration.xml

@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- 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.
--->
-<audioPlatformConfiguration xmlns:xi="http://www.w3.org/2001/XInclude">
-  <features>
-    <feature name="BatteryThrottle">
-      <argument name="Type" value="BCL_VOLTAGE" />
-      <argument name="Name" value="BCL_AUDIO_BAACL" />
-      <argument name="Strategy" value="MediaSpeakerAndScreenOn" />
-    </feature>
-    <feature name="PlaybackThermalThrottle">
-      <argument name="PollWaitMs" value="20000" />
-      <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
-      <argument name="ThermistorType" value="UNKNOWN" />
-      <argument name="ThrottlingSeverity" value="MODERATE" />
-    </feature>
-    <feature name="RuntimeTuningDump" />
-    <feature name="SoundDose">
-      <argument name="Curves" value="blackbird,condor=0,46.35,0.1950549451;54.6,57,0.98625" />
-    </feature>
-    <feature name="spatializer-offload" />
-  </features>
-
-  <voipVolume>
-    <path voipDevice="VoipDevice::kUsb">
-      <gain>0.01</gain>
-      <gain>0.02</gain>
-      <gain>0.04</gain>
-      <gain>0.10</gain>
-      <gain>0.21</gain>
-      <gain>0.47</gain>
-      <gain>1.00</gain>
-    </path>
-  </voipVolume>
-
-  <devices>
-    <device name="bluetooth" />
-    <device name="usb" />
-    <device name="speaker" codec="cs35l41">
-      <argument name="SpeakerNum" value="2" />
-      <argument name="AcousticShockProtection" />
-    </device>
-  </devices>
-
-  <tuners>
-    <tuner type="playback" name="waves">
-      <argument name="Sink" value="SPK" />
-      <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
-    </tuner>
-    <tuner type="telephony" name="fortemedia">
-      <argument name="VoIP_DLCHs" value="SPK:2,USB:2,BT:2" />
-      <argument name="VoIP_Rate" value="32000" />
-      <argument name="BOOST_USB_SWB_CLK" value="y" />
-      <argument name="BOOST_HANDSET_SWB_CLK" value="y" />
-      <argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
-      <argument name="MCPS_TABLE" value="y" />
-    </tuner>
-    <tuner type="capture" name="gs_capture" />
-  </tuners>
-
-  <latencies>
-    <latency source="primary-playback" sink="speaker" milliseconds="20" />
-    <latency source="primary-playback" sink="usb-device" milliseconds="10" />
-    <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
-    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
-
-    <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
-    <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
-    <latency source="deep-buffer-playback" sink="usb-headset" milliseconds="70" />
-    <latency source="deep-buffer-playback" sink="bluetooth-a2dp-device" milliseconds="180" />
-
-    <latency source="compress-offload-playback" sink="speaker" milliseconds="40" />
-    <latency source="compress-offload-playback" sink="usb-device" milliseconds="40" />
-    <latency source="compress-offload-playback" sink="usb-headset" milliseconds="40" />
-    <latency source="compress-offload-playback" sink="bluetooth-a2dp-device" milliseconds="70" />
-
-    <latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
-
-    <latency source="microphones" sink="primary-capture" milliseconds="160" />
-    <latency source="back-microphones" sink="primary-capture" milliseconds="160" />
-    <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
-    <latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
-    <latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
-  </latencies>
-
-  <spatialCapture>
-    <enablement useCase="primary-capture" deviceInterface="microphones">
-      <source>MIC</source>
-      <source>CAMCORDER</source>
-    </enablement>
-    <enablement useCase="primary-capture" deviceInterface="back-microphones">
-      <source>MIC</source>
-      <source>CAMCORDER</source>
-    </enablement>
-  </spatialCapture>
-
-  <microphones>
-    <microphone id="builtin_mic_1" location="MAINBODY" group="0" indexInTheGroup="0"
-      directionality="OMNI">
-      <device type="IN_MICROPHONE" address="bottom" />
-      <sensitivity levelDbfs="37.0" maxSplDb="132.5" minSplDb="28.5" />
-      <position x="0.0269" y="0.0058" z="0.0079" />
-      <orientation x="0.0" y="0.0" z="1.0" />
-      <frequencyResponse>
-        <point frequencyHz="100.00" levelDb="-0.78" />
-        <point frequencyHz="106.00" levelDb="-0.71" />
-        <point frequencyHz="112.00" levelDb="-0.64" />
-        <point frequencyHz="118.00" levelDb="-0.60" />
-        <point frequencyHz="125.00" levelDb="-0.55" />
-        <point frequencyHz="132.00" levelDb="-0.50" />
-        <point frequencyHz="140.00" levelDb="-0.47" />
-        <point frequencyHz="150.00" levelDb="-0.42" />
-        <point frequencyHz="160.00" levelDb="-0.39" />
-        <point frequencyHz="170.00" levelDb="-0.36" />
-        <point frequencyHz="180.00" levelDb="-0.34" />
-        <point frequencyHz="190.00" levelDb="-0.33" />
-        <point frequencyHz="200.00" levelDb="-0.32" />
-        <point frequencyHz="212.00" levelDb="-0.29" />
-        <point frequencyHz="224.00" levelDb="-0.28" />
-        <point frequencyHz="236.00" levelDb="-0.28" />
-        <point frequencyHz="250.00" levelDb="-0.27" />
-        <point frequencyHz="265.00" levelDb="-0.25" />
-        <point frequencyHz="280.00" levelDb="-0.25" />
-        <point frequencyHz="300.00" levelDb="-0.24" />
-        <point frequencyHz="315.00" levelDb="-0.23" />
-        <point frequencyHz="335.00" levelDb="-0.23" />
-        <point frequencyHz="355.00" levelDb="-0.22" />
-        <point frequencyHz="375.00" levelDb="-0.22" />
-        <point frequencyHz="400.00" levelDb="-0.19" />
-        <point frequencyHz="425.00" levelDb="-0.17" />
-        <point frequencyHz="450.00" levelDb="-0.15" />
-        <point frequencyHz="475.00" levelDb="-0.15" />
-        <point frequencyHz="500.00" levelDb="-0.14" />
-        <point frequencyHz="530.00" levelDb="-0.14" />
-        <point frequencyHz="560.00" levelDb="-0.12" />
-        <point frequencyHz="600.00" levelDb="-0.11" />
-        <point frequencyHz="630.00" levelDb="-0.10" />
-        <point frequencyHz="670.00" levelDb="-0.10" />
-        <point frequencyHz="710.00" levelDb="-0.08" />
-        <point frequencyHz="750.00" levelDb="-0.07" />
-        <point frequencyHz="800.00" levelDb="-0.07" />
-        <point frequencyHz="850.00" levelDb="-0.04" />
-        <point frequencyHz="900.00" levelDb="-0.03" />
-        <point frequencyHz="950.00" levelDb="-0.01" />
-        <point frequencyHz="1000.00" levelDb="0.00" />
-        <point frequencyHz="1060.00" levelDb="0.04" />
-        <point frequencyHz="1120.00" levelDb="0.06" />
-        <point frequencyHz="1180.00" levelDb="0.07" />
-        <point frequencyHz="1250.00" levelDb="0.08" />
-        <point frequencyHz="1320.00" levelDb="0.13" />
-        <point frequencyHz="1400.00" levelDb="0.09" />
-        <point frequencyHz="1500.00" levelDb="0.14" />
-        <point frequencyHz="1600.00" levelDb="0.19" />
-        <point frequencyHz="1700.00" levelDb="0.23" />
-        <point frequencyHz="1800.00" levelDb="0.28" />
-        <point frequencyHz="1900.00" levelDb="0.29" />
-        <point frequencyHz="2000.00" levelDb="0.31" />
-        <point frequencyHz="2120.00" levelDb="0.37" />
-        <point frequencyHz="2240.00" levelDb="0.88" />
-        <point frequencyHz="2360.00" levelDb="0.86" />
-        <point frequencyHz="2500.00" levelDb="0.77" />
-        <point frequencyHz="2650.00" levelDb="0.78" />
-        <point frequencyHz="2800.00" levelDb="0.84" />
-        <point frequencyHz="3000.00" levelDb="0.86" />
-        <point frequencyHz="3150.00" levelDb="1.05" />
-        <point frequencyHz="3350.00" levelDb="1.12" />
-        <point frequencyHz="3550.00" levelDb="1.18" />
-        <point frequencyHz="3750.00" levelDb="1.25" />
-        <point frequencyHz="4000.00" levelDb="1.43" />
-        <point frequencyHz="4250.00" levelDb="1.66" />
-        <point frequencyHz="4500.00" levelDb="1.83" />
-        <point frequencyHz="4750.00" levelDb="2.02" />
-        <point frequencyHz="5000.00" levelDb="2.23" />
-        <point frequencyHz="5300.00" levelDb="2.59" />
-        <point frequencyHz="5600.00" levelDb="2.84" />
-        <point frequencyHz="6000.00" levelDb="3.35" />
-        <point frequencyHz="6300.00" levelDb="4.01" />
-        <point frequencyHz="6700.00" levelDb="6.82" />
-        <point frequencyHz="7100.00" levelDb="6.62" />
-        <point frequencyHz="7500.00" levelDb="6.42" />
-        <point frequencyHz="8000.00" levelDb="7.30" />
-        <point frequencyHz="8500.00" levelDb="8.23" />
-        <point frequencyHz="9000.00" levelDb="7.54" />
-        <point frequencyHz="9500.00" levelDb="12.68" />
-        <point frequencyHz="10000.00" levelDb="13.76" />
-        <point frequencyHz="10600.00" levelDb="18.69" />
-        <point frequencyHz="11200.00" levelDb="19.68" />
-        <point frequencyHz="11800.00" levelDb="20.90" />
-        <point frequencyHz="12500.00" levelDb="23.70" />
-        <point frequencyHz="13200.00" levelDb="25.10" />
-        <point frequencyHz="14000.00" levelDb="21.65" />
-        <point frequencyHz="15000.00" levelDb="16.18" />
-        <point frequencyHz="16000.00" levelDb="18.84" />
-        <point frequencyHz="17000.00" levelDb="25.44" />
-        <point frequencyHz="18000.00" levelDb="23.48" />
-        <point frequencyHz="19000.00" levelDb="23.22" />
-        <point frequencyHz="20000.00" levelDb="24.89" />
-      </frequencyResponse>
-    </microphone>
-    <microphone id="builtin_mic_2" location="MAINBODY" group="0" indexInTheGroup="1"
-      directionality="OMNI">
-      <device type="IN_MICROPHONE_BACK" address="back" />
-      <sensitivity levelDbfs="-37.0" maxSplDb="132.5" minSplDb="28.5" />
-      <position x="0.0546" y="0.1456" z="0.00415" />
-      <orientation x="0.0" y="1.0" z="0.0" />
-      <frequencyResponse>
-        <point frequencyHz="106.00" levelDb="-0.75" />
-        <point frequencyHz="112.00" levelDb="-0.74" />
-        <point frequencyHz="118.00" levelDb="-0.69" />
-        <point frequencyHz="125.00" levelDb="-0.65" />
-        <point frequencyHz="132.00" levelDb="-0.62" />
-        <point frequencyHz="140.00" levelDb="-0.61" />
-        <point frequencyHz="150.00" levelDb="-0.56" />
-        <point frequencyHz="160.00" levelDb="-0.53" />
-        <point frequencyHz="170.00" levelDb="-0.50" />
-        <point frequencyHz="180.00" levelDb="-0.47" />
-        <point frequencyHz="190.00" levelDb="-0.43" />
-        <point frequencyHz="200.00" levelDb="-0.40" />
-        <point frequencyHz="212.00" levelDb="-0.37" />
-        <point frequencyHz="224.00" levelDb="-0.36" />
-        <point frequencyHz="236.00" levelDb="-0.33" />
-        <point frequencyHz="250.00" levelDb="-0.30" />
-        <point frequencyHz="265.00" levelDb="-0.28" />
-        <point frequencyHz="280.00" levelDb="-0.25" />
-        <point frequencyHz="300.00" levelDb="-0.24" />
-        <point frequencyHz="315.00" levelDb="-0.24" />
-        <point frequencyHz="335.00" levelDb="-0.24" />
-        <point frequencyHz="355.00" levelDb="-0.25" />
-        <point frequencyHz="375.00" levelDb="-0.24" />
-        <point frequencyHz="400.00" levelDb="-0.12" />
-        <point frequencyHz="425.00" levelDb="-0.10" />
-        <point frequencyHz="450.00" levelDb="-0.08" />
-        <point frequencyHz="475.00" levelDb="-0.09" />
-        <point frequencyHz="500.00" levelDb="-0.07" />
-        <point frequencyHz="530.00" levelDb="-0.07" />
-        <point frequencyHz="560.00" levelDb="-0.06" />
-        <point frequencyHz="600.00" levelDb="-0.06" />
-        <point frequencyHz="630.00" levelDb="-0.06" />
-        <point frequencyHz="670.00" levelDb="-0.05" />
-        <point frequencyHz="710.00" levelDb="-0.04" />
-        <point frequencyHz="750.00" levelDb="-0.05" />
-        <point frequencyHz="800.00" levelDb="-0.04" />
-        <point frequencyHz="850.00" levelDb="-0.01" />
-        <point frequencyHz="900.00" levelDb="0.02" />
-        <point frequencyHz="950.00" levelDb="0.02" />
-        <point frequencyHz="1000.00" levelDb="0.00" />
-        <point frequencyHz="1060.00" levelDb="0.02" />
-        <point frequencyHz="1120.00" levelDb="0.03" />
-        <point frequencyHz="1180.00" levelDb="0.07" />
-        <point frequencyHz="1250.00" levelDb="0.10" />
-        <point frequencyHz="1320.00" levelDb="0.10" />
-        <point frequencyHz="1400.00" levelDb="0.13" />
-        <point frequencyHz="1500.00" levelDb="0.01" />
-        <point frequencyHz="1600.00" levelDb="0.01" />
-        <point frequencyHz="1700.00" levelDb="0.10" />
-        <point frequencyHz="1800.00" levelDb="0.11" />
-        <point frequencyHz="1900.00" levelDb="0.19" />
-        <point frequencyHz="2000.00" levelDb="0.24" />
-        <point frequencyHz="2120.00" levelDb="0.38" />
-        <point frequencyHz="2240.00" levelDb="0.46" />
-        <point frequencyHz="2360.00" levelDb="0.26" />
-        <point frequencyHz="2500.00" levelDb="0.27" />
-        <point frequencyHz="2650.00" levelDb="0.43" />
-        <point frequencyHz="2800.00" levelDb="0.76" />
-        <point frequencyHz="3000.00" levelDb="0.75" />
-        <point frequencyHz="3150.00" levelDb="1.09" />
-        <point frequencyHz="3350.00" levelDb="1.09" />
-        <point frequencyHz="3550.00" levelDb="0.94" />
-        <point frequencyHz="3750.00" levelDb="1.06" />
-        <point frequencyHz="4000.00" levelDb="1.21" />
-        <point frequencyHz="4250.00" levelDb="1.47" />
-        <point frequencyHz="4500.00" levelDb="1.45" />
-        <point frequencyHz="4750.00" levelDb="1.36" />
-        <point frequencyHz="5000.00" levelDb="2.07" />
-        <point frequencyHz="5300.00" levelDb="2.85" />
-        <point frequencyHz="5600.00" levelDb="2.90" />
-        <point frequencyHz="6000.00" levelDb="3.85" />
-        <point frequencyHz="6300.00" levelDb="4.65" />
-        <point frequencyHz="6700.00" levelDb="5.84" />
-        <point frequencyHz="7100.00" levelDb="5.46" />
-        <point frequencyHz="7500.00" levelDb="6.15" />
-        <point frequencyHz="8000.00" levelDb="7.50" />
-        <point frequencyHz="8500.00" levelDb="8.30" />
-        <point frequencyHz="9000.00" levelDb="10.62" />
-        <point frequencyHz="9500.00" levelDb="12.70" />
-        <point frequencyHz="10000.00" levelDb="16.65" />
-        <point frequencyHz="10600.00" levelDb="20.95" />
-        <point frequencyHz="11200.00" levelDb="25.41" />
-        <point frequencyHz="11800.00" levelDb="26.32" />
-        <point frequencyHz="12500.00" levelDb="20.20" />
-        <point frequencyHz="13200.00" levelDb="16.60" />
-        <point frequencyHz="14000.00" levelDb="11.24" />
-        <point frequencyHz="15000.00" levelDb="7.85" />
-        <point frequencyHz="16000.00" levelDb="7.62" />
-        <point frequencyHz="17000.00" levelDb="20.19" />
-        <point frequencyHz="18000.00" levelDb="7.32" />
-        <point frequencyHz="19000.00" levelDb="2.87" />
-        <point frequencyHz="20000.00" levelDb="5.18" />
-      </frequencyResponse>
-    </microphone>
-  </microphones>
-
-  <xi:include href="audio_policy_volumes.xml" />
-  <xi:include href="default_volume_tables.xml" />
-</audioPlatformConfiguration>

audio/akita/aidl_config/audio_policy_volumes.xml

@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 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.
--->
-<!-- Volume section defines a volume curve for a given use case and device category.
-It contains a list of points of this curve expressing the attenuation in Millibels for a given
-volume index from 0 to 100.
-<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="">
-<point>0,-9600</point>
-<point>100,0</point>
-</volume>
--->
-
-<volumes>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-2400</point>
-        <point>33,-1600</point>
-        <point>66,-800</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE">
-        <point>0,-2400</point>
-        <point>33,-1600</point>
-        <point>66,-800</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                             ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                             ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>1,-3000</point>
-        <point>33,-2600</point>
-        <point>66,-2200</point>
-        <point>100,-1800</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-5000</point>
-        <point>33,-3500</point>
-        <point>66,-2400</point>
-        <point>100,-1600</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                         ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                         ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                       ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4000</point>
-        <point>33,-2400</point>
-        <point>66,-1200</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                       ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                       ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                       ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-6589</point>
-        <point>8,-5971</point>
-        <point>12,-5619</point>
-        <point>16,-5212</point>
-        <point>20,-4833</point>
-        <point>24,-4434</point>
-        <point>28,-4141</point>
-        <point>32,-3856</point>
-        <point>36,-3611</point>
-        <point>40,-3382</point>
-        <point>44,-3143</point>
-        <point>48,-2921</point>
-        <point>52,-2695</point>
-        <point>56,-2497</point>
-        <point>60,-2308</point>
-        <point>64,-2109</point>
-        <point>68,-1893</point>
-        <point>72,-1706</point>
-        <point>76,-1474</point>
-        <point>80,-1224</point>
-        <point>84,-1000</point>
-        <point>88,-786</point>
-        <point>92,-581</point>
-        <point>96,-275</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                        ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                        ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-4000</point>
-        <point>33,-2400</point>
-        <point>66,-1200</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                        ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                        ref="DEFAULT_NON_MUTABLE_EXT_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                        ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                               ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4800</point>
-        <point>33,-2400</point>
-        <point>66,-1200</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                               ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                               ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                               ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-2400</point>
-        <point>33,-1600</point>
-        <point>66,-800</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EARPIECE">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                                ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>1,-3000</point>
-        <point>33,-2600</point>
-        <point>66,-2200</point>
-        <point>100,-1800</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-5000</point>
-        <point>33,-3500</point>
-        <point>66,-2400</point>
-        <point>100,-1600</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                                   ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                                   ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>1,-3000</point>
-        <point>33,-2600</point>
-        <point>66,-2200</point>
-        <point>100,-1800</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-6000</point>
-        <point>33,-3000</point>
-        <point>66,-2200</point>
-        <point>100,-1600</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                       ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                       ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                       ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                      ref="SILENT_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                      ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                      ref="SILENT_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                      ref="SILENT_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                      ref="SILENT_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                ref="DEFAULT_NON_MUTABLE_SPEAKER_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                                ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                                ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                            ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                            ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                            ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                            ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                            ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                        ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                        ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                        ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                        ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                        ref="FULL_SCALE_VOLUME_CURVE"/>
-</volumes>
-

audio/akita/audio-tables.mk

@@ -16,11 +16,6 @@
 
 AUDIO_TABLE_FOLDER := akita
 
-ifeq ($(USE_AUDIO_HAL_AIDL),true)
-PRODUCT_SOONG_NAMESPACES += device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
-PRODUCT_PACKAGES += audio_aidl_configs
-
-else
 # Platform Configuration for AudioHAL / SoundTriggerHAL
 PRODUCT_COPY_FILES += \
     device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \
@@ -32,8 +27,6 @@ PRODUCT_COPY_FILES += \
     device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \
     frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
 
-endif
-
 # AudioEffectHAL Configuration
 PRODUCT_COPY_FILES += \
     device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
@@ -83,13 +76,3 @@ PRODUCT_COPY_FILES += \
     device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
 
 endif
-
-ifeq ($(USE_AUDIO_HAL_AIDL),true)
-# Offload spatializer config
-PRODUCT_COPY_FILES += \
-    device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \
-    device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \
-    device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \
-    device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \
-
-endif

audio/akita/config/audio_platform_configuration.xml

@@ -173,14 +173,14 @@
     </input_backend_cfg_mic_mapping>
 
     <usecase_attr>
-	    <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 40 periods * 48 frames/period * 2ch * 4(s32) = 15360 bytes -->
-        <usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="false" period="48" period_num="40"/>
+        <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 32 periods * 64 frames(around 1.3ms) * 2ch * 4(s32) = 16384 bytes -->
+        <usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="true" period="64" period_num="32"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->
         <usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="40"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 2 * 40ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
+        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
+        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
         <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
         <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->
@@ -303,7 +303,7 @@
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
         <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
         <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
-        <module libname="audio_sounddose_aoc.so" argu="Blackbird,Condor=0,46.35,0.1950549451;54.6,57,0.98625"/>
+        <module libname="audio_sounddose_aoc.so"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>

audio/akita/config/audio_policy_configuration.xml

@@ -50,9 +50,6 @@
                     <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
                              samplingRates="8000 16000 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_OPUS"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="haptic" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -134,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">
@@ -153,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/akita/config/audio_policy_configuration_a2dp_offload_disabled.xml

@@ -49,9 +49,6 @@
                     <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
                              samplingRates="8000 16000 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_OPUS"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="haptic" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -133,6 +130,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">
@@ -152,6 +153,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/akita/config/audio_policy_configuration_bluetooth_legacy_hal.xml

@@ -130,6 +130,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">
@@ -149,6 +153,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/akita/config/audio_policy_configuration_le_offload_disabled.xml

@@ -49,9 +49,6 @@
                     <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
                              samplingRates="8000 16000 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_OPUS"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="haptic" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -137,6 +134,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">
@@ -156,6 +157,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/akita/config/mixer_paths.xml

@@ -748,7 +748,7 @@
     <path name="handset-mic">
         <ctl name="Mic Spatial Module Enable" value="1"/>
         <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="1" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
@@ -760,8 +760,8 @@
 
     <path name="voice-handset-mic">
         <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="1" value="3"/>
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
@@ -774,7 +774,7 @@
     <path name="speaker-mic">
         <ctl name="Mic Spatial Module Enable" value="1"/>
         <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="1" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
@@ -786,8 +786,8 @@
 
     <path name="voice-speaker-mic">
         <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="1" value="3"/>
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
@@ -800,7 +800,7 @@
     <path name="camcorder-mic">
         <ctl name="Mic Spatial Module Enable" value="1"/>
         <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="1" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
@@ -812,7 +812,7 @@
 
     <path name="voice-recog-mic">
         <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="1" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
@@ -825,7 +825,7 @@
     <path name="voice-recog-aec-mic">
         <ctl name="Audio Capture Eraser Enable" value="1"/>
         <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="1" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
@@ -838,7 +838,7 @@
 
     <path name="unprocessed-mic">
         <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="1" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
@@ -850,7 +850,7 @@
 
     <path name="unprocessed-dual-mic">
         <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="1" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
@@ -862,7 +862,7 @@
 
     <path name="unprocessed-triple-mic">
         <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="1" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
@@ -874,7 +874,7 @@
 
     <path name="ultrasound-mic">
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0"/>
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="1"/>
+        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="2"/>
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1"/>
     </path>
@@ -884,7 +884,7 @@
 
     <path name="bt-mic">
         <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="1" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="Audio Capture Mic Source" value="BT_MIC"/>
@@ -897,7 +897,7 @@
 
     <path name="usb-headset-mic">
         <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="1" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="Audio Capture Mic Source" value="USB_MIC"/>

audio/akita/config/mixer_paths_factory.xml

@@ -102,7 +102,7 @@
     </path>
 
     <path name="mic2-only">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="1" />
+        <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" />
@@ -112,7 +112,7 @@
 
     <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="1" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="2" />
         <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" />
@@ -132,7 +132,7 @@
     </path>
 
     <path name="us-mic2-only">
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="1" />
+        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="2" />
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="-1" />
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1" />
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1" />
@@ -142,7 +142,7 @@
 
     <path name="us-mic-all">
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="1" />
+        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="2" />
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1" />
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1" />
         <ctl name="MIC0" value="1" />

bluetooth/audio_set_scenarios.json

@@ -1,259 +0,0 @@
-{
-    "_comments_": [
-        "== Audio Set Scenarios ==",
-        "  Each defined scenario references externally defined audio set",
-        "  configurations, listed in the order of priority."
-    ],
-    "scenarios": [
-        {
-            "name": "Conversational",
-            "configurations": [
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_1",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_2",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_1",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_2",
-                "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_2",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_1",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_2",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "Two-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_48_4_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_48_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_48_3_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_48_1_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_32_1_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_24_1_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_16_1_Balanced_Reliability",
-                "VND_SingleDev_TwoChanStereoSnk_OneChanStereoSrc_32khz_60oct_R3_L22_1",
-                "Two-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability"
-            ]
-        },
-        {
-            "name": "Media",
-            "configurations": [
-                "Two-OneChan-SnkAse-Lc3_48_4_High_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_4_2",
-                "Two-OneChan-SnkAse-Lc3_48_2_High_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_2_2",
-                "Two-OneChan-SnkAse-Lc3_48_3_High_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_3_2",
-                "Two-OneChan-SnkAse-Lc3_48_1_High_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_1_2",
-                "Two-OneChan-SnkAse-Lc3_24_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_24_2_2",
-                "Two-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_16_2_2",
-                "Two-OneChan-SnkAse-Lc3_16_1_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_16_1_2",
-                "One-TwoChan-SnkAse-Lc3_48_4_High_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4_2",
-                "One-TwoChan-SnkAse-Lc3_48_2_High_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_2_2",
-                "One-TwoChan-SnkAse-Lc3_48_3_High_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_3_2",
-                "One-TwoChan-SnkAse-Lc3_48_1_High_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_1_2",
-                "One-TwoChan-SnkAse-Lc3_24_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_24_2_2",
-                "One-TwoChan-SnkAse-Lc3_16_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_16_2_2",
-                "One-TwoChan-SnkAse-Lc3_16_1_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_16_1_2",
-                "One-OneChan-SnkAse-Lc3_48_4_High_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_4_2",
-                "One-OneChan-SnkAse-Lc3_48_2_High_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_2_2",
-                "One-OneChan-SnkAse-Lc3_48_3_High_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_3_2",
-                "One-OneChan-SnkAse-Lc3_48_1_High_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_1_2",
-                "One-OneChan-SnkAse-Lc3_32_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_32_2_2",
-                "One-OneChan-SnkAse-Lc3_32_1_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_32_1_2",
-                "One-OneChan-SnkAse-Lc3_24_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_24_2_2",
-                "One-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_16_2_2",
-                "One-OneChan-SnkAse-Lc3_16_1_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_16_1_2",
-                "VND_DualDev_OneChanStereoSnk_48khz_100octs_High_Reliability_1",
-                "VND_DualDev_OneChanStereoSnk_48khz_100octs_R15_L70_1",
-                "VND_SingleDev_TwoChanStereoSnk_48khz_100octs_High_Reliability_1",
-                "VND_SingleDev_TwoChanStereoSnk_48khz_100octs_R15_L70_1",
-                "VND_SingleDev_OneChanStereoSnk_48khz_100octs_High_Reliability_1",
-                "VND_SingleDev_OneChanStereoSnk_48khz_100octs_R15_L70_1",
-                "Two-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability"
-            ]
-        },
-        {
-            "name": "Game",
-            "configurations": [
-                "One-TwoChan-SnkAse-Lc3_48_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_48_3_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_48_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_24_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_24_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2_Low_Latency",
-                "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_TwoChanStereoSrc_16khz_30octs_Balanced_Reliability_1",
-                "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_R5_L12_TwoChanStereoSrc_16khz_30octs_R3_L12_1",
-                "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_High_Reliability_1",
-                "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_R5_L12_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_48_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_48_3_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_48_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_32_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_24_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_24_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1_Low_Latency"
-            ]
-        },
-        {
-            "name": "VoiceAssistants",
-            "configurations": [
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_1",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_1",
-                "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2_Balanced_Reliability",
-                "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_1",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_24_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_32_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability"
-            ]
-        },
-        {
-            "name": "Live",
-            "configurations": [
-                "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_Balanced_Reliability_1",
-                "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_R11_L40_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_1",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_1",
-                "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2_Balanced_Reliability",
-                "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_1",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "One-OneChan-SrcAse-Lc3_48_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_48_1_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_32_1_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_16_1_Balanced_Reliability"
-            ]
-        }
-    ]
-}

bluetooth/bt_vendor_overlay.conf

@@ -13,21 +13,5 @@ AocPowerPinCtrlCheckEnable = true
 # This only affects when AocPowerPinCtrlCheckEnable is true
 HwStageDoesNotCtrlPowerPinFromAoc = DEV1.0
 
-# Priority of uart type
-# HciUartSocket = 0
-# SerialUartPort = 1
-# SerialAocUartPort = 2
-# UserialInvalid = 3
-UserialTypePriority = 2-1
-
-# <string> The hardware support which offload capability
-BtOffloadCap = AOC
-
-# <string> The BT Offload Trunk Flag Group Name
-BtOffloadTrunkGroup = 24M_AOC
-
 # <boolean> APM Uart skip suspend to aovid hold system too long when BT using AOC UART
 ApmUartSkipSuspend = true
-
-# Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 295006

conf/init.akita.rc

@@ -13,10 +13,9 @@ on init
     setprop persist.vendor.se.streset libstreset23
     setprop dalvik.vm.dexopt.thermal-cutoff 1
 
-on fs
     # Display permissions for SSC mode
-    chown system system /sys/class/backlight/panel0-backlight/ssc_en
-    chmod 664 /sys/class/backlight/panel0-backlight/ssc_en
+    chown system system /sys/class/backlight/panel0-backlight/ssc_mode
+    chmod 664 /sys/class/backlight/panel0-backlight/ssc_mode
 
 on early-boot
     # Wait for insmod_sh to finish all common modules
@@ -79,9 +78,6 @@ on property:vendor.all.modules.ready=1
     chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored
     chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state
     chown system system /sys/bus/i2c/devices/0-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_bank
-    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_index
-    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_ms
     chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset
     chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space
     chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable

device-akita.mk

@@ -14,15 +14,18 @@
 # limitations under the License.
 #
 
-PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_devices/release/phones/./pixel_2024_midyear/release_config_map.textproto)
+PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_devices/release/phones/pixel_2024_midyear/release_config_map.mk)
 
-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_AKITA_VERSION)
-# Keeps flexibility for kasan and ufs builds
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_AKITA_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_AKITA_DIR)/kernel-headers
+TARGET_KERNEL_DIR ?= device/google/akita-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/akita-kernel/kernel-headers
 
-ifneq ($(TARGET_BOOTS_16K),true)
-PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION)
+ifdef RELEASE_GOOGLE_AKITA_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_AKITA_KERNEL_VERSION)
+endif
+
+ifdef RELEASE_GOOGLE_AKITA_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_AKITA_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_AKITA_KERNEL_DIR)/kernel-headers
 endif
 
 $(call inherit-product-if-exists, vendor/google_devices/akita/prebuilts/device-vendor-akita.mk)
@@ -34,14 +37,11 @@ $(call inherit-product-if-exists, vendor/google_devices/akita/proprietary/Wallpa
 
 DEVICE_PACKAGE_OVERLAYS += device/google/akita/akita/overlay
 
-ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true)
-USE_AUDIO_HAL_AIDL := true
-endif
-
 include device/google/akita/audio/akita/audio-tables.mk
 include device/google/zuma/device-shipping-common.mk
+include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
-include device/google/gs-common/touch/gti/predump_gti.mk
+include device/google/gs-common/touch/gti/gti.mk
 include device/google/gs-common/modem/radio_ext/radio_ext.mk
 
 # go/lyric-soong-variables
@@ -173,15 +173,15 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.se_capability=1
 
 # Bluetooth hci_inject test tool
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
     hci_inject
 
 # Bluetooth SAR test tool
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
     sar_test
 
 # Bluetooth EWP test tool
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
     ewp_tool
 
 # Bluetooth AAC VBR
@@ -217,11 +217,11 @@ PRODUCT_PACKAGES += \
 
 # LE Audio Lunch Config for Phase 1 (LE audio toggle hidden by default)
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.leaudio.toggle_visible=true
+    persist.bluetooth.leaudio.toggle_visible=false
 
 # LE Audio use classic connection by default
 PRODUCT_PRODUCT_PROPERTIES += \
-    ro.bluetooth.leaudio.le_audio_connection_by_default=true
+    ro.bluetooth.leaudio.le_audio_connection_by_default=false
 
 # Bluetooth LE Audio CIS handover to SCO
 # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683.
@@ -234,11 +234,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # LE Audio Unicast Allowlist
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630
-
-# Support LE & Classic concurrent encryption (b/330704060)
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.ble.allow_enc_with_bredr=true
+    persist.bluetooth.leaudio.allow_list=SM-R510
 
 # Enable one-handed mode
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -259,16 +255,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.vendor.btsnoop=false
 endif
 
-# Enable Bluetooth AutoOn feature
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.server.automatic_turn_on=true
-
-ifeq ($(USE_AUDIO_HAL_AIDL),true)
-# AIDL
-
-else
-# HIDL
-
 # Spatial Audio
 PRODUCT_PACKAGES += \
 	libspatialaudio \
@@ -279,8 +265,6 @@ PRODUCT_PACKAGES += \
 	android.hardware.audio.sounddose-vendor-impl \
 	audio_sounddose_aoc \
 
-endif
-
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false
@@ -329,6 +313,13 @@ PRODUCT_PACKAGES += \
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/trusty/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/trusty/24Q2
+else
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/trusty/trunk
+endif
 
 # include GNSSD
 include device/google/akita/location/gnssd/device-gnss.mk
@@ -344,6 +335,13 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/firmware/fingerprint/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/firmware/fingerprint/24Q2
+else
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/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)
@@ -354,8 +352,6 @@ endif
 # Display
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.google-ak3b.temperature_path=/dev/thermal/tz-by-name/display_therm/temp
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.display.read_temp_interval=30
 
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
@@ -365,15 +361,21 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.auto_exposure_compensation_supported=true
 
+# Fingerprint Auth Filter
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.udfps.auth_filter.log_all_coverages=true \
+    persist.vendor.udfps.auth_filter.data_collection_enabled=false
+endif
+
 # OIS with system imu
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.ois_with_system_imu=true
 
 # 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 \
@@ -382,40 +384,17 @@ 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
-
 # Increment the SVN for any official public releases
 ifdef RELEASE_SVN_AKITA
 TARGET_SVN ?= $(RELEASE_SVN_AKITA)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 21
+TARGET_SVN ?= 19
 endif
 
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=$(TARGET_SVN)
 
-# Set device family property for SMR
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.build.device_family=HK3SB3AK3
-
-# Set build properties for SMR builds
-ifeq ($(RELEASE_IS_SMR), true)
-    ifneq (,$(RELEASE_BASE_OS_AKITA))
-        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_AKITA)
-    endif
-endif
-
-# Set build properties for EMR builds
-ifeq ($(RELEASE_IS_EMR), true)
-    ifneq (,$(RELEASE_BASE_OS_AKITA))
-        PRODUCT_PROPERTY_OVERRIDES += \
-        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_AKITA)
-    endif
-endif
-
 # Keyboard height ratio and bottom padding in dp for portrait mode
 PRODUCT_PRODUCT_PROPERTIES += \
           ro.com.google.ime.kb_pad_port_b=4.19 \
@@ -431,32 +410,3 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
 # Disable Settings large-screen optimization enabled by Window Extensions
 PRODUCT_SYSTEM_PROPERTIES += \
     persist.settings.large_screen_opt.enabled=false
-
-# ETM
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
-endif
-
-PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
-PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
-
-# Bluetooth device id
-# Akita: 0x410F
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=16655
-
-# Set support for LEA multicodec
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.core.le_audio.codec_extension_aidl.enabled=true
-
-# LE Audio configuration scenarios
-PRODUCT_COPY_FILES += \
-    device/google/akita/bluetooth/audio_set_scenarios.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_scenarios.json
-
-PRODUCT_COPY_FILES += \
-    device/google/akita/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json
-
-# Enable APF by default
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.powerhal.apf_disabled=false \
-    vendor.powerhal.apf_enabled=true

device-evolution.mk

@@ -1,6 +1,11 @@
 #
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# Copyright (C) 2024 The Evolution X Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-evolution
+# Overlays
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-evolution
+
+# 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 += \
@@ -15,9 +16,11 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.telephony.euicc.mep.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.mep.xml \
     frameworks/native/data/etc/android.hardware.telephony.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.xml
 
-# IWLAN
 PRODUCT_PACKAGES += \
-    Iwlan
+    EuiccSupportPixelOverlay
+
+# Kernel
+TARGET_PREBUILT_KERNEL := device/google/akita-kernel/Image.lz4
 
 # wireless_charger HAL service
 include device/google/gs-common/wireless_charger/wireless_charger.mk
@@ -38,6 +41,10 @@ PRODUCT_PACKAGES += \
     libGLESv1_CM_angle \
     libGLESv2_angle
 
+# Identity credential
+PRODUCT_PACKAGES += \
+    android.hardware.identity_credential.xml
+
 # Sensors
 PRODUCT_PACKAGES += \
     sensors.dynamic_sensor_hal

evolution.dependencies

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

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

extract-files.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2020 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+MY_DIR="$(cd "$(dirname "${0}")"; pwd -P)"
+
+"${MY_DIR}/akita/extract-files.sh" "$@"

factory_akita.mk

@@ -32,6 +32,3 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_ak3_wide_hat_tool
-
-# preloaded_nanoapps.json
-PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory

lineage_akita.mk

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

location/gnssd/Android.bp

@@ -20,19 +20,16 @@ cc_prebuilt_binary {
         arm64: {
             srcs: ["release/android.hardware.gnss-service"],
             shared_libs: [
-                "libbase",
-                "libbinder_ndk",
-                "libcutils",
                 "liblog",
                 "libutils",
-                "android.frameworks.sensorservice-V1-ndk",
+                "libhardware",
+                "libhidlbase",
                 "android.hardware.gnss-V3-ndk",
                 "libsensorndkbridge",
                 "libc++",
                 "libc",
                 "libm",
                 "libdl",
-                "libz",
             ],
         },
     },
@@ -42,9 +39,17 @@ cc_prebuilt_binary {
     strip: {
         none: true,
     },
-    required: [
-        "libsighandler",
-    ],
+    // Bypass because libhidltransport is deprecated
+    // Bypass because libhwbinder is deprecated
+    check_elf_files: false,
+    product_variables: {
+        debuggable: {
+            required: [
+                "libsighandler",
+            ],
+        },
+    },
+
     init_rc: ["init.gnss.rc"],
     vintf_fragments: ["android.hardware.gnss@default.xml"],
 }
@@ -56,15 +61,20 @@ cc_prebuilt_binary {
             srcs: ["release/gnssd"],
             shared_libs: [
                 "liblog",
+                "libutils",
+                "libhardware_legacy",
+                "libcutils",
                 "libssl",
                 "libcrypto",
+                // "libsitril-gps",
+                "android.frameworks.sensorservice@1.0",
+                "libhidlbase",
                 "libandroid_net",
                 "libc++",
                 "libc",
                 "libm",
                 "libdl",
                 "libcurl",
-                "libz",
             ],
         },
     },
@@ -74,8 +84,13 @@ cc_prebuilt_binary {
     strip: {
         none: true,
     },
-    required: [
-        "libcustomgnss",
-        "libsighandler",
-    ],
+    // Bypass because libsitril-gps is Android.mk module
+    check_elf_files: false,
+    product_variables: {
+        debuggable: {
+            required: [
+                "libsighandler",
+            ],
+        },
+    },
 }

location/gnssd/gnss_release.mk

@@ -1,9 +1,5 @@
-# Enable coredump funtcion for all the ROM.
-$(call soong_config_set_bool,sighandler,coredump,true)
 # Enable pixel gnss hal service
--include vendor/google/gnss/aidl_service/pixel_gnss_hal.mk
-
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/akita/location/gnssd/device_framework_matrix_product.xml
+include device/google/akita/location/gnssd/pixel_gnss_hal.mk
 
 PRODUCT_PACKAGES += \
     gnssd \

location/gnssd/pixel_gnss_hal.mk

@@ -0,0 +1,12 @@
+# Enable aidl service
+$(call soong_config_set, pixel_gnss, enable_pixel_gnss_aidl_service, true)
+
+PRODUCT_PACKAGES += \
+    android.hardware.gnss-service.pixel
+
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.gps.hal.service.name=vendor
+
+# Compatibility matrix
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += \
+    device/google/akita/location/gnssd/device_framework_matrix_product.xml

location/gnssd/release/build.properties

@@ -1,7 +0,0 @@
-BUILD_TIMESTAMP_UTC=2024-12-02 20:55:44.202302
-USER_COMMIT=b6b33124ee635ea551601e3d5fb9bd0958c2bb21
-BASE_COMMIT=f40f31115750f412c4860692772ef6b0b4141105
-GNSS_SW_VER_BRANCH=R4.13
-GNSS_SW_VER_STRING=4.13.2_28_Release_248164
-WORD_SIZE=arm64
-ANDROID_VERSION=34

location/gnssd/release/ca.pem

@@ -159,25 +159,3 @@ Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc
 Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ
 HInwg85pGm+sEkYbYFRBD0woPBsL3g==
 -----END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
-CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
-nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
-43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
-T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
-gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
-BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
-TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
-DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
-hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
-06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
-PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
-YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----

location/gnssd/release/gps.cfg

@@ -110,8 +110,6 @@ navicUsedInUSPolicy=2
 # DFS: 0 = Disabled (default), 1 = Enabled
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
-# MTPL: 0 = Disabled, 1 = Enabled (default)
-Chip_Configuration_FeatureCfg_MTPL = 0
 
 # This is a bitfield that will disable incoming interrupts for mailboxes
 # AP   = 0x1
@@ -120,7 +118,7 @@ Chip_Configuration_FeatureCfg_MTPL = 0
 # CHUB = 0x8
 # The CHUB on the neus continually triggers a bit so this is to prevent
 # it from continually waking the gnss.
-mailboxDisabled=0x0
+mailboxDisabled=0x8
 
 ### Specify RFIC ID for K40 ###
 # 55200001 = S5520 EVT1
@@ -157,9 +155,8 @@ Agnss_IsGloAidingEnable=0
 Agnss_SuplUseCpNi=1
 SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
-SETCaps_SuplUT1=20
 PosReq_Supl2Params_SuplNiUdpPort=7275
-GlueLayer_LPPCpBitmask=0xFF
+GlueLayer_LPPCpBitmask=0x17
 GlueLayer_IsCpLteNeighborCellEnable=1
 GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
@@ -220,11 +217,8 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
-CP_LOCTECH_CONSTRAINTS=1
-UP_LOCTECH_CONSTRAINTS=1
 # ATT
 GNSS_CARRIER_ID=1
-CP_LOCTECH_CONSTRAINTS=5
 # TMO
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
@@ -232,9 +226,9 @@ ENABLE_4G_CP_CAPS_MSA=0
 ENABLE_NLP_IN_LPPE=0
 ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
-CP_LOCTECH_CONSTRAINTS=5
 # VZW
 GNSS_CARRIER_ID=3
+ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10

location/gnssd/release/gps_user.cfg

@@ -1,7 +1,7 @@
 GlueLayer_ToolConfigSelection=3
 debug_console=0
 debug_enable=0
-mem_dump_to_node=1
+mem_dump_to_node=0
 GlueLayer_IsGedKeyExist=1
 GlueLayer_EnableGnssCfgInterface=1
 ism_stream_enable=1
@@ -34,8 +34,7 @@ qzssUsedInUSPolicy=2
 navicUsedInUSPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
-Chip_Configuration_FeatureCfg_MTPL = 0
-mailboxDisabled=0x0
+mailboxDisabled=0x8
 gnss_rfic_chip_id=55200001
 UseRtcForAiding=1
 rtc_min_num_of_fixes=10
@@ -47,9 +46,8 @@ Agnss_IsGloAidingEnable=0
 Agnss_SuplUseCpNi=1
 SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
-SETCaps_SuplUT1=20
 PosReq_Supl2Params_SuplNiUdpPort=7275
-GlueLayer_LPPCpBitmask=0xFF
+GlueLayer_LPPCpBitmask=0x17
 GlueLayer_IsCpLteNeighborCellEnable=1
 GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
@@ -102,18 +100,15 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
-CP_LOCTECH_CONSTRAINTS=1
-UP_LOCTECH_CONSTRAINTS=1
 GNSS_CARRIER_ID=1
-CP_LOCTECH_CONSTRAINTS=5
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
 ENABLE_4G_CP_CAPS_MSA=0
 ENABLE_NLP_IN_LPPE=0
 ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
-CP_LOCTECH_CONSTRAINTS=5
 GNSS_CARRIER_ID=3
+ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10

manifest.xml

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

modules.blocklist.vendor_kernel_boot

@@ -1,3 +0,0 @@
-blocklist heatmap
-blocklist goog_touch_interface
-blocklist goodix_brl_touch

modules.load.vendor_kernel_boot

@@ -1,3 +0,0 @@
-extra/private/google-modules/touch/common/heatmap.ko
-extra/private/google-modules/touch/common/goog_touch_interface.ko
-extra/private/google-modules/touch/goodix/goodix_brl_touch.ko

nfc/libnfc-hal-st.conf

@@ -156,7 +156,7 @@ STNFC_REMOTE_FIELD_TIMER=0x01
 ###############################################################################
 # Configure the ACTIVE_RW timer
 # Default 0x00, set 0x01 to enable it
-STNFC_ACTIVERW_TIMER=0x01
+# STNFC_ACTIVERW_TIMER=0x01
 
 ###############################################################################
 # Core configuration settings