aidl/fingerprint: utilize MaxPerformance task_profile

dolby: Update layout to material expressive design
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2026-01-23 08:16:24 +09:00 · 2026-01-23 08:16:24 +09:00 · 2026-01-23 08:16:24 +09:00 · 2026-01-23 08:16:24 +09:00 · 2026-01-23 08:16:24 +09:00 · 2026-01-23 08:16:24 +09:00
80 changed files with 1092 additions and 932 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1 +0,0 @@
-../../build/soong/scripts/system-clang-format
--- a/.clang-format
+++ b/.clang-format
@@ -0,0 +1,13 @@
+BasedOnStyle: Google
+Standard: Cpp11
+AccessModifierOffset: -2
+AllowShortFunctionsOnASingleLine: Inline
+ColumnLimit: 100
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+IncludeBlocks: Preserve
+IndentWidth: 4
+ContinuationIndentWidth: 8
+PointerAlignment: Left
+TabWidth: 4
+UseTab: Never
--- a/.github/workflows/build/action.yml
+++ b/.github/workflows/build/action.yml
@@ -0,0 +1,13 @@
+name: build
+
+runs:
+    using: composite
+
+    steps:
+    - name: Install dependencies
+      shell: bash
+      run: pip install pre-commit
+
+    - name: Lint
+      shell: bash
+      run: pre-commit run --all
--- a/.github/workflows/gerrit.yml
+++ b/.github/workflows/gerrit.yml
@@ -0,0 +1,38 @@
+name: gerrit checks
+
+on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        type: string
+      gerrit-ref:
+        type: string
+      change:
+        type: string
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: lineageos-infra/fetch-gerrit-change@main
+      with:
+        gerrit-ref: ${{ inputs.gerrit-ref }}
+        ref: ${{ inputs.ref }}
+
+    - name: Check if build/action.yml exists
+      id: check
+      run: |
+        if [ -f ./.github/workflows/build/action.yml ]; then
+          echo "run=1" >> "$GITHUB_OUTPUT"
+        fi
+
+    - name: Build
+      if: ${{ steps.check.outputs.run }}
+      uses: ./.github/workflows/build
+
+    - uses: lineageos-infra/gerrit-vote@main
+      if: ${{ steps.check.outputs.run && always() }}
+      with:
+        auth: ${{ secrets.GERRIT_VOTE_CREDS }}
+        change: ${{ inputs.change }}
+        ref: ${{ inputs.ref }}
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,20 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v21.1.8
+    hooks:
+      - id: clang-format
+        types_or: [c, c++]
+  - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+    rev: v2.15.0
+    hooks:
+      - id: pretty-format-kotlin
+        args: [--autofix, --ktfmt, --ktfmt-style=kotlinlang]
--- a/Euicc/Android.bp
+++ b/Euicc/Android.bp
@@ -1,41 +0,0 @@
-//
-// Copyright (C) 2023 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-android_app {
-    name: "XiaomiEuicc",
-
-    srcs: ["src/**/*.kt"],
-    resource_dirs: ["res"],
-
-    sdk_version: "current",
-    product_specific: true,
-    certificate: "platform",
-    privileged: true,
-
-    optimize: {
-        proguard_flags_files: ["proguard.flags"],
-    },
-    required: [
-        "co.aospa.euicc.xml",
-        "hidden-api-whitelist-co.aospa.euicc.xml",
-    ],
-}
-
-prebuilt_etc {
-    sub_dir: "permissions",
-    name: "co.aospa.euicc.xml",
-    filename: "co.aospa.euicc.xml",
-    src: "co.aospa.euicc.xml",
-    product_specific: true,
-}
-
-prebuilt_etc {
-    sub_dir: "sysconfig",
-    name: "hidden-api-whitelist-co.aospa.euicc.xml",
-    filename: "hidden-api-whitelist-co.aospa.euicc.xml",
-    src: "hidden-api-whitelist-co.aospa.euicc.xml",
-    product_specific: true,
-}
--- a/Euicc/AndroidManifest.xml
+++ b/Euicc/AndroidManifest.xml
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2023-2024 The LineageOS Project
-    SPDX-License-Identifier: Apache-2.0
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="co.aospa.euicc">
-
-    <queries>
-        <package android:name="com.google.android.gms" />
-        <package android:name="com.google.android.gsf" />
-        <package android:name="com.google.android.euicc" />
-        <package android:name="com.google.android.ims" />
-    </queries>
-
-    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" />
-
-    <application
-        android:persistent="true"
-        android:usesNonSdkApi="true">
-        <receiver
-            android:exported="true"
-            android:name=".BootCompletedReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-
-        <receiver
-            android:directBootAware="true"
-            android:exported="true"
-            android:name=".EuiccReceiver"
-            android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS">
-            <intent-filter>
-                <action android:name="com.google.android.euicc.action.PARTNER_CUSTOMIZATION"/>
-            </intent-filter>
-        </receiver>
-    </application>
-</manifest>
--- a/Euicc/co.aospa.euicc.xml
+++ b/Euicc/co.aospa.euicc.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="co.aospa.euicc">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-    </privapp-permissions>
-</permissions>
--- a/Euicc/hidden-api-whitelist-co.aospa.euicc.xml
+++ b/Euicc/hidden-api-whitelist-co.aospa.euicc.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
-  <hidden-api-whitelisted-app package="co.aospa.euicc" />
-</config>
--- a/Euicc/proguard.flags
+++ b/Euicc/proguard.flags
@@ -1,3 +0,0 @@
-keep class co.aospa.euicc.* {
-  *;
-}
--- a/Euicc/res/values/strings.xml
+++ b/Euicc/res/values/strings.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2023 The LineageOS Project
-    SPDX-License-Identifier: Apache-2.0
-->
-<resources>
-    <string name="sim_illustration_lottie_mappings_json">{\"sim_illustration_lottie_mappings\":[{\"devices\":[\"diting\"],\"illustration_lottie\":\"sim_illustration_lottie_bottom\"}]}</string>
-    <string name="sim_slot_mappings_json">{\"sim-slot-mappings\":[{\"devices\":[\"diting\"],\"esim-slot-ids\":[1],\"psim-slot-ids\":[0]}]}</string>
-</resources>
--- a/Euicc/src/co/aospa/euicc/BootCompletedReceiver.kt
+++ b/Euicc/src/co/aospa/euicc/BootCompletedReceiver.kt
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2021 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package co.aospa.euicc
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-
-class BootCompletedReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
-        Log.d(TAG, "Received boot completed intent")
-        EuiccDisabler.enableOrDisableEuicc(context)
-    }
-
-    companion object {
-        private const val TAG = "XiaomiEuiccBootReceiver"
-    }
-}
--- a/Euicc/src/co/aospa/euicc/EuiccDisabler.kt
+++ b/Euicc/src/co/aospa/euicc/EuiccDisabler.kt
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021-2024 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package co.aospa.euicc
-
-import android.content.Context
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
-import android.content.pm.PackageManager.ApplicationInfoFlags
-import android.util.Log
-
-object EuiccDisabler {
-    private const val TAG = "XiaomiEuiccDisabler"
-
-    private val EUICC_DEPENDENCIES = listOf(
-        "com.google.android.gms",
-        "com.google.android.gsf",
-    )
-
-    private val EUICC_PACKAGES = listOf(
-        "com.google.android.euicc",
-        "com.google.android.ims",
-    )
-
-    private fun isInstalled(pm: PackageManager, pkgName: String) = runCatching {
-        val info = pm.getApplicationInfo(pkgName, ApplicationInfoFlags.of(0))
-        info.flags and ApplicationInfo.FLAG_INSTALLED != 0
-    }.getOrDefault(false)
-
-    private fun isInstalledAndEnabled(pm: PackageManager, pkgName: String) = runCatching {
-        val info = pm.getApplicationInfo(pkgName, ApplicationInfoFlags.of(0))
-        Log.d(TAG, "package $pkgName installed, enabled = ${info.enabled}")
-        info.enabled
-    }.getOrDefault(false)
-
-    fun enableOrDisableEuicc(context: Context) {
-        val pm = context.packageManager
-        val disable = EUICC_DEPENDENCIES.any { !isInstalledAndEnabled(pm, it) }
-        val flag = if (disable) {
-            PackageManager.COMPONENT_ENABLED_STATE_DISABLED
-        } else {
-            PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-        }
-
-        for (pkg in EUICC_PACKAGES) {
-            if (isInstalled(pm, pkg)) {
-                pm.setApplicationEnabledSetting(pkg, flag, 0)
-            }
-        }
-    }
-}
--- a/Euicc/src/co/aospa/euicc/EuiccReceiver.kt
+++ b/Euicc/src/co/aospa/euicc/EuiccReceiver.kt
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2023 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package co.aospa.euicc
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-
-class EuiccReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
-        Log.d(TAG, "Received PARTNER_CUSTOMIZATION intent")
-    }
-
-    companion object {
-        private const val TAG = "XiaomiEuiccReceiver"
-    }
-}
--- a/IFAAService/src/org/ifaa/aidl/manager/IfaaService.kt
+++ b/IFAAService/src/org/ifaa/aidl/manager/IfaaService.kt
@@ -1,183 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.ifaa.aidl.manager
-
-import android.app.Service
-import android.content.Intent
-import android.os.Build
-import android.os.IHwBinder
-import android.os.SystemProperties
-import android.provider.Settings
-import android.util.Log
-import org.ifaa.aidl.manager.IfaaManagerService
-import org.json.JSONObject
-import vendor.xiaomi.hardware.mlipay.V1_1.IMlipayService
-
-class IfaaService : Service() {
-    private var _mlipayService: IMlipayService? = null
-
-    private val mlipayServiceDeathRecipient = IHwBinder.DeathRecipient {
-        Log.i(LOG_TAG, "mlipay service died")
-        _mlipayService = null
-    }
-
-    private val mBinder = object : IfaaManagerService.Stub() {
-        override fun getSupportBIOTypes(): Int {
-            val fpVendor = SystemProperties.get(FP_VENDOR_PROP, "")
-            val isUdfps = SystemProperties.getBoolean(IS_UDFPS_PROP, false)
-
-            val supportedBioMask = when (!invalidFpVendors.contains(fpVendor.lowercase())) {
-                true -> AUTH_TYPE_FINGERPRINT or AUTH_TYPE_IRIS
-                else -> AUTH_TYPE_IRIS
-            }
-
-            val ifaaProp = SystemProperties.getInt(
-                SUPPORTED_BIO_MASK_PROP, 0
-            ) and supportedBioMask or when (isUdfps) {
-                true -> AUTH_TYPE_OPTICAL_FINGERPRINT
-                else -> 0
-            }
-
-            return ifaaProp
-        }
-
-        override fun startBIOManager(authType: Int) = when (authType) {
-            AUTH_TYPE_FINGERPRINT -> {
-                val intent = Intent(Settings.ACTION_SECURITY_SETTINGS).apply {
-                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                }
-
-                applicationContext.startActivity(intent)
-
-                COMMAND_OK
-            }
-
-            else -> COMMAND_FAIL
-        }
-
-        override fun getDeviceModel() = "${Build.MANUFACTURER}-${Build.DEVICE}"
-
-        override fun processCmd(param: ByteArray) = getMlipayService()?.let { mlipayService ->
-            var receiveBuffer: ByteArray? = null
-
-            val paramByteArray = ArrayList<Byte>().apply {
-                for (byte in param) {
-                    add(byte)
-                }
-            }
-
-            try {
-                val receiveBufferByteArray = mlipayService.invoke_command(
-                    paramByteArray, paramByteArray.size
-                )
-
-                receiveBuffer = receiveBufferByteArray.toByteArray()
-            } catch (e: Exception) {
-                Log.e(LOG_TAG, "processCmdImpl: mlipay invoke_command failed", e)
-            }
-
-            receiveBuffer
-        }
-
-        override fun getVersion() = 4
-
-        override fun getExtInfo(authType: Int, keyExtInfo: String) = initExtString()
-
-        override fun setExtInfo(authType: Int, keyExtInfo: String, valExtInfo: String) {
-            // Do nothing
-        }
-
-        override fun getEnabled(bioType: Int) = when (bioType) {
-            AUTH_TYPE_FINGERPRINT -> BIOMETRICS_AVAILABLE
-            else -> SCREEN_LOCK_NONE
-        }
-
-        override fun getIDList(bioType: Int): IntArray {
-            var idList = IntArray(0)
-
-            getMlipayService()?.let { mlipayService ->
-                try {
-                    val idListAL = mlipayService.ifaa_get_idlist(bioType)
-
-                    idList = idListAL.toIntArray()
-                } catch (e: Exception) {
-                    Log.e(LOG_TAG, "getIDListImpl: mlipay ifaa_get_idlist failed", e)
-                }
-            }
-
-            return idList
-        }
-    }
-
-    override fun onBind(intent: Intent) = mBinder
-
-    private fun getMlipayService() = _mlipayService ?: runCatching {
-        IMlipayService.getService(true)
-    }.onSuccess {
-        _mlipayService = it
-        it.linkToDeath(mlipayServiceDeathRecipient, 0)
-    }.getOrNull()
-
-    private fun initExtString(): String {
-        val obj = JSONObject()
-        val keyInfo = JSONObject()
-
-        val xy = SystemProperties.get(UDFPS_LOCATION_X_Y_PROP, "")
-        val wh = SystemProperties.get(UDFPS_SIZE_W_H_PROP, "")
-
-        try {
-            if (!validateVal(xy) || !validateVal(wh)) {
-                Log.e(LOG_TAG, "initExtString: invalidate, xy: $xy, wh: $wh")
-                return ""
-            }
-
-            val split = xy.split(",")
-            val split2 = wh.split(",")
-
-            keyInfo.put("startX", split[0].toInt())
-            keyInfo.put("startY", split[1].toInt())
-            keyInfo.put("width", split2[0].toInt())
-            keyInfo.put("height", split2[1].toInt())
-            keyInfo.put("navConflict", true)
-
-            obj.put("type", 0)
-            obj.put("fullView", keyInfo)
-
-            return obj.toString()
-        } catch (e: Exception) {
-            Log.e(LOG_TAG, "initExtString: Exception, xy: $xy, wh: $wh", e)
-            return ""
-        }
-    }
-
-    private fun validateVal(str: String) = !"".equals(str, ignoreCase = true) && str.contains(",")
-
-    companion object {
-        private val LOG_TAG = IfaaService::class.simpleName!!
-
-        private const val AUTH_TYPE_NOT_SUPPORT = 0
-        private const val AUTH_TYPE_FINGERPRINT = 1
-        private const val AUTH_TYPE_IRIS = 1.shl(1)
-        private const val AUTH_TYPE_OPTICAL_FINGERPRINT = 1.shl(2)
-
-        private const val BIOMETRICS_AVAILABLE = 1000
-        private const val SCREEN_LOCK_NONE = 1003
-
-        private const val COMMAND_OK = 0
-        private const val COMMAND_FAIL = -1
-
-        private const val SUPPORTED_BIO_MASK_PROP = "persist.vendor.sys.pay.ifaa"
-        private const val FP_VENDOR_PROP = "persist.vendor.sys.fp.vendor"
-        private const val IS_UDFPS_PROP = "ro.hardware.fp.udfps"
-        private const val UDFPS_LOCATION_X_Y_PROP = "persist.vendor.sys.fp.udfps.location.X_Y"
-        private const val UDFPS_SIZE_W_H_PROP = "persist.vendor.sys.fp.udfps.size.width_height"
-
-        private val invalidFpVendors = arrayOf(
-            "",
-            "none",
-        )
-    }
-}
--- a/README.md
+++ b/README.md
@@ -0,0 +1,10 @@
+# hardware/xiaomi
+
+## Soong options
+
+| Namespace | Variable | Description | Default |
+| --------- | -------- | ----------- | ------- |
+| XIAOMI_BIOMETRICS_FINGERPRINT | RUN_32BIT | Opt to run service in 32-bit mode only | false |
+| XIAOMI_TOUCH | HIGH_TOUCH_POLLING_PATH | HighTouchPollingRate feature control path | |
+| XIAOMI_TOUCH | KEY_DISABLER_CONTROL_PATH | KeyDisabler feature control path | |
+| XIAOMI_TOUCH | KEY_SWAPPER_CONTROL_PATH | KeySwapper feature control path | |
--- a/aidl/fingerprint/Android.bp
+++ b/aidl/fingerprint/Android.bp
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2024 The LineageOS Project
+// Copyright (C) 2024-2025 The LineageOS Project
 //               2024 Paranoid Android
 //
 // SPDX-License-Identifier: Apache-2.0
@@ -8,9 +8,9 @@
 soong_config_module_type {
    name: "xiaomi_hardware_biometrics_config_default",
    module_type: "cc_defaults",
-    config_namespace: "xiaomi_hardware_biometrics",
+    config_namespace: "XIAOMI_BIOMETRICS_FINGERPRINT",
    bool_variables: [
-        "run_32bit",
+        "RUN_32BIT",
    ],
    properties: ["compile_multilib"],
 }
@@ -19,7 +19,7 @@ xiaomi_hardware_biometrics_config_default {
    name: "xiaomi_hardware_biometrics_config_default",

    soong_config_variables: {
-        run_32bit: {
+        RUN_32BIT: {
            conditions_default: {
                compile_multilib: "64",
            },
--- a/aidl/fingerprint/Fingerprint.cpp
+++ b/aidl/fingerprint/Fingerprint.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 The LineageOS Project
+ * Copyright (C) 2024-2025 The LineageOS Project
 *               2024 Paranoid Android
 *
 * SPDX-License-Identifier: Apache-2.0
@@ -12,8 +12,11 @@
 #include "util/Util.h"

 #include <android-base/logging.h>
+#include <android-base/properties.h>
 #include <android-base/strings.h>

+using ::android::base::SetProperty;
+
 namespace aidl::android::hardware::biometrics::fingerprint {

 namespace {
@@ -67,15 +70,19 @@ Fingerprint::Fingerprint(std::shared_ptr<FingerprintConfig> config) : mConfig(st
            }
            ALOGI("Opened fingerprint HAL, class: %s, module_id: %s", class_name.c_str(),
                  class_module_id.c_str());
+            SetProperty("persist.vendor.sys.fp.vendor", class_name);
            break;
        }
        if (!mDevice) {
            ALOGE("Can't open any fingerprint HAL module");
+            SetProperty("persist.vendor.sys.fp.vendor", "none");
        }
    }

    std::string sensorTypeProp = mConfig->get<std::string>("type");
    if (sensorTypeProp == "udfps" || sensorTypeProp == "udfps_optical") {
+        SetProperty("ro.hardware.fp.udfps", "true");
+
        if (sensorTypeProp == "udfps") {
            mSensorType = FingerprintSensorType::UNDER_DISPLAY_ULTRASONIC;
        } else {
--- a/aidl/fingerprint/Session.cpp
+++ b/aidl/fingerprint/Session.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 The LineageOS Project
+ * Copyright (C) 2024-2025 The LineageOS Project
 *
 * SPDX-License-Identifier: Apache-2.0
 */
@@ -364,9 +364,15 @@ void Session::notify(const fingerprint_msg_t* msg) {
                HardwareAuthToken authToken;
                translate(hat, authToken);

+                if (mUdfpsHandler) {
+                    mUdfpsHandler->onAuthenticationSucceeded();
+                }
                mCb->onAuthenticationSucceeded(msg->data.authenticated.finger.fid, authToken);
                mLockoutTracker.reset(true);
            } else {
+                if (mUdfpsHandler) {
+                    mUdfpsHandler->onAuthenticationFailed();
+                }
                mCb->onAuthenticationFailed();
                mLockoutTracker.addFailedAttempt();
                checkSensorLockout();
--- a/aidl/fingerprint/android.hardware.biometrics.fingerprint-service.xiaomi.rc
+++ b/aidl/fingerprint/android.hardware.biometrics.fingerprint-service.xiaomi.rc
@@ -5,5 +5,6 @@ service vendor.fingerprint-default /vendor/bin/hw/android.hardware.biometrics.fi
    class late_start
    user system
    group system input uhid
+    capabilities SYS_NICE
    shutdown critical
    task_profiles ProcessCapacityHigh MaxPerformance
--- a/aidl/ir/Android.bp
+++ b/aidl/ir/Android.bp
@@ -1,21 +0,0 @@
-//
-// SPDX-FileCopyrightText: 2024 The LineageOS Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-cc_binary {
-    name: "android.hardware.ir-service.xiaomi",
-    relative_install_path: "hw",
-    vendor: true,
-    init_rc: ["android.hardware.ir-service.xiaomi.rc"],
-    vintf_fragments: ["android.hardware.ir-service.xiaomi.xml"],
-    srcs: [
-        "ConsumerIr.cpp",
-        "service.cpp",
-    ],
-    shared_libs: [
-        "libbase",
-        "libbinder_ndk",
-        "android.hardware.ir-V1-ndk",
-    ],
-}
--- a/aidl/ir/ConsumerIr.cpp
+++ b/aidl/ir/ConsumerIr.cpp
@@ -1,80 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define LOG_TAG "ConsumerIr"
-
-#include "ConsumerIr.h"
-
-#include <android-base/logging.h>
-#include <fcntl.h>
-#include <linux/lirc.h>
-#include <string>
-
-using std::vector;
-
-namespace aidl {
-namespace android {
-namespace hardware {
-namespace ir {
-
-static const std::string kIrDevice = "/dev/lirc0";
-
-static vector<ConsumerIrFreqRange> kRangeVec{
-        {.minHz = 30000, .maxHz = 60000},
-};
-
-::ndk::ScopedAStatus ConsumerIr::getCarrierFreqs(vector<ConsumerIrFreqRange>* _aidl_return) {
-    *_aidl_return = kRangeVec;
-
-    return ::ndk::ScopedAStatus::ok();
-}
-
-::ndk::ScopedAStatus ConsumerIr::transmit(int32_t carrierFreqHz, const vector<int32_t>& pattern) {
-    size_t entries = pattern.size();
-
-    if (entries == 0) {
-        return ::ndk::ScopedAStatus::ok();
-    }
-
-    int fd = open(kIrDevice.c_str(), O_RDWR);
-    if (fd < 0) {
-        LOG(ERROR) << "Failed to open " << kIrDevice << ", error " << fd;
-
-        return ::ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE);
-    }
-
-    int rc = ioctl(fd, LIRC_SET_SEND_CARRIER, &carrierFreqHz);
-    if (rc < 0) {
-        LOG(ERROR) << "Failed to set carrier " << carrierFreqHz << ", error: " << errno;
-
-        close(fd);
-
-        return ::ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
-    }
-
-    if ((entries & 1) != 0) {
-        rc = write(fd, pattern.data(), entries * sizeof(int32_t));
-    } else {
-        rc = write(fd, pattern.data(), (entries - 1) * sizeof(int32_t));
-        usleep(pattern[entries - 1]);
-    }
-
-    if (rc < 0) {
-        LOG(ERROR) << "Failed to write pattern, " << entries << " entries, error: " << errno;
-
-        close(fd);
-
-        return ::ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE);
-    }
-
-    close(fd);
-
-    return ::ndk::ScopedAStatus::ok();
-}
-
-}  // namespace ir
-}  // namespace hardware
-}  // namespace android
-}  // namespace aidl
--- a/aidl/ir/ConsumerIr.h
+++ b/aidl/ir/ConsumerIr.h
@@ -1,27 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include <aidl/android/hardware/ir/BnConsumerIr.h>
-
-namespace aidl {
-namespace android {
-namespace hardware {
-namespace ir {
-
-class ConsumerIr : public BnConsumerIr {
-  public:
-    ::ndk::ScopedAStatus getCarrierFreqs(
-            ::std::vector<::aidl::android::hardware::ir::ConsumerIrFreqRange>* _aidl_return)
-            override;
-    ::ndk::ScopedAStatus transmit(int32_t carrierFreqHz,
-                                  const ::std::vector<int32_t>& pattern) override;
-};
-
-}  // namespace ir
-}  // namespace hardware
-}  // namespace android
-}  // namespace aidl
--- a/aidl/ir/android.hardware.ir-service.xiaomi.rc
+++ b/aidl/ir/android.hardware.ir-service.xiaomi.rc
@@ -1,14 +0,0 @@
-#
-# SPDX-FileCopyrightText: 2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-on early-boot
-    # IR device
-    chown system system /dev/lirc0
-
-service vendor.ir-default /vendor/bin/hw/android.hardware.ir-service.xiaomi
-    class hal
-    user system
-    group system
-    shutdown critical
--- a/aidl/ir/android.hardware.ir-service.xiaomi.xml
+++ b/aidl/ir/android.hardware.ir-service.xiaomi.xml
@@ -1,11 +0,0 @@
-<!--
-    SPDX-FileCopyrightText: 2024 The LineageOS Project
-    SPDX-License-Identifier: Apache-2.0
-->
-<manifest version="1.0" type="device">
-    <hal format="aidl">
-        <name>android.hardware.ir</name>
-        <version>1</version>
-        <fqname>IConsumerIr/default</fqname>
-    </hal>
-</manifest>
--- a/aidl/ir/service.cpp
+++ b/aidl/ir/service.cpp
@@ -1,24 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "ConsumerIr.h"
-
-#include <android-base/logging.h>
-#include <android/binder_manager.h>
-#include <android/binder_process.h>
-
-using aidl::android::hardware::ir::ConsumerIr;
-
-int main() {
-    ABinderProcess_setThreadPoolMaxThreadCount(0);
-    std::shared_ptr<ConsumerIr> hal = ::ndk::SharedRefBase::make<ConsumerIr>();
-
-    const std::string instance = std::string(ConsumerIr::descriptor) + "/default";
-    binder_status_t status = AServiceManager_addService(hal->asBinder().get(), instance.c_str());
-    CHECK_EQ(status, STATUS_OK);
-
-    ABinderProcess_joinThreadPool();
-    return EXIT_FAILURE;  // should not reach
-}
--- a/aidl/sensors/Android.bp
+++ b/aidl/sensors/Android.bp
@@ -19,6 +19,12 @@ package {
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

+vintf_fragment {
+    name: "android.hardware.sensors.xiaomi-multihal.xml",
+    src: "android.hardware.sensors.xiaomi-multihal.xml",
+    vendor: true,
+}
+
 cc_binary {
    name: "android.hardware.sensors-service.xiaomi-multihal",
    vendor: true,
@@ -33,12 +39,12 @@ cc_binary {
        "android.hardware.sensors@2.X-shared-utils",
    ],
    init_rc: ["android.hardware.sensors-service.xiaomi-multihal.rc"],
-    vintf_fragments: ["android.hardware.sensors.xiaomi-multihal.xml"],
+    vintf_fragment_modules: ["android.hardware.sensors.xiaomi-multihal.xml"],
    shared_libs: [
        "android.hardware.sensors@2.0-ScopedWakelock",
        "android.hardware.sensors@2.0",
        "android.hardware.sensors@2.1",
-        "android.hardware.sensors-V2-ndk",
+        "android.hardware.sensors-V3-ndk",
        "libbase",
        "libcutils",
        "libfmq",
--- a/aidl/sensors/HalProxy.cpp
+++ b/aidl/sensors/HalProxy.cpp
@@ -147,9 +147,9 @@ Return<void> HalProxy::getSensorsList_2_1(ISensorsV2_1::getSensorsList_2_1_cb _h
 Return<void> HalProxy::getSensorsList(ISensorsV2_0::getSensorsList_cb _hidl_cb) {
    std::vector<V1_0::SensorInfo> sensors;
    for (const auto& iter : mSensors) {
-      if (iter.second.type != SensorType::HINGE_ANGLE) {
-        sensors.push_back(convertToOldSensorInfo(iter.second));
-      }
+        if (iter.second.type != SensorType::HINGE_ANGLE) {
+            sensors.push_back(convertToOldSensorInfo(iter.second));
+        }
    }
    _hidl_cb(sensors);
    return Void();
@@ -612,7 +612,8 @@ void HalProxy::handlePendingWrites() {
                        static_cast<uint32_t>(EventQueueFlagBits::EVENTS_READ),
                        static_cast<uint32_t>(EventQueueFlagBits::READ_AND_PROCESS),
                        kPendingWriteTimeoutNs, mEventQueueFlag)) {
-                ALOGE("Dropping %zu events after blockingWrite failed.", numToWrite);
+                ALOGE("Dropping %zu events after blockingWrite failed (is system_server running?).",
+                      numToWrite);
                if (numWakeupEvents > 0) {
                    if (pendingWriteEvents.size() > eventQueueSize) {
                        decrementRefCountAndMaybeReleaseWakelock(
@@ -735,8 +736,7 @@ void HalProxy::decrementRefCountAndMaybeReleaseWakelock(size_t delta,
    if (!mThreadsRun.load()) return;
    std::lock_guard<std::recursive_mutex> lockGuard(mWakelockMutex);
    if (delta > mWakelockRefCount) {
-        ALOGE("Decrementing wakelock ref count by %zu when count is %zu",
-              delta, mWakelockRefCount);
+        ALOGE("Decrementing wakelock ref count by %zu when count is %zu", delta, mWakelockRefCount);
    }
    if (timeoutStart == -1) timeoutStart = mWakelockTimeoutResetTime;
    if (mWakelockRefCount == 0 || timeoutStart < mWakelockTimeoutResetTime) return;
--- a/aidl/sensors/HalProxyCallback.cpp
+++ b/aidl/sensors/HalProxyCallback.cpp
@@ -74,8 +74,7 @@ std::vector<V2_1::Event> HalProxyCallbackBase::processEvents(const std::vector<V
        }
        const V2_1::SensorInfo& sensor = mCallback->getSensorInfo(event.sensorHandle);

-        if (sensor.type == V2_1::SensorType::PICK_UP_GESTURE
-            && event.u.scalar != 1) {
+        if (sensor.type == V2_1::SensorType::PICK_UP_GESTURE && event.u.scalar != 1) {
            continue;
        }

--- a/aidl/sensors/android.hardware.sensors-service.xiaomi-multihal.rc
+++ b/aidl/sensors/android.hardware.sensors-service.xiaomi-multihal.rc
@@ -1,3 +1,6 @@
+on boot
+    setprop vendor.sensors.dynamic_sensor_op_timeout_ms 1600
+
 service vendor.sensors-hal-multihal /vendor/bin/hw/android.hardware.sensors-service.xiaomi-multihal
    class hal
    user system
--- a/aidl/sensors/android.hardware.sensors.xiaomi-multihal.xml
+++ b/aidl/sensors/android.hardware.sensors.xiaomi-multihal.xml
@@ -17,7 +17,7 @@
 <manifest version="1.0" type="device">
    <hal format="aidl">
        <name>android.hardware.sensors</name>
-        <version>2</version>
+        <version>3</version>
        <fqname>ISensors/default</fqname>
    </hal>
 </manifest>
--- a/aidl/touch/Android.bp
+++ b/aidl/touch/Android.bp
@@ -0,0 +1,48 @@
+//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+cc_binary {
+    name: "vendor.lineage.touch-service.xiaomi",
+    init_rc: ["vendor.lineage.touch-service.xiaomi.rc"],
+    vintf_fragments: select(soong_config_variable("XIAOMI_TOUCH", "HIGH_TOUCH_POLLING_PATH"), {
+        any: ["vendor.lineage.touch-service.xiaomi-htpr.xml"],
+        default: [],
+    }) + select(soong_config_variable("XIAOMI_TOUCH", "KEY_DISABLER_CONTROL_PATH"), {
+        any: ["vendor.lineage.touch-service.xiaomi-kd.xml"],
+        default: [],
+    }) + select(soong_config_variable("XIAOMI_TOUCH", "KEY_SWAPPER_CONTROL_PATH"), {
+        any: ["vendor.lineage.touch-service.xiaomi-ks.xml"],
+        default: [],
+    }),
+    relative_install_path: "hw",
+    proprietary: true,
+    cppflags: select(soong_config_variable("XIAOMI_TOUCH", "HIGH_TOUCH_POLLING_PATH"), {
+        any @ flag_val: ["-DHTPR_CONTROL_PATH=\"" + flag_val + "\""],
+        default: [],
+    }) + select(soong_config_variable("XIAOMI_TOUCH", "KEY_DISABLER_CONTROL_PATH"), {
+        any @ flag_val: ["-DKD_CONTROL_PATH=\"" + flag_val + "\""],
+        default: [],
+    }) + select(soong_config_variable("XIAOMI_TOUCH", "KEY_SWAPPER_CONTROL_PATH"), {
+        any @ flag_val: ["-DKS_CONTROL_PATH=\"" + flag_val + "\""],
+        default: [],
+    }),
+    srcs: select(soong_config_variable("XIAOMI_TOUCH", "HIGH_TOUCH_POLLING_PATH"), {
+        any: ["HighTouchPollingRate.cpp"],
+        default: [],
+    }) + select(soong_config_variable("XIAOMI_TOUCH", "KEY_DISABLER_CONTROL_PATH"), {
+        any: ["KeyDisabler.cpp"],
+        default: [],
+    }) + select(soong_config_variable("XIAOMI_TOUCH", "KEY_SWAPPER_CONTROL_PATH"), {
+        any: ["KeySwapper.cpp"],
+        default: [],
+    }) + ["service.cpp"],
+    shared_libs: [
+        "libbase",
+        "libbinder_ndk",
+        "liblog",
+        "libutils",
+        "vendor.lineage.touch-V1-ndk",
+    ],
+}
--- a/aidl/touch/HighTouchPollingRate.cpp
+++ b/aidl/touch/HighTouchPollingRate.cpp
@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: 2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define LOG_TAG "vendor.lineage.touch-service.xiaomi"
+
+#include "HighTouchPollingRate.h"
+
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android-base/strings.h>
+
+using ::android::base::ReadFileToString;
+using ::android::base::Trim;
+using ::android::base::WriteStringToFile;
+
+namespace aidl {
+namespace vendor {
+namespace lineage {
+namespace touch {
+
+ndk::ScopedAStatus HighTouchPollingRate::getEnabled(bool* _aidl_return) {
+    std::string buf;
+    if (!ReadFileToString(HTPR_CONTROL_PATH, &buf)) {
+        LOG(ERROR) << "Failed to read current HighTouchPollingRate state";
+        return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
+    }
+
+    *_aidl_return = Trim(buf) == "1";
+    return ndk::ScopedAStatus::ok();
+}
+
+ndk::ScopedAStatus HighTouchPollingRate::setEnabled(bool enabled) {
+    if (!WriteStringToFile(enabled ? "1" : "0", HTPR_CONTROL_PATH)) {
+        LOG(ERROR) << "Failed to write HighTouchPollingRate state";
+        return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
+    }
+
+    return ndk::ScopedAStatus::ok();
+}
+
+}  // namespace touch
+}  // namespace lineage
+}  // namespace vendor
+}  // namespace aidl
--- a/aidl/touch/HighTouchPollingRate.h
+++ b/aidl/touch/HighTouchPollingRate.h
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <aidl/vendor/lineage/touch/BnHighTouchPollingRate.h>
+
+namespace aidl {
+namespace vendor {
+namespace lineage {
+namespace touch {
+
+class HighTouchPollingRate : public BnHighTouchPollingRate {
+  public:
+    ndk::ScopedAStatus getEnabled(bool* _aidl_return) override;
+    ndk::ScopedAStatus setEnabled(bool enabled) override;
+};
+
+}  // namespace touch
+}  // namespace lineage
+}  // namespace vendor
+}  // namespace aidl
--- a/aidl/touch/KeyDisabler.cpp
+++ b/aidl/touch/KeyDisabler.cpp
@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: 2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define LOG_TAG "vendor.lineage.touch-service.xiaomi"
+
+#include "KeyDisabler.h"
+
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android-base/strings.h>
+
+using ::android::base::ReadFileToString;
+using ::android::base::Trim;
+using ::android::base::WriteStringToFile;
+
+namespace aidl {
+namespace vendor {
+namespace lineage {
+namespace touch {
+
+ndk::ScopedAStatus KeyDisabler::getEnabled(bool* _aidl_return) {
+    std::string buf;
+    if (!ReadFileToString(KD_CONTROL_PATH, &buf)) {
+        LOG(ERROR) << "Failed to read current KeyDisabler state";
+        return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
+    }
+
+    *_aidl_return = Trim(buf) == "0";
+    return ndk::ScopedAStatus::ok();
+}
+
+ndk::ScopedAStatus KeyDisabler::setEnabled(bool enabled) {
+    if (!WriteStringToFile(enabled ? "0" : "1", KD_CONTROL_PATH, true)) {
+        LOG(ERROR) << "Failed to write KeyDisabler state";
+        return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
+    }
+
+    return ndk::ScopedAStatus::ok();
+}
+
+}  // namespace touch
+}  // namespace lineage
+}  // namespace vendor
+}  // namespace aidl
--- a/aidl/touch/KeyDisabler.h
+++ b/aidl/touch/KeyDisabler.h
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <aidl/vendor/lineage/touch/BnKeyDisabler.h>
+
+namespace aidl {
+namespace vendor {
+namespace lineage {
+namespace touch {
+
+class KeyDisabler : public BnKeyDisabler {
+  public:
+    ndk::ScopedAStatus getEnabled(bool* _aidl_return) override;
+    ndk::ScopedAStatus setEnabled(bool enabled) override;
+};
+
+}  // namespace touch
+}  // namespace lineage
+}  // namespace vendor
+}  // namespace aidl
--- a/aidl/touch/KeySwapper.cpp
+++ b/aidl/touch/KeySwapper.cpp
@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: 2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define LOG_TAG "vendor.lineage.touch-service.xiaomi"
+
+#include "KeySwapper.h"
+
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android-base/strings.h>
+
+using ::android::base::ReadFileToString;
+using ::android::base::Trim;
+using ::android::base::WriteStringToFile;
+
+namespace aidl {
+namespace vendor {
+namespace lineage {
+namespace touch {
+
+ndk::ScopedAStatus KeySwapper::getEnabled(bool* _aidl_return) {
+    std::string buf;
+    if (!ReadFileToString(KS_CONTROL_PATH, &buf)) {
+        LOG(ERROR) << "Failed to read current KeySwapper state";
+        return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
+    }
+
+    *_aidl_return = Trim(buf) == "1";
+    return ndk::ScopedAStatus::ok();
+}
+
+ndk::ScopedAStatus KeySwapper::setEnabled(bool enabled) {
+    if (!WriteStringToFile(enabled ? "1" : "0", KS_CONTROL_PATH, true)) {
+        LOG(ERROR) << "Failed to write KeySwapper state";
+        return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
+    }
+
+    return ndk::ScopedAStatus::ok();
+}
+
+}  // namespace touch
+}  // namespace lineage
+}  // namespace vendor
+}  // namespace aidl
--- a/aidl/touch/KeySwapper.h
+++ b/aidl/touch/KeySwapper.h
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <aidl/vendor/lineage/touch/BnKeySwapper.h>
+
+namespace aidl {
+namespace vendor {
+namespace lineage {
+namespace touch {
+
+class KeySwapper : public BnKeySwapper {
+  public:
+    ndk::ScopedAStatus getEnabled(bool* _aidl_return) override;
+    ndk::ScopedAStatus setEnabled(bool enabled) override;
+};
+
+}  // namespace touch
+}  // namespace lineage
+}  // namespace vendor
+}  // namespace aidl
--- a/aidl/touch/service.cpp
+++ b/aidl/touch/service.cpp
@@ -0,0 +1,48 @@
+/*
+ * SPDX-FileCopyrightText: 2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define LOG_TAG "vendor.lineage.touch-service.xiaomi"
+
+#include "HighTouchPollingRate.h"
+#include "KeyDisabler.h"
+#include "KeySwapper.h"
+
+#include <android-base/logging.h>
+#include <android/binder_manager.h>
+#include <android/binder_process.h>
+
+using aidl::vendor::lineage::touch::HighTouchPollingRate;
+using aidl::vendor::lineage::touch::KeyDisabler;
+using aidl::vendor::lineage::touch::KeySwapper;
+
+int main() {
+    binder_status_t status = STATUS_OK;
+
+    ABinderProcess_setThreadPoolMaxThreadCount(0);
+
+#ifdef HTPR_CONTROL_PATH
+    std::shared_ptr<HighTouchPollingRate> htpr = ndk::SharedRefBase::make<HighTouchPollingRate>();
+    const std::string htpr_instance = std::string(HighTouchPollingRate::descriptor) + "/default";
+    status = AServiceManager_addService(htpr->asBinder().get(), htpr_instance.c_str());
+    CHECK_EQ(status, STATUS_OK) << "Failed to add service " << htpr_instance << " " << status;
+#endif
+
+#ifdef KD_CONTROL_PATH
+    std::shared_ptr<KeyDisabler> kd = ndk::SharedRefBase::make<KeyDisabler>();
+    const std::string kd_instance = std::string(KeyDisabler::descriptor) + "/default";
+    status = AServiceManager_addService(kd->asBinder().get(), kd_instance.c_str());
+    CHECK_EQ(status, STATUS_OK) << "Failed to add service " << kd_instance << " " << status;
+#endif
+
+#ifdef KS_CONTROL_PATH
+    std::shared_ptr<KeySwapper> ks = ndk::SharedRefBase::make<KeySwapper>();
+    const std::string ks_instance = std::string(KeySwapper::descriptor) + "/default";
+    status = AServiceManager_addService(ks->asBinder().get(), ks_instance.c_str());
+    CHECK_EQ(status, STATUS_OK) << "Failed to add service " << ks_instance << " " << status;
+#endif
+
+    ABinderProcess_joinThreadPool();
+    return EXIT_FAILURE;  // should not reach
+}
--- a/aidl/touch/vendor.lineage.touch-service.xiaomi-htpr.xml
+++ b/aidl/touch/vendor.lineage.touch-service.xiaomi-htpr.xml
@@ -1,8 +1,7 @@
 <manifest version="1.0" type="device">
-    <hal format="hidl">
+    <hal format="aidl">
        <name>vendor.lineage.touch</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1</version>
        <interface>
            <name>IHighTouchPollingRate</name>
            <instance>default</instance>
--- a/aidl/touch/vendor.lineage.touch-service.xiaomi-kd.xml
+++ b/aidl/touch/vendor.lineage.touch-service.xiaomi-kd.xml
@@ -0,0 +1,10 @@
+<manifest version="1.0" type="device">
+    <hal format="aidl">
+        <name>vendor.lineage.touch</name>
+        <version>1</version>
+        <interface>
+            <name>IKeyDisabler</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
--- a/aidl/touch/vendor.lineage.touch-service.xiaomi-ks.xml
+++ b/aidl/touch/vendor.lineage.touch-service.xiaomi-ks.xml
@@ -0,0 +1,10 @@
+<manifest version="1.0" type="device">
+    <hal format="aidl">
+        <name>vendor.lineage.touch</name>
+        <version>1</version>
+        <interface>
+            <name>IKeySwapper</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
--- a/aidl/touch/vendor.lineage.touch-service.xiaomi.rc
+++ b/aidl/touch/vendor.lineage.touch-service.xiaomi.rc
@@ -0,0 +1,4 @@
+service vendor.touch-hal /vendor/bin/hw/vendor.lineage.touch-service.xiaomi
+    class hal
+    user system
+    group system
--- a/dolby/AndroidManifest.xml
+++ b/dolby/AndroidManifest.xml
@@ -10,7 +10,8 @@
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <application
-        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:allowBackup="false"
        android:label="@string/dolby_title"
        android:persistent="true">

@@ -25,7 +26,7 @@
        <activity
            android:name=".DolbyActivity"
            android:label="@string/dolby_title"
-            android:theme="@style/Theme.SubSettingsBase"
+            android:theme="@style/Theme.SubSettingsBase.Expressive"
            android:exported="true">
            <intent-filter>
                <action android:name="com.android.settings.action.IA_SETTINGS" />
@@ -36,6 +37,10 @@
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.CATEGORY_CONTENT_MUSIC" />
            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
            <meta-data android:name="com.android.settings.category"
                       android:value="com.android.settings.category.ia.sound" />
            <meta-data android:name="com.android.settings.summary_uri"
@@ -45,7 +50,7 @@
        <activity
            android:name=".geq.EqualizerActivity"
            android:label="@string/dolby_preset"
-            android:theme="@style/Theme.SubSettingsBase"
+            android:theme="@style/Theme.SubSettingsBase.Expressive"
            android:exported="true" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
--- a/dolby/res/drawable/ic_launcher_background.xml
+++ b/dolby/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="108.0dip" android:width="108.0dip" android:viewportWidth="108.0" android:viewportHeight="108.0"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <group android:scaleX="1.3544992" android:scaleY="1.3544992" android:translateX="-23.22" android:translateY="-23.22">
+        <group>
+            <clip-path android:pathData="M57.01,57.01m-54,0a54,54 0,1 1,108 0a54,54 0,1 1,-108 0" />
+            <path android:fillColor="#ffeaedef" android:pathData="M-1.9,-1.9h117.82v117.82h-117.82z" />
+            <path android:fillColor="@drawable/ic_launcher_background__0" android:pathData="M-1.9,115.92l0,-117.82l117.82,0l-117.82,117.82z" />
+            <path android:fillColor="@drawable/ic_launcher_background__1" android:pathData="M-1.9,-1.9h117.82v117.82h-117.82z" android:strokeAlpha="0.2" android:fillAlpha="0.2" />
+        </group>
+    </group>
+</vector>
--- a/dolby/res/drawable/ic_launcher_background__0.xml
+++ b/dolby/res/drawable/ic_launcher_background__0.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gradient android:angle="0.0" android:type="linear" android:startX="57.01" android:startY="56.4" android:endX="57.01" android:endY="-1.58"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <item android:color="#ffffffff" android:offset="0.0" />
+    <item android:color="#fff3f5f6" android:offset="1.0" />
+</gradient>
--- a/dolby/res/drawable/ic_launcher_background__1.xml
+++ b/dolby/res/drawable/ic_launcher_background__1.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gradient android:angle="0.0" android:type="linear" android:startX="-1.9" android:startY="115.92" android:endX="115.92" android:endY="-1.9"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <item android:color="#ff80d0ce" android:offset="0.0" />
+    <item android:color="#ff9fa8da" android:offset="1.0" />
+</gradient>
--- a/dolby/res/drawable/ic_launcher_foreground.xml
+++ b/dolby/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="108.0dip" android:width="108.0dip" android:viewportWidth="108.0" android:viewportHeight="108.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <group android:scaleX="0.84" android:scaleY="0.84" android:translateX="23.76" android:translateY="23.76">
+        <path android:fillColor="#ff465461" android:pathData="M12,19.13h5a16.87,16.87 0,0 1,0 33.74H12Z" />
+        <path android:fillColor="#ff465461" android:pathData="M60,52.87H55a16.87,16.87 0,0 1,0 -33.74h5Z" />
+    </group>
+</vector>
--- a/dolby/res/drawable/ic_launcher_mono.xml
+++ b/dolby/res/drawable/ic_launcher_mono.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="108dp" android:width="108dp" android:viewportWidth="108" android:viewportHeight="108">
+    <path android:fillColor="#000000" android:pathData="M36.6305484,38 C45.6078241,38.1592687 52.837468,45.7082857 52.837468,54.9974325 C52.837468,64.2865794 45.6078241,71.8355964 36.6307694,71.9948651 L32,72 L32,38 L36.6305484,38 Z M36.999,43.017 L36.999,66.977 L37.1225728,66.9701894 C42.9872179,66.559014 47.6837958,61.5395304 47.8337726,55.3050128 L47.837468,54.9974325 C47.837468,48.6211219 43.0833381,43.4425908 37.1223719,43.0246757 L36.999,43.017 Z M71.3694516,38 C62.3921759,38.1592687 55.162532,45.7082857 55.162532,54.9974325 C55.162532,64.2865794 62.3921759,71.8355964 71.3692306,71.9948651 L76,72 L76,38 L71.3694516,38 Z M71.000532,43.017 L71.000532,66.977 L70.8774272,66.9701894 C65.0127821,66.559014 60.3162042,61.5395304 60.1662274,55.3050128 L60.162532,54.9974325 C60.162532,48.6211219 64.9166619,43.4425908 70.8776281,43.0246757 L71.000532,43.017 Z" android:strokeWidth="1"/>
+</vector>
--- a/dolby/res/mipmap-anydpi/ic_launcher.xml
+++ b/dolby/res/mipmap-anydpi/ic_launcher.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_mono" />
+</adaptive-icon>
--- a/dolby/src/co/aospa/dolby/xiaomi/DolbyActivity.kt
+++ b/dolby/src/co/aospa/dolby/xiaomi/DolbyActivity.kt
@@ -10,14 +10,16 @@ import android.os.Bundle
 import co.aospa.dolby.xiaomi.preference.DolbySettingsFragment
 import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity

-private const val TAG = "DolbyActivity"
-
 class DolbyActivity : CollapsingToolbarBaseActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        fragmentManager.beginTransaction()
-            .replace(com.android.settingslib.collapsingtoolbar.R.id.content_frame, DolbySettingsFragment(), TAG)
+        supportFragmentManager
+            .beginTransaction()
+            .replace(
+                com.android.settingslib.collapsingtoolbar.R.id.content_frame,
+                DolbySettingsFragment(),
+            )
            .commit()
    }
 }
--- a/dolby/src/co/aospa/dolby/xiaomi/DolbyController.kt
+++ b/dolby/src/co/aospa/dolby/xiaomi/DolbyController.kt
@@ -23,7 +23,7 @@ internal class DolbyController private constructor(
    private val context: Context
 ) {
    private var dolbyEffect = DolbyAudioEffect(EFFECT_PRIORITY, audioSession = 0)
-    private val audioManager = context.getSystemService(AudioManager::class.java)
+    private val audioManager = context.getSystemService(AudioManager::class.java)!!
    private val handler = Handler(context.mainLooper)

    // Restore current profile on every media session
@@ -57,10 +57,10 @@ internal class DolbyController private constructor(
            field = value
            dlog(TAG, "setRegisterCallbacks($value)")
            if (value) {
-                audioManager!!.registerAudioPlaybackCallback(playbackCallback, handler)
+                audioManager.registerAudioPlaybackCallback(playbackCallback, handler)
                audioManager.registerAudioDeviceCallback(audioDeviceCallback, handler)
            } else {
-                audioManager!!.unregisterAudioPlaybackCallback(playbackCallback)
+                audioManager.unregisterAudioPlaybackCallback(playbackCallback)
                audioManager.unregisterAudioDeviceCallback(audioDeviceCallback)
            }
        }
@@ -102,13 +102,13 @@ internal class DolbyController private constructor(
        dsOn = prefs.getBoolean(DolbyConstants.PREF_ENABLE, true)

        context.resources.getStringArray(R.array.dolby_profile_values)
-            .map { it.toInt() }
-            .forEach { profile ->
-                // Reset dolby first to prevent it from loading bad settings
-                dolbyEffect.resetProfileSpecificSettings(profile)
-                // Now restore our profile-specific settings
-                restoreSettings(profile)
-            }
+                .map { it.toInt() }
+                .forEach { profile ->
+                    // Reset dolby first to prevent it from loading bad settings
+                    dolbyEffect.resetProfileSpecificSettings(profile)
+                    // Now restore our profile-specific settings
+                    restoreSettings(profile)
+                }

        // Finally restore the current profile.
        setCurrentProfile()
@@ -174,6 +174,13 @@ internal class DolbyController private constructor(
        profile = prefs.getString(DolbyConstants.PREF_PROFILE, "0" /*dynamic*/)!!.toInt()
    }

+    fun setDsOnAndPersist(dsOn: Boolean) {
+        this.dsOn = dsOn
+        PreferenceManager.getDefaultSharedPreferences(context).edit()
+            .putBoolean(DolbyConstants.PREF_ENABLE, dsOn)
+            .apply()
+    }
+
    fun getProfileName(): String? {
        val profile = dolbyEffect.profile.toString()
        val profiles = context.resources.getStringArray(R.array.dolby_profile_values)
@@ -202,8 +209,8 @@ internal class DolbyController private constructor(
        dlog(TAG, "setPreset: $value")
        checkEffect()
        val gains = value.split(",")
-            .map { it.toInt() }
-            .toIntArray()
+                .map { it.toInt() }
+                .toIntArray()
        dolbyEffect.setDapParameter(DsParam.GEQ_BAND_GAINS, gains, profile)
    }

--- a/dolby/src/co/aospa/dolby/xiaomi/DolbyTileService.kt
+++ b/dolby/src/co/aospa/dolby/xiaomi/DolbyTileService.kt
@@ -26,7 +26,7 @@ class DolbyTileService : TileService() {

    override fun onClick() {
        val isDsOn = dolbyController.dsOn
-        dolbyController.dsOn = !isDsOn
+        dolbyController.setDsOnAndPersist(!isDsOn) // toggle
        qsTile.apply {
            state = if (isDsOn) Tile.STATE_INACTIVE else Tile.STATE_ACTIVE
            updateTile()
--- a/dolby/src/co/aospa/dolby/xiaomi/SummaryProvider.kt
+++ b/dolby/src/co/aospa/dolby/xiaomi/SummaryProvider.kt
@@ -58,13 +58,14 @@ class SummaryProvider : ContentProvider() {
    ): Int = 0

    private fun getDolbySummary(): String {
-        val dolbyController = DolbyController.getInstance(context!!)
+        val context = context!!
+        val dolbyController = DolbyController.getInstance(context)
        if (!dolbyController.dsOn) {
-            return context!!.getString(R.string.dolby_off)
+            return context.getString(R.string.dolby_off)
        }
        return dolbyController.getProfileName()?.let {
-            context!!.getString(R.string.dolby_on_with_profile, it)
-        } ?: context!!.getString(R.string.dolby_on)
+            context.getString(R.string.dolby_on_with_profile, it)
+        } ?: context.getString(R.string.dolby_on)
    }

 }
--- a/dolby/src/co/aospa/dolby/xiaomi/geq/ui/TooltipIconButton.kt
+++ b/dolby/src/co/aospa/dolby/xiaomi/geq/ui/TooltipIconButton.kt
@@ -27,7 +27,7 @@ fun TooltipIconButton(
    onClick: () -> Unit
 ) {
    TooltipBox(
-        positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
+        positionProvider = TooltipDefaults.rememberTooltipPositionProvider(),
        tooltip = {
            Text(text)
        },
--- a/dolby/src/co/aospa/dolby/xiaomi/preference/DolbyPreferenceStore.kt
+++ b/dolby/src/co/aospa/dolby/xiaomi/preference/DolbyPreferenceStore.kt
@@ -40,24 +40,24 @@ class DolbyPreferenceStore(

    override fun putBoolean(key: String, value: Boolean) =
        getSharedPreferences(key).edit()
-            .putBoolean(key, value)
-            .apply()
+                .putBoolean(key, value)
+                .apply()

    override fun getBoolean(key: String, defValue: Boolean) =
        getSharedPreferences(key).getBoolean(key, defValue)

    override fun putInt(key: String, value: Int) =
        getSharedPreferences(key).edit()
-            .putInt(key, value)
-            .apply()
+                .putInt(key, value)
+                .apply()

    override fun getInt(key: String, defValue: Int) =
        getSharedPreferences(key).getInt(key, defValue)

    override fun putString(key: String, value: String?) =
        getSharedPreferences(key).edit()
-            .putString(key, value)
-            .apply()
+                .putString(key, value)
+                .apply()

    override fun getString(key: String, defValue: String?) =
        getSharedPreferences(key).getString(key, defValue)
--- a/dolby/src/co/aospa/dolby/xiaomi/preference/DolbySettingsFragment.kt
+++ b/dolby/src/co/aospa/dolby/xiaomi/preference/DolbySettingsFragment.kt
@@ -6,20 +6,20 @@

 package co.aospa.dolby.xiaomi.preference

+import android.content.Context
 import android.media.AudioAttributes
 import android.media.AudioDeviceCallback
 import android.media.AudioDeviceInfo
 import android.media.AudioManager
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
+import android.view.View
 import android.widget.CompoundButton
 import android.widget.Toast
 import androidx.preference.ListPreference
 import androidx.preference.Preference
-import androidx.preference.Preference.OnPreferenceChangeListener
-import androidx.preference.PreferenceFragment
 import androidx.preference.SwitchPreferenceCompat
-import co.aospa.dolby.xiaomi.DolbyConstants
 import co.aospa.dolby.xiaomi.DolbyConstants.Companion.PREF_BASS
 import co.aospa.dolby.xiaomi.DolbyConstants.Companion.PREF_DIALOGUE
 import co.aospa.dolby.xiaomi.DolbyConstants.Companion.PREF_ENABLE
@@ -35,47 +35,33 @@ import co.aospa.dolby.xiaomi.DolbyConstants.Companion.dlog
 import co.aospa.dolby.xiaomi.DolbyController
 import co.aospa.dolby.xiaomi.R
 import com.android.settingslib.widget.MainSwitchPreference
+import com.android.settingslib.widget.SettingsBasePreferenceFragment

-class DolbySettingsFragment : PreferenceFragment(),
-    OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {
+class DolbySettingsFragment : SettingsBasePreferenceFragment(),
+    Preference.OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {

-    private val switchBar by lazy {
-        findPreference<MainSwitchPreference>(PREF_ENABLE)!!
-    }
-    private val profilePref by lazy {
-        findPreference<ListPreference>(PREF_PROFILE)!!
-    }
-    private val presetPref by lazy {
-        findPreference<Preference>(PREF_PRESET)!!
-    }
-    private val ieqPref by lazy {
-        findPreference<DolbyIeqPreference>(PREF_IEQ)!!
-    }
-    private val stereoPref by lazy {
-        findPreference<ListPreference>(PREF_STEREO)!!
-    }
-    private val dialoguePref by lazy {
-        findPreference<ListPreference>(PREF_DIALOGUE)!!
-    }
-    private val bassPref by lazy {
-        findPreference<SwitchPreferenceCompat>(PREF_BASS)!!
-    }
-    private val hpVirtPref by lazy {
-        findPreference<SwitchPreferenceCompat>(PREF_HP_VIRTUALIZER)!!
-    }
-    private val spkVirtPref by lazy {
-        findPreference<SwitchPreferenceCompat>(PREF_SPK_VIRTUALIZER)!!
-    }
-    private val volumePref by lazy {
-        findPreference<SwitchPreferenceCompat>(PREF_VOLUME)!!
-    }
-    private val resetPref by lazy {
-        findPreference<Preference>(PREF_RESET)!!
-    }
+    private val appContext: Context
+        get() = requireContext().applicationContext

-    private val dolbyController by lazy { DolbyController.getInstance(context) }
-    private val audioManager by lazy { context.getSystemService(AudioManager::class.java) }
-    private val handler = Handler()
+    private val switchBar by lazy { findPreference<MainSwitchPreference>(PREF_ENABLE)!! }
+    private val profilePref by lazy { findPreference<ListPreference>(PREF_PROFILE)!! }
+    private val presetPref by lazy { findPreference<Preference>(PREF_PRESET)!! }
+    private val ieqPref by lazy { findPreference<DolbyIeqPreference>(PREF_IEQ)!! }
+    private val stereoPref by lazy { findPreference<ListPreference>(PREF_STEREO)!! }
+    private val dialoguePref by lazy { findPreference<ListPreference>(PREF_DIALOGUE)!! }
+    private val bassPref by lazy { findPreference<SwitchPreferenceCompat>(PREF_BASS)!! }
+    private val hpVirtPref by lazy { findPreference<SwitchPreferenceCompat>(PREF_HP_VIRTUALIZER)!! }
+    private val spkVirtPref by lazy { findPreference<SwitchPreferenceCompat>(PREF_SPK_VIRTUALIZER)!! }
+    private val volumePref by lazy { findPreference<SwitchPreferenceCompat>(PREF_VOLUME)!! }
+    private val resetPref by lazy { findPreference<Preference>(PREF_RESET)!! }
+
+    private val dolbyController by lazy(LazyThreadSafetyMode.NONE) {
+        DolbyController.getInstance(appContext)
+    }
+    private val audioManager by lazy(LazyThreadSafetyMode.NONE) {
+        appContext.getSystemService(AudioManager::class.java)
+    }
+    private val handler = Handler(Looper.getMainLooper())

    private var isOnSpeaker = true
        set(value) {
@@ -99,26 +85,29 @@ class DolbySettingsFragment : PreferenceFragment(),

    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
        dlog(TAG, "onCreatePreferences")
-        addPreferencesFromResource(R.xml.dolby_settings)
+        setPreferencesFromResource(R.xml.dolby_settings, rootKey)
+    }

+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
        val profile = dolbyController.profile
-        preferenceManager.preferenceDataStore = DolbyPreferenceStore(context).also {
+        preferenceManager.preferenceDataStore = DolbyPreferenceStore(appContext).also {
            it.profile = profile
        }

        val dsOn = dolbyController.dsOn
        switchBar.addOnSwitchChangeListener(this)
-        switchBar.setChecked(dsOn)
+        switchBar.isChecked = dsOn

        profilePref.onPreferenceChangeListener = this
        updateProfileIcon(profile)
-        profilePref.setEnabled(dsOn)
+        profilePref.isEnabled = dsOn
        profilePref.apply {
            if (entryValues.contains(profile.toString())) {
                summary = "%s"
                value = profile.toString()
            } else {
-                summary = context.getString(R.string.dolby_unknown)
+                summary = getString(R.string.dolby_unknown)
            }
        }

@@ -134,21 +123,21 @@ class DolbySettingsFragment : PreferenceFragment(),
            dolbyController.resetProfileSpecificSettings()
            updateProfileSpecificPrefs()
            Toast.makeText(
-                context,
-                context.getString(R.string.dolby_reset_profile_toast, profilePref.summary),
+                appContext,
+                getString(R.string.dolby_reset_profile_toast, profilePref.summary),
                Toast.LENGTH_SHORT
            ).show()
            true
        }

-        audioManager!!.registerAudioDeviceCallback(audioDeviceCallback, handler)
+        audioManager?.registerAudioDeviceCallback(audioDeviceCallback, handler)
        updateSpeakerState()
        updateProfileSpecificPrefs()
    }

    override fun onDestroyView() {
        dlog(TAG, "onDestroyView")
-        audioManager!!.unregisterAudioDeviceCallback(audioDeviceCallback)
+        audioManager?.unregisterAudioDeviceCallback(audioDeviceCallback)
        super.onDestroyView()
    }

@@ -167,35 +156,13 @@ class DolbySettingsFragment : PreferenceFragment(),
                updateProfileIcon(profile)
                updateProfileSpecificPrefs()
            }
-
-            PREF_SPK_VIRTUALIZER -> {
-                dolbyController.setSpeakerVirtEnabled(newValue as Boolean)
-            }
-
-            PREF_HP_VIRTUALIZER -> {
-                dolbyController.setHeadphoneVirtEnabled(newValue as Boolean)
-            }
-
-            PREF_STEREO -> {
-                dolbyController.setStereoWideningAmount(newValue.toString().toInt())
-            }
-
-            PREF_DIALOGUE -> {
-                dolbyController.setDialogueEnhancerAmount(newValue.toString().toInt())
-            }
-
-            PREF_BASS -> {
-                dolbyController.setBassEnhancerEnabled(newValue as Boolean)
-            }
-
-            PREF_VOLUME -> {
-                dolbyController.setVolumeLevelerEnabled(newValue as Boolean)
-            }
-
-            PREF_IEQ -> {
-                dolbyController.setIeqPreset(newValue.toString().toInt())
-            }
-
+            PREF_SPK_VIRTUALIZER -> dolbyController.setSpeakerVirtEnabled(newValue as Boolean)
+            PREF_HP_VIRTUALIZER -> dolbyController.setHeadphoneVirtEnabled(newValue as Boolean)
+            PREF_STEREO -> dolbyController.setStereoWideningAmount(newValue.toString().toInt())
+            PREF_DIALOGUE -> dolbyController.setDialogueEnhancerAmount(newValue.toString().toInt())
+            PREF_BASS -> dolbyController.setBassEnhancerEnabled(newValue as Boolean)
+            PREF_VOLUME -> dolbyController.setVolumeLevelerEnabled(newValue as Boolean)
+            PREF_IEQ -> dolbyController.setIeqPreset(newValue.toString().toInt())
            else -> return false
        }
        return true
@@ -204,18 +171,21 @@ class DolbySettingsFragment : PreferenceFragment(),
    override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
        dlog(TAG, "onCheckedChanged($isChecked)")
        dolbyController.dsOn = isChecked
-        profilePref.setEnabled(isChecked)
+        profilePref.isEnabled = isChecked
        updateProfileSpecificPrefs()
    }

    private fun updateSpeakerState() {
-        val device = audioManager!!.getDevicesForAttributes(ATTRIBUTES_MEDIA)[0]
-        isOnSpeaker = (device.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER)
+        val devices = audioManager
+            ?.getDevicesForAttributes(ATTRIBUTES_MEDIA)
+            .orEmpty()
+        val firstType = devices.firstOrNull()?.type
+        isOnSpeaker = (firstType == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER)
    }

    private fun updateProfileSpecificPrefs() {
-        val unknownRes = context.getString(R.string.dolby_unknown)
-        val headphoneRes = context.getString(R.string.dolby_connect_headphones)
+        val unknownRes = getString(R.string.dolby_unknown)
+        val headphoneRes = getString(R.string.dolby_connect_headphones)
        val dsOn = dolbyController.dsOn
        val currentProfile = dolbyController.profile

@@ -225,15 +195,15 @@ class DolbySettingsFragment : PreferenceFragment(),
        )

        val enable = dsOn && (currentProfile != -1)
-        presetPref.setEnabled(enable)
-        spkVirtPref.setEnabled(enable)
-        ieqPref.setEnabled(enable)
-        dialoguePref.setEnabled(enable)
-        volumePref.setEnabled(enable)
-        bassPref.setEnabled(enable)
-        resetPref.setEnabled(enable)
-        hpVirtPref.setEnabled(enable && !isOnSpeaker)
-        stereoPref.setEnabled(enable && !isOnSpeaker)
+        presetPref.isEnabled = enable
+        spkVirtPref.isEnabled = enable
+        ieqPref.isEnabled = enable
+        dialoguePref.isEnabled = enable
+        volumePref.isEnabled = enable
+        bassPref.isEnabled = enable
+        resetPref.isEnabled = enable
+        hpVirtPref.isEnabled = enable && !isOnSpeaker
+        stereoPref.isEnabled = enable && !isOnSpeaker

        if (!enable) return

@@ -259,9 +229,9 @@ class DolbySettingsFragment : PreferenceFragment(),
            }
        }

-        spkVirtPref.setChecked(dolbyController.getSpeakerVirtEnabled(currentProfile))
-        volumePref.setChecked(dolbyController.getVolumeLevelerEnabled(currentProfile))
-        bassPref.setChecked(dolbyController.getBassEnhancerEnabled(currentProfile))
+        spkVirtPref.isChecked = dolbyController.getSpeakerVirtEnabled(currentProfile)
+        volumePref.isChecked = dolbyController.getVolumeLevelerEnabled(currentProfile)
+        bassPref.isChecked = dolbyController.getBassEnhancerEnabled(currentProfile)

        // below prefs are not enabled on loudspeaker
        if (isOnSpeaker) {
@@ -281,7 +251,7 @@ class DolbySettingsFragment : PreferenceFragment(),
        }

        hpVirtPref.apply {
-            setChecked(dolbyController.getHeadphoneVirtEnabled(currentProfile))
+            isChecked = dolbyController.getHeadphoneVirtEnabled(currentProfile)
            summary = null
        }
    }
@@ -299,7 +269,7 @@ class DolbySettingsFragment : PreferenceFragment(),
    companion object {
        private const val TAG = "DolbySettingsFragment"
        private val ATTRIBUTES_MEDIA = AudioAttributes.Builder()
-            .setUsage(AudioAttributes.USAGE_MEDIA)
-            .build()
+                .setUsage(AudioAttributes.USAGE_MEDIA)
+                .build()
    }
 }
--- a/fingerprint/include/UdfpsHandler.h
+++ b/fingerprint/include/UdfpsHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 The LineageOS Project
+ * Copyright (C) 2022,2025 The LineageOS Project
 *
 * SPDX-License-Identifier: Apache-2.0
 */
@@ -13,12 +13,14 @@ class UdfpsHandler {
  public:
    virtual ~UdfpsHandler() = default;

-    virtual void init(fingerprint_device_t* device) = 0;
-    virtual void onFingerDown(uint32_t x, uint32_t y, float minor, float major) = 0;
-    virtual void onFingerUp() = 0;
+    virtual void init(fingerprint_device_t* device) {};
+    virtual void onFingerDown(uint32_t x, uint32_t y, float minor, float major) {};
+    virtual void onFingerUp() {};

-    virtual void onAcquired(int32_t result, int32_t vendorCode) = 0;
-    virtual void cancel() = 0;
+    virtual void onAcquired(int32_t result, int32_t vendorCode) {};
+    virtual void onAuthenticationSucceeded() {};
+    virtual void onAuthenticationFailed() {};
+    virtual void cancel() {};
 };

 struct UdfpsHandlerFactory {
--- a/hidl/touch/Android.bp
+++ b/hidl/touch/Android.bp
@@ -1,45 +0,0 @@
-//
-// Copyright (C) 2022 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-soong_config_module_type {
-    name: "xiaomi_touch_hal_cc_defaults",
-    module_type: "cc_defaults",
-    config_namespace: "XIAOMI_TOUCH",
-    value_variables: ["HIGH_TOUCH_POLLING_PATH"],
-    properties: ["cppflags"],
-}
-
-xiaomi_touch_hal_cc_defaults {
-    name: "xiaomi_touch_hal_defaults",
-    soong_config_variables: {
-        HIGH_TOUCH_POLLING_PATH: {
-            cppflags: ["-DHIGH_TOUCH_POLLING_PATH=\"%s\""],
-        },
-    },
-}
-
-cc_binary {
-    name: "vendor.lineage.touch@1.0-service.xiaomi",
-    defaults: [
-        "hidl_defaults",
-        "xiaomi_touch_hal_defaults",
-    ],
-    vintf_fragments: ["vendor.lineage.touch@1.0-service.xiaomi.xml"],
-    init_rc: ["vendor.lineage.touch@1.0-service.xiaomi.rc"],
-    relative_install_path: "hw",
-    proprietary: true,
-    srcs: [
-        "HighTouchPollingRate.cpp",
-        "service.cpp",
-    ],
-    shared_libs: [
-        "libbase",
-        "libbinder",
-        "libhidlbase",
-        "libutils",
-        "vendor.lineage.touch@1.0",
-    ],
-}
--- a/hidl/touch/HighTouchPollingRate.cpp
+++ b/hidl/touch/HighTouchPollingRate.cpp
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2022 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define LOG_TAG "HighTouchPollingRateService"
-
-#include "HighTouchPollingRate.h"
-
-#include <fstream>
-
-namespace vendor {
-namespace lineage {
-namespace touch {
-namespace V1_0 {
-namespace implementation {
-
-Return<bool> HighTouchPollingRate::isEnabled() {
-    std::ifstream file(HIGH_TOUCH_POLLING_PATH);
-    int enabled;
-    file >> enabled;
-
-    return enabled == 1;
-}
-
-Return<bool> HighTouchPollingRate::setEnabled(bool enabled) {
-    std::ofstream file(HIGH_TOUCH_POLLING_PATH);
-    file << (enabled ? "1" : "0");
-    return !file.fail();
-}
-
-}  // namespace implementation
-}  // namespace V1_0
-}  // namespace touch
-}  // namespace lineage
-}  // namespace vendor
--- a/hidl/touch/HighTouchPollingRate.h
+++ b/hidl/touch/HighTouchPollingRate.h
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2022 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include <vendor/lineage/touch/1.0/IHighTouchPollingRate.h>
-
-namespace vendor {
-namespace lineage {
-namespace touch {
-namespace V1_0 {
-namespace implementation {
-
-using ::android::hardware::Return;
-
-class HighTouchPollingRate : public IHighTouchPollingRate {
-  public:
-    // Methods from ::vendor::lineage::touch::V1_0::IHighTouchPollingRate follow.
-    Return<bool> isEnabled() override;
-    Return<bool> setEnabled(bool enabled) override;
-};
-
-}  // namespace implementation
-}  // namespace V1_0
-}  // namespace touch
-}  // namespace lineage
-}  // namespace vendor
--- a/hidl/touch/service.cpp
+++ b/hidl/touch/service.cpp
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2022 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define LOG_TAG "lineage.touch@1.0-service.xiaomi"
-
-#include <android-base/logging.h>
-#include <hidl/HidlTransportSupport.h>
-
-#include "HighTouchPollingRate.h"
-
-using ::vendor::lineage::touch::V1_0::IHighTouchPollingRate;
-using ::vendor::lineage::touch::V1_0::implementation::HighTouchPollingRate;
-
-int main() {
-    android::sp<IHighTouchPollingRate> highTouchPollingRate = new HighTouchPollingRate();
-
-    android::hardware::configureRpcThreadpool(1, true);
-
-    if (highTouchPollingRate->registerAsService() != android::OK) {
-        LOG(ERROR) << "Cannot register touchscreen high polling rate HAL service.";
-        return 1;
-    }
-
-    LOG(INFO) << "Touchscreen HAL service ready.";
-
-    android::hardware::joinRpcThreadpool();
-
-    LOG(ERROR) << "Touchscreen HAL service failed to join thread pool.";
-    return 1;
-}
--- a/hidl/touch/vendor.lineage.touch@1.0-service.xiaomi.rc
+++ b/hidl/touch/vendor.lineage.touch@1.0-service.xiaomi.rc
@@ -1,5 +0,0 @@
-service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.xiaomi
-    interface vendor.lineage.touch@1.0::IHighTouchPollingRate default
-    class hal
-    user system
-    group system
--- a/interfaces/Android.bp
+++ b/interfaces/Android.bp
@@ -1,3 +1,8 @@
+//
+// SPDX-FileCopyrightText: 2020-2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
 hidl_package_root {
    name: "com.fingerprints",
    path: "hardware/xiaomi/interfaces/fingerprints",
@@ -12,3 +17,129 @@ hidl_package_root {
    name: "vendor.xiaomi",
    path: "hardware/xiaomi/interfaces/xiaomi",
 }
+
+prebuilt_hidl_interfaces {
+    name: "hidl_com_fingerprints_extension_interface",
+    interfaces: [
+        "com.fingerprints.extension@3.0::IFingerprintAuthenticator",
+        "com.fingerprints.extension@3.0::IFingerprintCalibration",
+        "com.fingerprints.extension@3.0::IFingerprintEngineering",
+        "com.fingerprints.extension@3.0::IFingerprintNavigation",
+        "com.fingerprints.extension@3.0::IFingerprintOptical",
+        "com.fingerprints.extension@3.0::IFingerprintRecalibration",
+        "com.fingerprints.extension@3.0::IFingerprintSenseTouch",
+        "com.fingerprints.extension@3.0::IFingerprintSensorTest",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_focaltech_fingerprint_interface",
+    interfaces: [
+        "vendor.focaltech.fingerprint@1.0::IFocalFingerprintService",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_goodix_hardware_cap_biometrics_fingerprint_interface",
+    interfaces: [
+        "vendor.goodix.hardware.cap.biometrics.fingerprint@2.1::IGoodixFingerprintDaemon",
+        "vendor.goodix.hardware.cap.biometrics.fingerprint@2.1::IGoodixFingerprintDaemonExt",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_pixelworks_hardware_display_interface",
+    interfaces: [
+        "vendor.pixelworks.hardware.display@1.0::IIris",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_silead_hardware_fingerprintext_interface",
+    interfaces: [
+        "vendor.silead.hardware.fingerprintext@1.0::ISileadFingerprint",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_synaptics_fingerprints_interfaces_extensions_interface",
+    interfaces: [
+        "vendor.synaptics.fingerprints.interfaces.extensions@1.0::IFpCollection",
+        "vendor.synaptics.fingerprints.interfaces.extensions@1.0::INavigation",
+        "vendor.synaptics.fingerprints.interfaces.extensions@1.0::ISensorTest",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_xiaomi_hardware_bgservice_interface",
+    interfaces: [
+        "vendor.xiaomi.hardware.bgservice@1.0::IBGService",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_xiaomi_hardware_cameraperf_interface",
+    interfaces: [
+        "vendor.xiaomi.hardware.cameraperf@1.0::IMiCameraPerfService",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_xiaomi_hardware_campostproc_interface",
+    interfaces: [
+        "vendor.xiaomi.hardware.campostproc@1.0::IMiPostProcService",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_xiaomi_hardware_citsensorservice_interface",
+    interfaces: [
+        "vendor.xiaomi.hardware.citsensorservice@1.0::ICitSensorService",
+        "vendor.xiaomi.hardware.citsensorservice@1.1::ICitSensorService",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_xiaomi_hardware_dtool_interface",
+    interfaces: [
+        "vendor.xiaomi.hardware.dtool@1.0::IDtool",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_xiaomi_hardware_micharge_interface",
+    interfaces: [
+        "vendor.xiaomi.hardware.micharge@1.0::IMiCharge",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_xiaomi_hardware_quickcamera_interface",
+    interfaces: [
+        "vendor.xiaomi.hardware.quickcamera@1.0::IQuickCameraService",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_xiaomi_hardware_tidaservice_interface",
+    interfaces: [
+        "vendor.xiaomi.hardware.tidaservice@1.0::ITidaService",
+        "vendor.xiaomi.hardware.tidaservice@1.1::ITidaService",
+        "vendor.xiaomi.hardware.tidaservice@1.2::ITidaService",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_xiaomi_sensor_citsensorservice_interface",
+    interfaces: [
+        "vendor.xiaomi.sensor.citsensorservice@1.1::ICitSensorService",
+        "vendor.xiaomi.sensor.citsensorservice@2.0::ICitSensorService",
+    ],
+}
+
+prebuilt_hidl_interfaces {
+    name: "hidl_vendor_xiaomi_sensor_communicate_interface",
+    interfaces: [
+        "vendor.xiaomi.sensor.communicate@1.0::ISensorCommunicate",
+    ],
+}
--- a/interfaces/xiaomi/hardware/displayfeature/1.0/IDisplayFeature.hal
+++ b/interfaces/xiaomi/hardware/displayfeature/1.0/IDisplayFeature.hal
@@ -19,12 +19,12 @@ package vendor.xiaomi.hardware.displayfeature@1.0;
 import @1.0::IDisplayFeatureCallback;

 interface IDisplayFeature {
-    notifyBrightness(uint32_t brightness);
-    registerCallback(uint32_t displayId, IDisplayFeatureCallback callback) generates (Status status);
-    sendMessage(uint32_t index, uint32_t value, string cmd);
-    sendPanelCommand(string cmd) generates (Status status);
-    sendPostProcCommand(uint32_t cmd, uint32_t value) generates (Status status);
-    sendRefreshCommand() generates (Status status);
    setFeature(uint32_t displayId, uint32_t caseId, uint32_t modeId, uint32_t cookie) generates (Status status);
+    registerCallback(uint32_t displayId, IDisplayFeatureCallback callback) generates (Status status);
    setFunction(uint32_t displayId, uint32_t caseId, uint32_t modeId, uint32_t cookie) generates (Status status);
+    sendMessage(uint32_t index, uint32_t value, string cmd);
+    notifyBrightness(uint32_t brightness);
+    sendPanelCommand(string cmd) generates (Status status);
+    sendRefreshCommand() generates (Status status);
+    sendPostProcCommand(uint32_t cmd, uint32_t value) generates (Status status);
 };
--- a/megvii/megvii.c
+++ b/megvii/megvii.c
@@ -2,42 +2,19 @@
 * Copyright (C) 2022 The LineageOS Project
 *
 * SPDX-License-Identifier: Apache-2.0
-*/
+ */

 static int stub_fail() {
    return -1;
 }

-static char *stub_fail_str() {
+static char* stub_fail_str() {
    return "stub";
 }

-void *mg_facepp[] = {
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail_str,
-    &stub_fail_str,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
-    &stub_fail,
+void* mg_facepp[] = {
+        &stub_fail, &stub_fail, &stub_fail, &stub_fail_str, &stub_fail_str, &stub_fail, &stub_fail,
+        &stub_fail, &stub_fail, &stub_fail, &stub_fail,     &stub_fail,     &stub_fail, &stub_fail,
+        &stub_fail, &stub_fail, &stub_fail, &stub_fail,     &stub_fail,     &stub_fail, &stub_fail,
+        &stub_fail, &stub_fail, &stub_fail, &stub_fail,     &stub_fail,     &stub_fail,
 };
--- a/packages/Euicc/Android.bp
+++ b/packages/Euicc/Android.bp
@@ -0,0 +1,18 @@
+
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+phony {
+    name: "XiaomiEuicc",
+    required: [
+        "EuiccPolicy",
+        "EuiccPolicyXiaomi",
+    ],
+}
+
+runtime_resource_overlay {
+    name: "EuiccPolicyXiaomi",
+    product_specific: true,
+}
--- a/packages/Euicc/AndroidManifest.xml
+++ b/packages/Euicc/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="org.lineageos.euicc.overlay.xiaomi">
+    <overlay android:targetPackage="org.lineageos.euicc"
+             android:isStatic="true" />
+</manifest>
--- a/packages/Euicc/res/raw/esim_intro_illustration_lottie.json
+++ b/packages/Euicc/res/raw/esim_intro_illustration_lottie.json
--- a/packages/Euicc/res/raw/sim_illustration_lottie_bottom.json
+++ b/packages/Euicc/res/raw/sim_illustration_lottie_bottom.json
--- a/packages/Euicc/res/values/strings.xml
+++ b/packages/Euicc/res/values/strings.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="sim_slot_mappings_json" translatable="false">
+        {
+            \"sim-slot-mappings\": [
+                {
+                    \"devices\": [
+                        \"XIG05\",
+                        \"fuxi\",
+                        \"garnet\",
+                        \"nuwa\"
+                    ],
+                    \"esim-slot-ids\": [
+                        1
+                    ],
+                    \"psim-slot-ids\": [
+                        0
+                    ]
+                }
+            ]
+        }
+    </string>
+    <string name="sim_illustration_lottie_mappings_json" translatable="false">
+        {
+            \"sim_illustration_lottie_mappings\": [
+                {
+                    \"devices\": [
+                        \"XIG05\",
+                        \"fuxi\",
+                        \"garnet\",
+                        \"nuwa\"
+                    ],
+                    \"illustration_lottie\": \"sim_illustration_lottie_bottom\"
+                }
+            ]
+        }
+    </string>
+</resources>
--- a/packages/IFAAService/Android.bp
+++ b/packages/IFAAService/Android.bp
--- a/packages/IFAAService/AndroidManifest.xml
+++ b/packages/IFAAService/AndroidManifest.xml
--- a/packages/IFAAService/res/values/strings.xml
+++ b/packages/IFAAService/res/values/strings.xml
--- a/packages/IFAAService/src/org/ifaa/aidl/manager/IfaaManagerService.aidl
+++ b/packages/IFAAService/src/org/ifaa/aidl/manager/IfaaManagerService.aidl
--- a/packages/IFAAService/src/org/ifaa/aidl/manager/IfaaService.kt
+++ b/packages/IFAAService/src/org/ifaa/aidl/manager/IfaaService.kt
@@ -0,0 +1,188 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.ifaa.aidl.manager
+
+import android.app.Service
+import android.content.Intent
+import android.os.Build
+import android.os.IHwBinder
+import android.os.SystemProperties
+import android.provider.Settings
+import android.util.Log
+import org.json.JSONObject
+import vendor.xiaomi.hardware.mlipay.V1_1.IMlipayService
+
+class IfaaService : Service() {
+    private var _mlipayService: IMlipayService? = null
+
+    private val mlipayServiceDeathRecipient =
+        IHwBinder.DeathRecipient {
+            Log.i(LOG_TAG, "mlipay service died")
+            _mlipayService = null
+        }
+
+    private val mBinder =
+        object : IfaaManagerService.Stub() {
+            override fun getSupportBIOTypes(): Int {
+                val fpVendor = SystemProperties.get(FP_VENDOR_PROP, "")
+                val isUdfps = SystemProperties.getBoolean(IS_UDFPS_PROP, false)
+
+                val supportedBioMask =
+                    when (!invalidFpVendors.contains(fpVendor.lowercase())) {
+                        true -> AUTH_TYPE_FINGERPRINT or AUTH_TYPE_IRIS
+                        else -> AUTH_TYPE_IRIS
+                    }
+
+                val ifaaProp =
+                    SystemProperties.getInt(SUPPORTED_BIO_MASK_PROP, 0) and
+                        supportedBioMask or
+                        when (isUdfps) {
+                            true -> AUTH_TYPE_OPTICAL_FINGERPRINT
+                            else -> 0
+                        }
+
+                return ifaaProp
+            }
+
+            override fun startBIOManager(authType: Int) =
+                when (authType) {
+                    AUTH_TYPE_FINGERPRINT -> {
+                        applicationContext.startActivity(
+                            Intent(Settings.ACTION_SECURITY_SETTINGS).apply {
+                                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            }
+                        )
+
+                        COMMAND_OK
+                    }
+
+                    else -> COMMAND_FAIL
+                }
+
+            override fun getDeviceModel() = "${Build.MANUFACTURER}-${Build.DEVICE}"
+
+            override fun processCmd(param: ByteArray) =
+                getMlipayService()?.let { mlipayService ->
+                    var receiveBuffer: ByteArray? = null
+
+                    val paramByteArray =
+                        ArrayList<Byte>().apply {
+                            for (byte in param) {
+                                add(byte)
+                            }
+                        }
+
+                    try {
+                        val receiveBufferByteArray =
+                            mlipayService.invoke_command(paramByteArray, paramByteArray.size)
+
+                        receiveBuffer = receiveBufferByteArray.toByteArray()
+                    } catch (e: Exception) {
+                        Log.e(LOG_TAG, "processCmdImpl: mlipay invoke_command failed", e)
+                    }
+
+                    receiveBuffer
+                }
+
+            override fun getVersion() = 4
+
+            override fun getExtInfo(authType: Int, keyExtInfo: String) = initExtString()
+
+            override fun setExtInfo(authType: Int, keyExtInfo: String, valExtInfo: String) {
+                // Do nothing
+            }
+
+            override fun getEnabled(bioType: Int) =
+                when (bioType) {
+                    AUTH_TYPE_FINGERPRINT -> BIOMETRICS_AVAILABLE
+                    else -> SCREEN_LOCK_NONE
+                }
+
+            override fun getIDList(bioType: Int): IntArray {
+                var idList = IntArray(0)
+
+                getMlipayService()?.let { mlipayService ->
+                    try {
+                        val idListAL = mlipayService.ifaa_get_idlist(bioType)
+
+                        idList = idListAL.toIntArray()
+                    } catch (e: Exception) {
+                        Log.e(LOG_TAG, "getIDListImpl: mlipay ifaa_get_idlist failed", e)
+                    }
+                }
+
+                return idList
+            }
+        }
+
+    override fun onBind(intent: Intent) = mBinder
+
+    private fun getMlipayService() =
+        _mlipayService
+            ?: runCatching { IMlipayService.getService(true) }
+                .onSuccess {
+                    _mlipayService = it
+                    it.linkToDeath(mlipayServiceDeathRecipient, 0)
+                }
+                .getOrNull()
+
+    private fun initExtString(): String {
+        val obj = JSONObject()
+        val keyInfo = JSONObject()
+
+        val xy = SystemProperties.get(UDFPS_LOCATION_X_Y_PROP, "")
+        val wh = SystemProperties.get(UDFPS_SIZE_W_H_PROP, "")
+
+        try {
+            if (!validateVal(xy) || !validateVal(wh)) {
+                Log.e(LOG_TAG, "initExtString: invalidate, xy: $xy, wh: $wh")
+                return ""
+            }
+
+            val split = xy.split(",")
+            val split2 = wh.split(",")
+
+            keyInfo.put("startX", split[0].toInt())
+            keyInfo.put("startY", split[1].toInt())
+            keyInfo.put("width", split2[0].toInt())
+            keyInfo.put("height", split2[1].toInt())
+            keyInfo.put("navConflict", true)
+
+            obj.put("type", 0)
+            obj.put("fullView", keyInfo)
+
+            return obj.toString()
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "initExtString: Exception, xy: $xy, wh: $wh", e)
+            return ""
+        }
+    }
+
+    private fun validateVal(str: String) = !"".equals(str, ignoreCase = true) && str.contains(",")
+
+    companion object {
+        private val LOG_TAG = IfaaService::class.simpleName!!
+
+        private const val AUTH_TYPE_NOT_SUPPORT = 0
+        private const val AUTH_TYPE_FINGERPRINT = 1
+        private const val AUTH_TYPE_IRIS = 1.shl(1)
+        private const val AUTH_TYPE_OPTICAL_FINGERPRINT = 1.shl(2)
+
+        private const val BIOMETRICS_AVAILABLE = 1000
+        private const val SCREEN_LOCK_NONE = 1003
+
+        private const val COMMAND_OK = 0
+        private const val COMMAND_FAIL = -1
+
+        private const val SUPPORTED_BIO_MASK_PROP = "persist.vendor.sys.pay.ifaa"
+        private const val FP_VENDOR_PROP = "persist.vendor.sys.fp.vendor"
+        private const val IS_UDFPS_PROP = "ro.hardware.fp.udfps"
+        private const val UDFPS_LOCATION_X_Y_PROP = "persist.vendor.sys.fp.udfps.location.X_Y"
+        private const val UDFPS_SIZE_W_H_PROP = "persist.vendor.sys.fp.udfps.size.width_height"
+
+        private val invalidFpVendors = arrayOf("", "none")
+    }
+}
--- a/sensors/v1/udfps_hal.cpp
+++ b/sensors/v1/udfps_hal.cpp
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <utils/SystemClock.h>

-static const char *udfps_state_paths[] = {
+static const char* udfps_state_paths[] = {
        "/sys/devices/virtual/touch/tp_dev/fp_state",
        "/sys/touchpanel/fp_state",
        NULL,
--- a/sensors/v2/Sensor.cpp
+++ b/sensors/v2/Sensor.cpp
@@ -221,7 +221,7 @@ SysfsPollingOneShotSensor::SysfsPollingOneShotSensor(
        int32_t sensorHandle, ISensorsEventCallback* callback, const std::string& pollPath,
        const std::string& enablePath, const std::string& name, const std::string& typeAsString,
        SensorType type)
-    : OneShotSensor(sensorHandle, callback) {
+    : OneShotSensor(sensorHandle, callback), mEnablePath(enablePath) {
    mSensorInfo.name = name;
    mSensorInfo.type = type;
    mSensorInfo.typeAsString = typeAsString;
@@ -230,8 +230,6 @@ SysfsPollingOneShotSensor::SysfsPollingOneShotSensor(
    mSensorInfo.power = 0;
    mSensorInfo.flags |= SensorFlagBits::WAKE_UP;

-    mEnableStream.open(enablePath);
-
    int rc;

    rc = pipe(mWaitPipeFd);
@@ -267,8 +265,12 @@ SysfsPollingOneShotSensor::~SysfsPollingOneShotSensor() {
 }

 void SysfsPollingOneShotSensor::writeEnable(bool enable) {
+    std::call_once(mEnableOpenOnce, [&] { mEnableStream.open(mEnablePath); });
+
    if (mEnableStream) {
        mEnableStream << (enable ? '1' : '0') << std::flush;
+    } else {
+        ALOGE("Failed to write enable to %s", mEnablePath.c_str());
    }
 }

--- a/sensors/v2/Sensor.h
+++ b/sensors/v2/Sensor.h
@@ -43,7 +43,7 @@ namespace implementation {

 class ISensorsEventCallback {
  public:
-    virtual ~ISensorsEventCallback(){};
+    virtual ~ISensorsEventCallback() {};
    virtual void postEvents(const std::vector<Event>& events, bool wakeup) = 0;
 };

@@ -119,6 +119,8 @@ class SysfsPollingOneShotSensor : public OneShotSensor {
    struct pollfd mPolls[2];
    int mWaitPipeFd[2];
    int mPollFd;
+    std::string mEnablePath;
+    std::once_flag mEnableOpenOnce;
 };

 class DoubleTapSensor : public SysfsPollingOneShotSensor {
--- a/vibrator/effect/Android.bp
+++ b/vibrator/effect/Android.bp
@@ -14,8 +14,5 @@ cc_library_shared {
        "libcutils",
        "libutils",
    ],
-    static_libs: [
-        "libc++fs",
-    ],
    export_include_dirs: ["."],
 }
--- a/vintf/xiaomi_framework_compatibility_matrix.xml
+++ b/vintf/xiaomi_framework_compatibility_matrix.xml
@@ -57,22 +57,6 @@
            <instance>default</instance>
        </interface>
    </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.dolby.hardware.dms</name>
-        <version>2.0</version>
-        <interface>
-            <name>IDms</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.dolby_v3_6.hardware.dms360</name>
-        <version>2.0</version>
-        <interface>
-            <name>IDms</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
    <hal format="hidl" optional="true">
        <name>vendor.goodix.hardware.biometrics.fingerprint</name>
        <version>2.1</version>
@@ -113,6 +97,30 @@
            <instance>default</instance>
        </interface>
    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.dolby.hardware.dms</name>
+        <version>2.0</version>
+        <interface>
+            <name>IDms</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.dolby_sp.hardware.dmssp</name>
+        <version>2.0</version>
+        <interface>
+            <name>IDms</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.dolby_v3_6.hardware.dms360</name>
+        <version>2.0</version>
+        <interface>
+            <name>IDms</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
    <hal format="hidl" optional="true">
        <name>vendor.goodix.hardware.fingerprintextension</name>
        <version>1.0</version>
@@ -161,6 +169,14 @@
            <instance>default</instance>
        </interface>
    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.xiaomi.hardware.cameraperf</name>
+        <version>1.0</version>
+        <interface>
+            <name>IMiCameraPerfService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
    <hal format="hidl" optional="true">
        <name>vendor.xiaomi.hardware.campostproc</name>
        <version>1.0</version>
@@ -169,6 +185,14 @@
            <instance>default</instance>
        </interface>
    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.xiaomi.hardware.citsensorservice</name>
+        <version>1.0-1</version>
+        <interface>
+            <name>ICitSensorService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
    <hal format="hidl" optional="true">
        <name>vendor.xiaomi.hardware.displayfeature</name>
        <version>1.0</version>
@@ -177,6 +201,14 @@
            <instance>default</instance>
        </interface>
    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.xiaomi.hardware.dtool</name>
+        <version>1.0</version>
+        <interface>
+            <name>IDtool</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
    <hal format="hidl" optional="true">
        <name>vendor.xiaomi.hardware.fingerprintextension</name>
        <version>1.0</version>
@@ -262,7 +294,6 @@
    </hal>
    <hal format="hidl" optional="true">
        <name>vendor.xiaomi.hw.touchfeature</name>
-        <transport>hwbinder</transport>
        <version>1.0</version>
        <interface>
            <name>ITouchFeature</name>
Author	SHA1	Message	Date
kondors1995	9e6e67a60b	aidl/fingerprint: utilize MaxPerformance task_profile Some checks failed action.yml / aidl/fingerprint: utilize MaxPerformance task_profile (push) Failing after 0s Details	2026-01-23 08:16:24 +09:00
Pranav Vashi	ea228a83fe	dolby: Update layout to material expressive design Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>	2026-01-23 08:16:24 +09:00
Adithya R	5af4457253	interfaces: displayfeature: Fix method ordering Based on analysis of stock interface. Change-Id: Ib49d18ee15e3f7be1b3b314277357e54f953d73a	2026-01-23 08:16:24 +09:00
Aaron Kling	e73db17e01	healthd-ext: update AIDL HAL version to 3 Resolves vts failure: For android.hardware.health.IHealth/default, manifest (targeting FCM:6) declares version 2, but the actual version is 3 Change-Id: I8ff7278d373d6bdf906d3e1367fe7d4613552a8b	2026-01-23 08:16:24 +09:00
Fenglin Wu	48f0028833	healthd-ext: update VINTF manifest version to 2 Update VINTF manifest version to 2 to match with the latest definition in android.hardware.health.IHealth AIDL interface. Change-Id: Iabf4165c52cca95ff8aa75a67bbc61f4c102bb9e (cherry picked from commit ad957d158ad1d53193536a2e0cee016836d90cd0)	2026-01-23 08:16:24 +09:00
Fabian Leutenegger	644e3d1535	healthd-ext: Fix charge_counter and ETA values Based on `137843ec4f` Co-authored-by: Adithya R <gh0strider.2k18.reborn@gmail.com> Change-Id: I3d000d283302a84ee9fcbd5a85ef26817b68c0a7	2026-01-23 08:16:24 +09:00
chrisl7	2f541dfbfc	healthd-ext: Define override to QTI AIDL healthd-ext hal Change-Id: I26009b1f20c02219dd371ad184cad4eafb9e8eec	2026-01-23 08:16:24 +09:00
chrisl7	10cf15c402	healthd-ext: Rename hal to xiaomi to avoid compilation conflicts Change-Id: I8f33b6870eccfd19272cfbdb816b5b53371012c5	2026-01-23 08:16:24 +09:00
Fenglin Wu	0323f7b0e6	healthd-ext: Update AIDL HAL service installation paths Update the installation path for vendor and recovery partition respectively. Change-Id: I1908d10d782127f555e2fb316f3640bc93efcdbd	2026-01-23 08:16:24 +09:00
Fenglin Wu	872e163ae9	healthd-ext: Add suspend support for charger mode Override ChargerEnableSuspend() function to true to support kernel suspend and resume in charger mode. Change-Id: I01ceaecf7e918504624b2bf1bfb34207fcde74e7	2026-01-23 08:16:24 +09:00
Fenglin Wu	bdf015820e	healthd-ext: Add health HAL AIDL implementation Add health HAL AIDL implementation which is a service running for both health HAL and charger mode. Change-Id: I1f3205d1e34d93ed1739d5fa29c95a8f2b2d2894	2026-01-23 08:16:24 +09:00
AdarshGrewal	5ff2752c40	hardware/xiaomi: Mark setTouchMode as void * these methods dont return any values this needs to be doe for remaining methods too probabbly	2026-01-23 08:16:24 +09:00
AdarshGrewal	8cb5e216a8	interfaces: Import reversed aidl interface for IDisplayFeature This Interface Needed for parts fragment to make working custom saturation Slider instead of using linej livedisplay hal. Signed-off-by: GuidixX <guidixm@gmail.com>	2026-01-23 08:16:24 +09:00
AdarshGrewal	c3061b6b82	hardware/xiaomi: fixup aidl interfaces	2026-01-23 08:16:24 +09:00
raghavt20	2407c73977	hardware/xiaomi: Import reversed aidl interface for ITouchFeature Change-Id: Icc959b71ae4d90f81c5769de4ad16ba1a0984871	2026-01-23 08:16:24 +09:00
raghavt20	c12f2b7f19	hardware/xiaomi: Import reversed aidl interface for IXiaomiFingerprint Change-Id: I0d60666324d986333dc10824250d90fe42ab878a	2026-01-23 08:16:24 +09:00
Piotr Kozimor	fbb6973d74	vintf: Add IMiSys HAL in compatibility matrix Change-Id: I65bb9bf6d0aff733ca533f3c8bd5a7922058c9ff Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Signed-off-by: firebird11 <hbgassel@gmail.com>	2026-01-23 08:16:24 +09:00
basamaryan	4d300dc97e	vinf: Add {vendor.dolby_sp.hardware.dmssp, vendor.dolby_v3_6.hardware.dms360} to FCM Change-Id: I19a0ca830469aa3978e0e89a75536d14cec735b8	2026-01-23 08:16:24 +09:00
Adithya R	a8f7cfdf39	vintf: Add more hals to fcm Change-Id: I6645216d2665ab1d51f789b9f4f80acf411e875c	2026-01-23 08:16:24 +09:00
Pranav Vashi	1e0db9dfa6	DSPVolumeSynchronizer: Do not install for clone apps or private space Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>	2026-01-23 08:16:24 +09:00
Alcatraz323	9854381e8a	Implement DSPVolumeSynchronizer Some Xiaomi devices have a speaker that needs a framework to cooperate with DSP to synchronize volume so that the DSP can limit bass when the volume is high to prevent distortion. Change-Id: I750803d94161e1e7482552d2a39566f42e82fc0a	2026-01-23 08:16:24 +09:00
Abhay Singh Gill	3808a4ae68	dolby: Add custom profile Signed-off-by: Abhay Singh Gill <abhaygill017@gmail.com>	2026-01-23 08:16:24 +09:00
Abhay Singh Gill	6b582cabb8	dolby: Add icons for dolby profiles Also nuke voice profile and fixup some strings. Signed-off-by: Abhay Singh Gill <abhaygill017@gmail.com>	2026-01-23 08:16:24 +09:00
Abhay Singh Gill	3c023d81a5	dolby: Make bass enhancer available on speakers as well Signed-off-by: Abhay Singh Gill <abhaygill017@gmail.com>	2026-01-23 08:16:24 +09:00
Pranav Vashi	b84903b8ae	dolby: Exempt installing package in clone or private space Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>	2026-01-23 08:16:24 +09:00
Marat Budkevich	8ed00feb62	dolby: translate strings to Russian	2026-01-23 08:16:24 +09:00
Pranav Vashi	aac59d1bb9	dolby: Override AudioFx Change-Id: I8523c10fdec7809f2872db82d85e89d076ae582a Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>	2026-01-23 08:16:24 +09:00
Kevin Truong	e2a08fae39	dolby: [Tooltip] Use new positioning logic rememberTooltipPositionProvider contains new positioning logic that should be used for both Plain and Rich tooltips. Test: Update to use rememberTooltipPositionProvider. Bug: b/372914353 Relnote: Added rememberTooltipPositionProvider that contains an updated positioning logic. Deprecated rememberPlainTooltipPositionProvider and rememberRichTooltipPositionProvider. Change-Id: Ie66e2ec58567cc38fc06bb8e13ef928160db114a	2026-01-23 08:16:24 +09:00
Bruno Martins	a55e7da413	dolby: Use all shared resources from devicesettings Change-Id: Icd7f381c574ea36eb4d797cefd60ba9f1a0941bd	2026-01-23 08:16:24 +09:00
Fabian Leutenegger	9e64f1bfa4	dolby: Update EqualizerScreen background color for 15 Switch to MaterialTheme settingsBackground for EqualizerScreen background color Change-Id: I546e3528814276eb857a650cb6c173d914550fb5	2026-01-23 08:16:24 +09:00
Pranav Vashi	ac49d682fc	dolby: Remove deprecated PlainTooltipBox Change-Id: I70ffff5ba30c5eeaff431e46c82eaf05d46e4cb0	2026-01-23 08:16:24 +09:00
basamaryan	1c85c69ecd	dolby: Fix build with kotlinc 1.9.0 Change-Id: I4f9fdc9d25eb57240612cff1b3bef3663014f9a8 Signed-off-by: Adithya R <gh0strider.2k18.reborn@gmail.com>	2026-01-23 08:16:24 +09:00
Michael Bestas	58fa6a7535	dolby: Convert to SwitchPreferenceCompat Change-Id: Ic1cbaba37d499da1855af9c3930f2df426e2d3af	2026-01-23 08:16:24 +09:00
Chaohui Wang	4ab4637909	dolby: Migrate to CompoundButton.OnCheckedChangeListener Switch and SwitchCompat are both CompoundButton. Using CompoundButton in Java will helps migration in the future. Bug: 306658427 \| AOSP \| AOSP Test: manual - check Settings pages Test: m RunSettingsLibRoboTests Change-Id: I85a70d4c504d8584030ea4a058f30d74206ab835	2026-01-23 08:16:24 +09:00
Peter Kalauskas	a445c78924	dolby: Enable use_resource_processor for all sysui deps This will make the build faster Test: m checkbuild Bug: 295208392 Change-Id: I0c1bd901429bbe3bf81c1530e156735f8637a96e	2026-01-23 08:16:23 +09:00
Adithya R	fcb804fe98	dolby: Make sure to persist value after toggling QS tile Toggling the switch pref automatically sets the shared pref for us, but toggling the QS tile does no such thing so we gotta do it ourselves. Change-Id: Iac881ed654bf4eb76b111fc87667f16476d11522	2026-01-23 08:16:23 +09:00
Adithya R	3ca0074fef	dolby: Add intelligent equalizer setting Move preference-related classes to a new package while we're at it, to reduce code clutter. Change-Id: I2430e8ab9b6758503ce1777ec985a3e400b55b8e	2026-01-23 08:16:23 +09:00
Adithya R	a43373294b	dolby: Introduce graphical equalizer Squashed: dolby: Refresh preset name on main screen Change-Id: I96783e2a03c384f031787f4cc9140f7d64dadb2f Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Change-Id: I38ee6ce594e5671af42afc3d4bf0f004329482b9	2026-01-23 08:16:23 +09:00
Pranav Vashi	d080d60171	dolby: Add launcher icon Change-Id: I4d36842ca96048f9b55604d66cc7741759d657f3 Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> [adithya2306: Add monochrome icon as well] Signed-off-by: Adithya R <gh0strider.2k18.reborn@gmail.com>	2026-01-23 08:16:23 +09:00
Adithya R	ab8b987d02	fixup! dolby: Restore all settings upon bootup Stereo widening dependency on virtualizer was accidentally removed. Change-Id: I9b1e35aef5037935af3dc18a303408e2a81ca635	2026-01-23 08:16:23 +09:00
Adithya R	1fdea7dc97	dolby: Restore current profile _after_ resetting profiles Ensure to end the onBootCompleted routine with the correct profile set. Change-Id: I2d5f74a7c0145af2f9d064cd98fa2dc70e5a7acd	2026-01-23 08:16:23 +09:00
Adithya R	99c749a64c	dolby: Do not set volume leveler amount This value is set to zero in almost every known dax-default.xml, including ours. DaxService also doesn't mess with this value, instead only sets VolumeLevelerEnabled. Change-Id: Ib944728d478cff58aebc4f47128bcd5fe32ff9f6	2026-01-23 08:16:23 +09:00
Adithya R	649443ae12	dolby: Restore all settings upon bootup Dolby often messes up restoring profile-specific settings after a reboot. "Fine. I'll do it myself." Change-Id: Ic255c6922eabae0b522c05110f87e2c10a97fb6c	2026-01-23 08:16:23 +09:00
Adithya R	87ec3c12c3	dolby: Rewrite in Kotlin Some cleanup and restructuring while we're at it. Change-Id: I2f1fc53c202d91421c7b6af68c814c25398a62e4	2026-01-23 08:16:23 +09:00
Adithya R	beea2617ad	dolby: Revert "Re-enable speaker virtualization after bootup" No longer necessary Change-Id: Iac820eafa71ea3e4ccaad2bfa0fb76c37279a22a	2026-01-23 08:16:23 +09:00
Adithya R	d3353c6ab3	xiaomi: Introduce Dolby Atmos Moved from marble/sm8450-common History: commit 82fe03168c0402e4cb10d25859c3b398c0ef654a Author: Adithya R <gh0strider.2k18.reborn@gmail.com> Date: Thu Mar 21 21:35:36 2024 +0530 marble: parts: Restore dolby profile on audio changes Something keeps resetting back at random times, from what I observed, after resuming media or on a device change, lets workaround that. Change-Id: Id065f2482636194655c2399f0c35ad56b8e7a29d commit c4400bd1326f65aeac1d0f26bb830ce7fd079773 Author: Adithya R <gh0strider.2k18.reborn@gmail.com> Date: Fri Feb 2 09:29:08 2024 +0530 marble: parts/keyhandler: Guard debug logging Change-Id: I246941f26cd1f71b696eb3c996794c9baa5dbc00 commit f11b70a98a11d0b89673d73002996aed9f11fbd7 Author: Adithya R <gh0strider.2k18.reborn@gmail.com> Date: Sun Dec 31 20:36:52 2023 +0530 marble: parts: Re-enable speaker virtualization after bootup For whatever reason, speaker virtualization isn't automatically restored at bootup unlike the other parameters. It was reported to be fixed by connecting and disconnecting headphones or disabling and enabling the toggle, so let's just automate that at bootup. commit abcff4fb947c89b69c1d25bd290fd91b7873af6a Author: Adithya R <gh0strider.2k18.reborn@gmail.com> Date: Fri Oct 20 06:49:19 2023 +0530 marble: parts: Implement profile-specific Dolby settings Some refactoring and cleanup while we're at it. commit dc54f9ddeff212d017b0cba16e56516e99335bb3 Author: Adithya R <gh0strider.2k18.reborn@gmail.com> Date: Mon Oct 9 21:58:58 2023 +0530 marble: parts: Remove play/pause hack while toggling Dolby Not required with/fixed by: 35217: audioflinger: Do not allow DAP effect to be suspended \| https://gerrit.aospa.co/c/AOSPA/android_frameworks_av/+/35217 commit dd2acc8e0c10d05f86ff229412cc9f72ea242b44 Author: Adithya R <gh0strider.2k18.reborn@gmail.com> Date: Wed Sep 13 21:41:20 2023 +0530 marble: parts: Set proper summary for dolby settings Show the current status in Settings > Sound as well as the QS tile. commit 92d341ba3d22f323eded525487db4289d6edc0fe Author: Fabian Leutenegger <fabian.leutenegger@bluewin.ch> Date: Fri Aug 25 10:26:53 2023 +0200 marble: parts: Always refresh playback if status changed * otherwise dolby would stay active even if you disable its setting Change-Id: If59d8081fa12da2aa67e5149db97965c0805d76e commit b1944744649b6fddcb7bc3864b92f298b6e78821 Author: Adithya R <gh0strider.2k18.reborn@gmail.com> Date: Mon Aug 21 13:21:18 2023 +0530 marble: parts: Introduce Dolby Atmos Based on existing dirac implementation and observing stock sound effects app and daxservice. Thanks to jhenrique09 for the hack from old dirac parts "Pause/play music stream to get effects applied". TODO: bring back misound (same as stock) Co-authored-by: Henrique Silva <jhenrique09.mcz@hotmail.com> Change-Id: I79841c045fe7b92c438177916f756faab72ff0e9	2026-01-23 08:16:23 +09:00
Rocky Fang	040e50155c	aidl: sensors: Set dynamic_sensor_timeout to 1600 during boot Test: on device test Bug: 398856625 Flag: EXEMPT N/A for *.rc file Change-Id: I6c97e6b34305934efdc833e96f0aa4374cb3d878	2026-01-23 08:16:19 +09:00
Bruno Martins	91d15fa7af	xiaomi: Move all apps under packages directory Becomes much better organized. Change-Id: Ifb7c4d984e7ac1776edc567e682f8d4b0b713543	2026-01-22 13:23:28 +02:00
Jihoon Kang	dbf0dc9428	aidl: sensors: Define vintf_fragments as modules Define vintf_fragments as modules so that the generated vintf manifest.xml file is identical between soong and make. Test: m --no-soong-only && diff xml files Bug: 322089980 Bug: 409368614 Change-Id: I75c698dfdac9f84a2b37afef62b4086b7b0a5210	2026-01-17 18:21:15 +00:00
Rocky Fang	2c14234077	aidl: sensors: Update a misleading error log. Bug: 389000592 Bug: 400469383 Test: Presubmit Flag: EXEMPT bugfix Change-Id: I0ce33c9e9f7bf4136a1d8aa9219dfce45de157e9	2026-01-17 18:20:34 +00:00
AdarshGrewal	f18dcb8e17	Euicc: Add Redmi Note 13 Pro/POCO X6 support Change-Id: I921854c9c33122b15cfea0e6dea7b07cb79384d3	2026-01-17 22:50:21 +05:30
Lunark :3	aae52ffce4	Euicc: Add Xiaomi 13 Pro Support Change-Id: Ia0c3852750f49cbabcc31ff774b7e66dea0cf30b Signed-off-by: Lunark :3 <jvillaltamatos3007@gmail.com>	2026-01-11 19:32:00 +00:00
Nick Reuter	f677ebecd8	xiaomi: Add EuiccPolicy overlay Extracted using: /path/to/lineage/scripts/dev/generate_euicc.py -v xiaomi -o overlay /path/to/EuiccPartnerApp.apk Change-Id: I192ddbf961fc2be98dbdf804ab792bb530a0acda	2026-01-11 19:31:55 +00:00
LuK1337	40ef19ab76	pre-commit: Enable clang-format Change-Id: I7a22a5fe9ee7176604fed0825f96417c53adb1ff	2026-01-11 19:24:41 +00:00
Bruno Martins	e400c781e8	megvii: Run clang-format Change-Id: I7b3b20c51d06f5425bd2c84ae2785f3e1f593178	2026-01-11 19:24:41 +00:00
Bruno Martins	b0a11aa8b4	sensors: Run clang-format Change-Id: Ibacd45e08fbace2dd4ff3082712d61215b539121	2026-01-11 19:24:41 +00:00
Bruno Martins	5bb09cf6fa	IFAAService: Run through ktfmt Change-Id: I4a4e6d390ec09d66cd5acda806a200771de67164	2026-01-01 19:10:11 +00:00
LuK1337	2eaa37731a	Introduce pre-commit & GitHub Actions for it Change-Id: I4604d13e5ccf74ec4c7088a40a9f7f915f9b1293	2026-01-01 14:56:38 +00:00
SkyMinus	04c945f5b3	sensors: Lazily open the enable stream Sysfs node initialization lags behind HAL startup on SM8550 and newer platforms. Opening the node in the constructor causes a race condition, leading to enable path writing failure. Lazily open the enable stream to resolve this race condition. Change-Id: I8e2c5996a52a5870143adf9b6a5c6689c9e6d5a5	2025-12-08 23:02:22 +08:00
LuK1337	15e7009f6f	IFAAService: Simplify startBIOManager function Change-Id: I86ae17e0fa3cfcf438c90502a3be5035d9373f54	2025-08-09 13:52:07 +00:00
Elliott Hughes	94a8ea7957	vibrator: libc++fs is part of libc++ now. Change-Id: I690cf4de20989c7042a2fac831ab2cebf1ea3b9d	2025-07-28 20:19:10 +00:00
Bin	636ce206a0	aidl: fingerprint: Set properties for IFAA MlipayService needs these props to work. This exists in hidl fingerprint, but is missing in aidl. Reference: I0b1786721c951cd833d3c20f58cd0c8a70c08fae Change-Id: I70a43ccde9ec2db51b265e1896a89ca640164a36	2025-06-23 09:00:45 +00:00
Bruno Martins	33a419e8c1	touch: Include KeyDisabler and KeySwapper generic support This adds conditional support for KeyDisabler and KeySwapper along with HighTouchPollingRate feature. Change-Id: Ie6c0e7c1032e9d44bf03e6f6738581a4418fb645	2025-06-18 07:37:21 +00:00
Bruno Martins	064c24617e	touch: Migrate to AIDL Change-Id: If44efbab6ad53701a662788daecfd7678935e8b4	2025-06-18 07:37:21 +00:00
Bruno Martins	4d7a952308	touch: Use select() Change-Id: I28e54d5ddaf5e376292d2b4ec7b69d5a49fe4f54	2025-06-18 07:37:21 +00:00
Arian	06bfc823ef	aidl: fingerprint: Grant SYS_NICE capability to set SCHED_FIFO Xiaomi is using sched_setscheduler in libgf_hal to increase the fingerprint processes scheduling policy to SCHED_FIFO while the finger is down. This requires the SYS_NICE capability. Change-Id: Id22c5e255e61080dc83561948ea14f5ad6ebf38f	2025-06-12 23:40:04 +00:00
Bruno Martins	641b58600b	xiaomi: Document Soong options Change-Id: If0bb874560b1a612fb747c79d8a15e4c17277025	2025-06-07 18:22:17 +01:00
Bruno Martins	6454f6c267	aidl: fingerprint: Follow pre-existing namespace convention Change-Id: I368cfc3756c124f7025ad0ea85c138b5f7e18aa0	2025-06-07 18:15:49 +01:00
basamaryan	6785f93e35	Remove aidl/ir More common one available in hardware/lineage/interfaces. Change-Id: I5546cba7ef770f028f8d2222a7960d53c51f02c8	2025-05-27 10:37:37 -04:00
Arian	3bb55820e8	udfpshandler: Add authentication succeeded/failed notifications We currently miss a call when the fingerprint gets rejected the fifth time, and the onFingerUp method isn't called anymore. Without handling this in the touchscreen driver, we can not disable lhbm (ghbm should turn off fine since the udfps layer vanishes). The onAuthentication* methods are called when the authentication ends, allowing for a better control of the lhbm state. Change-Id: I5ff6b9b4692657fade4579faff33eb48c1311987	2025-05-22 15:52:00 +02:00
Arian	0b8722e673	udfpshandler: Provide default noop implementations of functions Some devices might not require to do something in all cases. In order to simplify adding new functions, add default implementations such that we can add new functions without having to add new dummy implementations to all devices udfpshandlers. Change-Id: I37ad23c551fd51e3ff778ac43f10dc6552d32651	2025-05-22 15:51:31 +02:00
Arian	3a4813d67b	interfaces: Add prebuilt hidl interfaces declarations All interfaces that are defined in vintf/xiaomi_framework_compatibility_matrix for which no source is available in interfaces/ are added to the list of prebuilt hidl interfaces to allow host_init_verifier to work properly. Change-Id: If6bdd313bb9ff5dc8c766f0f883f5a86c22c83ec	2025-04-06 22:33:25 +00:00
Giovanni Ricca	1300e116bc	vintf: Add IMiCameraPerfService interface to FCM Change-Id: Ib5d105ead609c9d8bff06733ca0ff5afac38a658	2025-03-30 12:30:53 +02:00
bengris32	88247d9e05	vintf: Add dtool interface Change-Id: Ida7da820801272266f0081c16ff795b04d7d3202 Signed-off-by: bengris32 <bengris32@protonmail.ch>	2025-03-30 12:30:53 +02:00
bengris32	bb6f814a3d	vintf: Add alternative citsensorservice interface Change-Id: I056da81869f438e197e0c46a4b520124537181bc Signed-off-by: bengris32 <bengris32@protonmail.ch>	2025-03-30 12:30:50 +02:00
Daniel Zheng	b56de4957c	Revert^2 "SensorHAL: add moisture detection" 919258a5867165de9abe377f30a0b7a8fc9a2c99 Change-Id: I351625927ce9259967218565abaf56035e97674a	2025-03-09 23:11:45 +02:00
				`@@ -1 +0,0 @@`
				`../../build/soong/scripts/system-clang-format`