sepolicy: qti: Allow system server to detect oem charging

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

.clang-format

@@ -1 +0,0 @@
-../../build/soong/scripts/system-clang-format

.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

.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

.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 }}

.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]

Android.bp

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2022-2025 The LineageOS Project
+// SPDX-FileCopyrightText: 2022-2026 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
@@ -23,3 +23,10 @@ prebuilt_hidl_interfaces {
         "vendor.pixelworks.hardware.feature@1.0::IIrisFeature",
     ],
 }
+
+prebuilt_hidl_interfaces {
+    name: "hidl_zeku_explorer_interface",
+    interfaces: [
+        "vendor.zeku.hardware.explorer@1.0::IMmsProvider",
+    ],
+}

DSPVolumeSynchronizer/Android.bp

@@ -0,0 +1,39 @@
+//
+// Copyright (C) 2024-2025 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+android_app {
+    name: "DSPVolumeSynchronizer",
+    certificate: "platform",
+    srcs: ["src/**/*.java"],
+    platform_apis: true,
+    privileged: true,
+    system_ext_specific: true,
+    static_libs: [
+        "androidx.core_core",
+        "SettingsLib",
+    ],
+
+    required: [
+        "privapp-permissions-dspvolume",
+        "config-dspvolume",
+    ],
+}
+
+prebuilt_etc {
+    name: "privapp-permissions-dspvolume",
+    relative_install_path: "permissions",
+    src: "privapp-permissions-dspvolume.xml",
+    system_ext_specific: true,
+    filename_from_src: true,
+}
+
+prebuilt_etc {
+    name: "config-dspvolume",
+    relative_install_path: "sysconfig",
+    src: "config-dspvolume.xml",
+    system_ext_specific: true,
+    filename_from_src: true,
+}

DSPVolumeSynchronizer/AndroidManifest.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.lineageos.dspvolume.xiaomi"
+    android:versionCode="1"
+    android:versionName="1.0"
+    android:sharedUserId="android.uid.system">
+
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+
+    <application
+        android:label="@string/app_name"
+        android:persistent="true"
+        android:defaultToDeviceProtectedStorage="true"
+        android:directBootAware="true">
+
+        <receiver
+            android:name=".BootReceiver"
+            android:exported="true"
+            android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
+            <intent-filter android:priority="999">
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name=".VolumeListenerService" />
+    </application>
+</manifest>
+

DSPVolumeSynchronizer/config-dspvolume.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<config>
+    <allow-in-power-save package="org.lineageos.dspvolume.xiaomi" />
+    <hidden-api-whitelisted-app package="org.lineageos.dspvolume.xiaomi" />
+</config>

DSPVolumeSynchronizer/privapp-permissions-dspvolume.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <privapp-permissions package="org.lineageos.dspvolume.xiaomi">
+        <permission name="android.permission.INTERACT_ACROSS_USERS" />
+        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL" />
+        <permission name="android.permission.MODIFY_AUDIO_SETTINGS" />
+        <permission name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    </privapp-permissions>
+</permissions>

DSPVolumeSynchronizer/res/values/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- App Name -->
+    <string name="app_name">DSP Volume Synchronizer</string>
+</resources>

DSPVolumeSynchronizer/src/org/lineageos/dspvolume/xiaomi/BootReceiver.java

@@ -0,0 +1,16 @@
+package org.lineageos.dspvolume.xiaomi;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+
+public class BootReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(final Context context, Intent intent) {
+        if (context == null) {
+            return;
+        }
+        context.startService(new Intent(context, VolumeListenerService.class));
+    }
+}

DSPVolumeSynchronizer/src/org/lineageos/dspvolume/xiaomi/VolumeListenerReceiver.java

@@ -0,0 +1,28 @@
+package org.lineageos.dspvolume.xiaomi;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.util.Log;
+
+import android.os.Bundle;
+
+public class VolumeListenerReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (context == null) {
+            return;
+        }
+
+        if(intent.getIntExtra("android.media.EXTRA_VOLUME_STREAM_TYPE", 0) == AudioManager.STREAM_MUSIC) {
+            AudioManager audioManager = context.getSystemService(AudioManager.class);
+            int current = intent.getIntExtra(
+                            "android.media.EXTRA_VOLUME_STREAM_VALUE",
+                            0
+                          );
+            audioManager.setParameters("volume_change=" + current + ";flags=8");
+        }
+    }
+}

DSPVolumeSynchronizer/src/org/lineageos/dspvolume/xiaomi/VolumeListenerService.java

@@ -0,0 +1,30 @@
+package org.lineageos.dspvolume.xiaomi;
+
+import android.app.Service;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.media.AudioManager;
+import android.os.IBinder;
+
+import androidx.annotation.Nullable;
+
+public class VolumeListenerService extends Service {
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction("android.media.VOLUME_CHANGED_ACTION");
+        registerReceiver(new VolumeListenerReceiver(), intentFilter);
+
+        AudioManager audioManager = getSystemService(AudioManager.class);
+        int current = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+        audioManager.setParameters("volume_change=" + current + ";flags=8");
+
+        return super.onStartCommand(intent, flags, startId);
+    }
+}

Euicc/Android.bp

@@ -1,40 +1,17 @@
 //
-// Copyright (C) 2023 The LineageOS Project
-//
+// SPDX-FileCopyrightText: 2023-2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
-android_app {
+phony {
     name: "OplusEuicc",
-
-    srcs: ["src/**/*.kt"],
-
-    sdk_version: "current",
-    product_specific: true,
-    certificate: "platform",
-    privileged: true,
-
-    optimize: {
-        proguard_flags_files: ["proguard.flags"],
-    },
     required: [
-        "org.lineageos.euicc.xml",
-        "hidden-api-whitelist-org.lineageos.euicc.xml",
+        "EuiccPolicy",
+        "EuiccPolicyOplus",
     ],
 }
 
-prebuilt_etc {
-    name: "org.lineageos.euicc.xml",
-    relative_install_path: "permissions",
-    filename: "org.lineageos.euicc.xml",
-    src: "org.lineageos.euicc.xml",
-    product_specific: true,
-}
-
-prebuilt_etc {
-    name: "hidden-api-whitelist-org.lineageos.euicc.xml",
-    relative_install_path: "sysconfig",
-    filename: "hidden-api-whitelist-org.lineageos.euicc.xml",
-    src: "hidden-api-whitelist-org.lineageos.euicc.xml",
+runtime_resource_overlay {
+    name: "EuiccPolicyOplus",
     product_specific: true,
 }

Euicc/AndroidManifest.xml

@@ -1,42 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2023-2024 The LineageOS Project
+    SPDX-FileCopyrightText: 2023-2025 The LineageOS Project
     SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.lineageos.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>
+          package="org.lineageos.euicc.overlay.oplus">
+    <overlay android:targetPackage="org.lineageos.euicc"
+             android:isStatic="true" />
 </manifest>

Euicc/hidden-api-whitelist-org.lineageos.euicc.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
-  <hidden-api-whitelisted-app package="org.lineageos.euicc" />
-</config>

Euicc/org.lineageos.euicc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="org.lineageos.euicc">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-    </privapp-permissions>
-</permissions>

Euicc/proguard.flags

@@ -1,3 +0,0 @@
--keep class org.lineageos.euicc.* {
-  *;
-}

Euicc/res/values/strings.xml

@@ -1,9 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2023 The LineageOS Project
+    SPDX-FileCopyrightText: 2023-2025 The LineageOS Project
     SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
-    <string name="sim_illustration_lottie_mappings_json">{\"sim_illustration_lottie_mappings\":[{\"devices\":[\"OP594DL1\",\"OP595DL1\",\"OP5D55L1\"],\"illustration_lottie\":\"sim_illustration_lottie_bottom\"}]}</string>
-    <string name="sim_slot_mappings_json">{\"sim-slot-mappings\":[{\"devices\":[\"OP594DL1\",\"OP595DL1\",\"OP5D55L1\"],\"esim-slot-ids\":[1],\"psim-slot-ids\":[0]}]}</string>
+    <string name="sim_illustration_lottie_mappings_json" translatable="false">
+        {
+            \"sim_illustration_lottie_mappings\": [
+                {
+                    \"devices\": [
+                        \"OP591BL1\",
+                        \"OP5929L1\",
+                        \"OP594DL1\",
+                        \"OP595DL1\",
+                        \"OP5CF9L1\",
+                        \"OP5D0DL1\",
+                        \"OP5D2BL1\",
+                        \"OP5D35L1\",
+                        \"OP5D3BL1\",
+                        \"OP5D55L1\"
+                    ],
+                    \"illustration_lottie\": \"sim_illustration_lottie_bottom\"
+                }
+            ]
+        }
+    </string>
+    <string name="sim_slot_mappings_json" translatable="false">
+        {
+            \"sim-slot-mappings\": [
+                {
+                    \"devices\": [
+                        \"OP594DL1\",
+                        \"OP595DL1\",
+                        \"OP5D35L1\",
+                        \"OP5D3BL1\",
+                        \"OP5D55L1\"
+                    ],
+                    \"esim-slot-ids\": [
+                        1
+                    ],
+                    \"psim-slot-ids\": [
+                        0
+                    ]
+                },
+                {
+                    \"devices\": [
+                        \"OP591BL1\",
+                        \"OP5929L1\",
+                        \"OP5CF9L1\",
+                        \"OP5D0DL1\",
+                        \"OP5D2BL1\"
+                    ],
+                    \"esim-slot-ids\": [],
+                    \"psim-slot-ids\": [
+                        0,
+                        1
+                    ]
+                }
+            ]
+        }
+    </string>
 </resources>

Euicc/src/org/lineageos/euicc/BootCompletedReceiver.kt

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2021 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.lineageos.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 = "OplusEuiccBootReceiver"
-    }
-}

Euicc/src/org/lineageos/euicc/EuiccDisabler.kt

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021-2024 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.lineageos.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 = "OplusEuiccDisabler"
-
-    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)
-            }
-        }
-    }
-}

Euicc/src/org/lineageos/euicc/EuiccReceiver.kt

@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2023 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.lineageos.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 = "OplusEuiccReceiver"
-    }
-}

IFAAService/src/org/ifaa/aidl/manager/IfaaService.kt

@@ -22,113 +22,131 @@ import vendor.oplus.hardware.biometrics.fingerprintpay.IFingerprintPay
 class IfaaService : Service() {
     private var _fpPayService: IFingerprintPay? = null
 
-    private val fpPayServiceDeathRecipient = IBinder.DeathRecipient {
-        Log.i(LOG_TAG, "aidl FingerprintPay hal died, reset hal proxy!")
-        _fpPayService = null
-    }
+    private val fpPayServiceDeathRecipient =
+        IBinder.DeathRecipient {
+            Log.i(LOG_TAG, "aidl FingerprintPay hal died, reset hal proxy!")
+            _fpPayService = null
+        }
 
     private val fingerprintManager by lazy { getSystemService(FingerprintManager::class.java)!! }
     private val keyguardManager by lazy { getSystemService(KeyguardManager::class.java)!! }
     private val windowManager by lazy { getSystemService(WindowManager::class.java)!! }
 
-    override fun onBind(intent: Intent) = object : IfaaManagerService.Stub() {
-        private val _supportBIOTypes by lazy {
-            when (SystemProperties.get(FP_TYPE_PROP, "")) {
-                "back", "side", "front" -> AUTH_TYPE_FINGERPRINT
-                "ultrasonic", "optical" -> AUTH_TYPE_OPTICAL_FINGERPRINT
-                else -> AUTH_TYPE_NOT_SUPPORT
-            }
-        }
-
-        override fun getSupportBIOTypes() = _supportBIOTypes
-
-        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
+    override fun onBind(intent: Intent) =
+        object : IfaaManagerService.Stub() {
+            private val _supportBIOTypes by lazy {
+                when (SystemProperties.get(FP_TYPE_PROP, "")) {
+                    "back",
+                    "side",
+                    "front" -> AUTH_TYPE_FINGERPRINT
+                    "ultrasonic",
+                    "optical" -> AUTH_TYPE_OPTICAL_FINGERPRINT
+                    else -> AUTH_TYPE_NOT_SUPPORT
+                }
             }
 
-            else -> COMMAND_FAIL
-        }
+            override fun getSupportBIOTypes() = _supportBIOTypes
 
-        private val _deviceModel by lazy { SystemProperties.get(IFAA_MODEL_PROP, "OPLUS-Default") }
-        override fun getDeviceModel() = _deviceModel
+            override fun startBIOManager(authType: Int) =
+                when (authType) {
+                    AUTH_TYPE_FINGERPRINT -> {
+                        applicationContext.startActivity(
+                            Intent(Settings.ACTION_SECURITY_SETTINGS).apply {
+                                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            }
+                        )
 
-        override fun processCmd(param: ByteArray) = try {
-            getFpPayService()?.ifaa_invoke_command(param)
-        } catch (e: Exception) {
-            Log.e(LOG_TAG, "processCmdImpl: ifaa_invoke_command aidl failed", e)
-            null
-        }
-
-        override fun getVersion() = 4
-
-        override fun getExtInfo(authType: Int, keyExtInfo: String) = when (keyExtInfo) {
-            KEY_GET_SENSOR_LOCATION -> initExtString()
-            else -> ""
-        }
-
-        override fun setExtInfo(authType: Int, keyExtInfo: String, valExtInfo: String) {
-            // Do nothing
-        }
-
-        override fun getEnabled(bioType: Int): Int {
-            if (!keyguardManager.isKeyguardSecure) {
-                Log.e(LOG_TAG, "No secure keyguard set.")
-                return BIOMETRIC_NOUSE_NOSET_KEYGUARD
-            }
-
-            return when (bioType) {
-                AUTH_TYPE_FINGERPRINT -> when {
-                    !fingerprintManager.isHardwareDetected -> {
-                        Log.e(LOG_TAG, "Fingerprint hardware not available!")
-                        BIOMETRIC_NOUSE_SYSTEMLOCKED
+                        COMMAND_OK
                     }
 
-                    fingerprintManager.enrolledFingerprints.isNullOrEmpty() -> {
-                        Log.e(LOG_TAG, "Fingerprint not enrolled!")
-                        BIOMETRIC_NOUSE_NOT_ENROLLED
-                    }
-
-                    else -> BIOMETRIC_USE_READY
+                    else -> COMMAND_FAIL
                 }
 
-                else -> 0
-            }
-        }
-
-        override fun getIDList(bioType: Int): IntArray? = when (bioType) {
-            AUTH_TYPE_FINGERPRINT -> {
-                val enrolledFingerprintIds = fingerprintManager.enrolledFingerprints?.map {
-                    it.biometricId
-                }?.toIntArray()
-
-                Log.w(LOG_TAG, "getIDList: ${enrolledFingerprintIds}!")
-                enrolledFingerprintIds
+            private val _deviceModel by lazy {
+                SystemProperties.get(IFAA_MODEL_PROP, "OPLUS-Default")
             }
 
-            else -> null
-        }
-    }
+            override fun getDeviceModel() = _deviceModel
 
-    private fun getFpPayService() = _fpPayService ?: run {
-        val binder = ServiceManager.getService("${IFingerprintPay.DESCRIPTOR}/default")
-        IFingerprintPay.Stub.asInterface(binder)?.also {
-            binder.linkToDeath(fpPayServiceDeathRecipient, 0)
-            _fpPayService = it
+            override fun processCmd(param: ByteArray) =
+                try {
+                    getFpPayService()?.ifaa_invoke_command(param)
+                } catch (e: Exception) {
+                    Log.e(LOG_TAG, "processCmdImpl: ifaa_invoke_command aidl failed", e)
+                    null
+                }
+
+            override fun getVersion() = 4
+
+            override fun getExtInfo(authType: Int, keyExtInfo: String) =
+                when (keyExtInfo) {
+                    KEY_GET_SENSOR_LOCATION -> initExtString()
+                    else -> ""
+                }
+
+            override fun setExtInfo(authType: Int, keyExtInfo: String, valExtInfo: String) {
+                // Do nothing
+            }
+
+            override fun getEnabled(bioType: Int): Int {
+                if (!keyguardManager.isKeyguardSecure) {
+                    Log.e(LOG_TAG, "No secure keyguard set.")
+                    return BIOMETRIC_NOUSE_NOSET_KEYGUARD
+                }
+
+                return when (bioType) {
+                    AUTH_TYPE_FINGERPRINT ->
+                        when {
+                            !fingerprintManager.isHardwareDetected -> {
+                                Log.e(LOG_TAG, "Fingerprint hardware not available!")
+                                BIOMETRIC_NOUSE_SYSTEMLOCKED
+                            }
+
+                            fingerprintManager.enrolledFingerprints.isNullOrEmpty() -> {
+                                Log.e(LOG_TAG, "Fingerprint not enrolled!")
+                                BIOMETRIC_NOUSE_NOT_ENROLLED
+                            }
+
+                            else -> BIOMETRIC_USE_READY
+                        }
+
+                    else -> 0
+                }
+            }
+
+            override fun getIDList(bioType: Int): IntArray? =
+                when (bioType) {
+                    AUTH_TYPE_FINGERPRINT -> {
+                        val enrolledFingerprintIds =
+                            fingerprintManager.enrolledFingerprints
+                                ?.map { it.biometricId }
+                                ?.toIntArray()
+
+                        Log.w(LOG_TAG, "getIDList: ${enrolledFingerprintIds}!")
+                        enrolledFingerprintIds
+                    }
+
+                    else -> null
+                }
         }
-    }
+
+    private fun getFpPayService() =
+        _fpPayService
+            ?: run {
+                val binder = ServiceManager.getService("${IFingerprintPay.DESCRIPTOR}/default")
+                IFingerprintPay.Stub.asInterface(binder)?.also {
+                    binder.linkToDeath(fpPayServiceDeathRecipient, 0)
+                    _fpPayService = it
+                }
+            }
 
     private val defaultDisplayDimension by lazy {
-        val dim1 = displayNoVerify?.supportedModes?.maxByOrNull { it.physicalHeight }
-            ?.run { Point(physicalWidth, physicalHeight) }
-        val dim2 = windowManager.maximumWindowMetrics.bounds
-            .run { Point(width(), height()) }
+        val dim1 =
+            displayNoVerify
+                ?.supportedModes
+                ?.maxByOrNull { it.physicalHeight }
+                ?.run { Point(physicalWidth, physicalHeight) }
+        val dim2 = windowManager.maximumWindowMetrics.bounds.run { Point(width(), height()) }
 
         dim1?.let { Point(maxOf(dim1.x, dim2.x), maxOf(dim1.y, dim2.y)) } ?: dim2
     }
@@ -140,33 +158,37 @@ class IfaaService : Service() {
         val iconLocationBottom = SystemProperties.getInt(FP_ICON_LOCATION_PROP, 278)
         Point(
             (defaultDisplayDimension.x - iconDiameter) / 2,
-            defaultDisplayDimension.y - iconLocationBottom - iconDiameter / 2
+            defaultDisplayDimension.y - iconLocationBottom - iconDiameter / 2,
         )
     }
 
     private fun initExtString() = run {
-        val displayDimension = windowManager.maximumWindowMetrics.bounds.run {
-            Point(width(), height())
-        }
+        val displayDimension =
+            windowManager.maximumWindowMetrics.bounds.run { Point(width(), height()) }
         val scale = { pos: Point ->
             Point(
                 pos.x * displayDimension.x / defaultDisplayDimension.x,
-                pos.y * displayDimension.y / defaultDisplayDimension.y
+                pos.y * displayDimension.y / defaultDisplayDimension.y,
             )
         }
         val scaledLocation = scale(iconLocation)
         val scaledDiameter = scale(Point(iconDiameter, iconDiameter))
 
-        JSONObject().apply {
-            put("type", 0)
-            put("fullView", JSONObject().apply {
-                put("startX", scaledLocation.x)
-                put("startY", scaledLocation.y)
-                put("width", scaledDiameter.x)
-                put("height", scaledDiameter.y)
-                put("navConflict", true)
-            })
-        }.toString()
+        JSONObject()
+            .apply {
+                put("type", 0)
+                put(
+                    "fullView",
+                    JSONObject().apply {
+                        put("startX", scaledLocation.x)
+                        put("startY", scaledLocation.y)
+                        put("width", scaledDiameter.x)
+                        put("height", scaledDiameter.y)
+                        put("navConflict", true)
+                    },
+                )
+            }
+            .toString()
     }
 
     companion object {

KeyHandler/Android.bp

@@ -12,7 +12,9 @@ android_app {
     ],
 
     optimize: {
+        optimize: true,
         proguard_flags_files: ["proguard.flags"],
+        shrink_resources: true,
     },
 }
 

KeyHandler/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2018, 2021-2022 The LineageOS Project
+     Copyright (C) 2018, 2021-2025 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           android:sharedUserId="android.uid.system"
           package="org.lineageos.settings.device">
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
@@ -41,17 +42,19 @@
         <!-- Additional button settings (Button settings) -->
         <activity
             android:name=".ButtonSettingsActivity"
-            android:label="@string/button_panel_title"
-            android:exported="false">
+            android:label="@string/alert_slider_category_title"
+            android:exported="true">
             <intent-filter>
-                <action android:name="org.lineageos.settings.device.ADDITIONAL_BUTTONS_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="com.android.settings.action.IA_SETTINGS" />
             </intent-filter>
+            <meta-data
+                android:name="com.android.settings.category"
+                android:value="com.android.settings.category.ia.sound" />
         </activity>
 
         <service
             android:name=".KeyHandler"
             android:permission="KeyHandlerService"
-            android:exported="false" />
+            android:exported="true" />
     </application>
 </manifest>

KeyHandler/res/values-iw/strings.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2021 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="alert_slider_category_title">מתג התראות</string>
+    <string name="alert_slider_selection_dialog_title">פעולה</string>
+    <string name="alert_slider_top_position">ממוקם למעלה</string>
+    <string name="alert_slider_middle_position">ממוקם באמצע</string>
+    <string name="alert_slider_bottom_position">ממוקם למטה</string>
+    <string name="alert_slider_mode_none">ללא</string>
+    <string name="alert_slider_mode_silent">שקט</string>
+    <string name="alert_slider_mode_normal">רגיל</string>
+    <string name="alert_slider_mode_vibration">רטט</string>
+    <string name="alert_slider_mode_dnd_priority_only">עדיפות בלבד</string>
+    <string name="alert_slider_mode_dnd_total_silence">מושתק לחלוטין</string>
+    <string name="alert_slider_mode_dnd_alarms_only">שעון מעורר בלבד</string>
+    <string name="alert_slider_mute_media_title">השתקת מדיה</string>
+    <string name="alert_slider_mute_media_summary">השתקת מדיה במעבר להשתקה</string>
+</resources>

KeyHandler/res/values-sc-rIT/strings.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2021 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="alert_slider_selection_dialog_title">Atzione</string>
+    <string name="alert_slider_top_position">Positzione superiore</string>
+    <string name="alert_slider_middle_position">Positzione tzentrale</string>
+    <string name="alert_slider_bottom_position">Positzione inferiore</string>
+    <string name="alert_slider_mode_silent">A sa muda</string>
+    <string name="alert_slider_mode_normal">Normale</string>
+    <string name="alert_slider_mode_vibration">Vibratzione</string>
+    <string name="alert_slider_mode_dnd_priority_only">Prioridade isceti</string>
+    <string name="alert_slider_mode_dnd_total_silence">Silèntziu totale</string>
+    <string name="alert_slider_mode_dnd_alarms_only">Isvèllias isceti</string>
+    <string name="alert_slider_mute_media_title">Pone is cuntenutos multimediales a sa muda</string>
+    <string name="alert_slider_mute_media_summary">Pone is cuntenutos multimediales a sa muda cando passas a silèntziu</string>
+</resources>

KeyHandler/res/values-ta/strings.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2021 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="alert_slider_top_position">முதற் நிலை</string>
+    <string name="alert_slider_middle_position">நடு நிலை</string>
+    <string name="alert_slider_bottom_position">கீழ் நிலை</string>
+    <string name="alert_slider_mode_none">இல்லை</string>
+    <string name="alert_slider_mode_silent">ஒலியின்மை</string>
+</resources>

KeyHandler/res/values/strings.xml

@@ -5,7 +5,7 @@
 -->
 <resources>
     <!-- Alert slider -->
-    <string name="alert_slider_category_title">Alert slider</string>
+    <string name="alert_slider_category_title">Alert slider settings</string>
     <string name="alert_slider_selection_dialog_title">Action</string>
     <string name="alert_slider_top_position">Top position</string>
     <string name="alert_slider_middle_position">Middle position</string>

KeyHandler/res/xml/button_panel.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2021 The LineageOS Project
+    SPDX-FileCopyrightText: 2021-2025 The LineageOS Project
     SPDX-License-Identifier: Apache-2.0
 -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <PreferenceCategory
         android:title="@string/alert_slider_category_title">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="config_mute_media"
             android:title="@string/alert_slider_mute_media_title"
             android:summary="@string/alert_slider_mute_media_summary"
@@ -16,29 +19,29 @@
         <ListPreference
             android:key="config_top_position"
             android:dialogTitle="@string/alert_slider_selection_dialog_title"
-            android:title="@string/alert_slider_top_position"
-            android:summary="%s"
             android:entries="@array/alert_slider_action_entries"
             android:entryValues="@array/alert_slider_action_entry_values"
-            android:defaultValue="0" />
+            android:defaultValue="0"
+            android:title="@string/alert_slider_top_position"
+            app:useSimpleSummaryProvider="true" />
 
         <ListPreference
             android:key="config_middle_position"
             android:dialogTitle="@string/alert_slider_selection_dialog_title"
-            android:title="@string/alert_slider_middle_position"
-            android:summary="%s"
             android:entries="@array/alert_slider_action_entries"
             android:entryValues="@array/alert_slider_action_entry_values"
-            android:defaultValue="1" />
+            android:defaultValue="1"
+            android:title="@string/alert_slider_middle_position"
+            app:useSimpleSummaryProvider="true" />
 
         <ListPreference
             android:key="config_bottom_position"
             android:dialogTitle="@string/alert_slider_selection_dialog_title"
-            android:title="@string/alert_slider_bottom_position"
-            android:summary="%s"
             android:entries="@array/alert_slider_action_entries"
             android:entryValues="@array/alert_slider_action_entry_values"
-            android:defaultValue="2" />
+            android:defaultValue="2"
+            android:title="@string/alert_slider_bottom_position"
+            app:useSimpleSummaryProvider="true" />
 
     </PreferenceCategory>
 </PreferenceScreen>

KeyHandler/src/org/lineageos/settings/device/ButtonSettingsActivity.kt

@@ -1,20 +1,27 @@
 /*
- * Copyright (C) 2021-2024 The LineageOS Project
+ * SPDX-FileCopyrightText: 2021-2025 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.lineageos.settings.device
 
 import android.os.Bundle
-
 import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity
 
 class ButtonSettingsActivity : CollapsingToolbarBaseActivity() {
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        fragmentManager.beginTransaction().replace(
-            com.android.settingslib.collapsingtoolbar.R.id.content_frame,
-            ButtonSettingsFragment()
-        ).commit()
+        supportFragmentManager
+            .beginTransaction()
+            .replace(
+                com.android.settingslib.collapsingtoolbar.R.id.content_frame,
+                ButtonSettingsFragment(),
+                TAG,
+            )
+            .commit()
+    }
+
+    companion object {
+        private const val TAG = "ButtonSettingsActivity"
     }
 }

KeyHandler/src/org/lineageos/settings/device/ButtonSettingsFragment.kt

@@ -1,31 +1,15 @@
 /*
- * Copyright (C) 2021 The LineageOS Project
+ * SPDX-FileCopyrightText: 2021-2025 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.lineageos.settings.device
 
 import android.os.Bundle
-import android.view.MenuItem
-import androidx.preference.PreferenceFragment
+import androidx.preference.PreferenceFragmentCompat
 
-class ButtonSettingsFragment : PreferenceFragment() {
+class ButtonSettingsFragment : PreferenceFragmentCompat() {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        addPreferencesFromResource(R.xml.button_panel)
-        activity.actionBar!!.setDisplayHomeAsUpEnabled(true)
-    }
-
-    override fun addPreferencesFromResource(preferencesResId: Int) {
-        super.addPreferencesFromResource(preferencesResId)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.home -> {
-                activity.finish()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
+        setPreferencesFromResource(R.xml.button_panel, rootKey)
     }
 }

KeyHandler/src/org/lineageos/settings/device/ConfigPanelSearchIndexablesProvider.kt

@@ -8,7 +8,6 @@ package org.lineageos.settings.device
 import android.database.Cursor
 import android.database.MatrixCursor
 import android.provider.SearchIndexableResource
-import android.provider.SearchIndexablesProvider
 import android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_CLASS_NAME
 import android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICON_RESID
 import android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_ACTION
@@ -19,15 +18,14 @@ import android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID
 import android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS
 import android.provider.SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS
 import android.provider.SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS
+import android.provider.SearchIndexablesProvider
 
 class ConfigPanelSearchIndexablesProvider : SearchIndexablesProvider() {
     override fun onCreate(): Boolean = true
 
     override fun queryXmlResources(projection: Array<String?>?): Cursor {
         val cursor = MatrixCursor(INDEXABLES_XML_RES_COLUMNS)
-        INDEXABLE_RES.forEach {
-            cursor.addRow(generateResourceRef(it))
-        }
+        INDEXABLE_RES.forEach { cursor.addRow(generateResourceRef(it)) }
         return cursor
     }
 
@@ -54,10 +52,14 @@ class ConfigPanelSearchIndexablesProvider : SearchIndexablesProvider() {
     companion object {
         private const val TAG = "ConfigPanelSearchIndexablesProvider"
 
-        private val INDEXABLE_RES = arrayOf<SearchIndexableResource>(
-            SearchIndexableResource(
-                1, R.xml.button_panel, ButtonSettingsActivity::class.java.name, 0
+        private val INDEXABLE_RES =
+            arrayOf<SearchIndexableResource>(
+                SearchIndexableResource(
+                    1,
+                    R.xml.button_panel,
+                    ButtonSettingsActivity::class.java.name,
+                    0,
+                )
             )
-        )
     }
 }

KeyHandler/src/org/lineageos/settings/device/KeyHandler.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 The LineageOS Project
+ * Copyright (C) 2021-2025 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -18,7 +18,6 @@ import android.os.Vibrator
 import android.provider.Settings
 import android.view.KeyEvent
 import com.android.internal.os.DeviceKeyHandler
-
 import java.io.File
 import java.util.concurrent.Executors
 
@@ -27,32 +26,43 @@ class KeyHandler(context: Context) : DeviceKeyHandler {
     private val notificationManager = context.getSystemService(NotificationManager::class.java)!!
     private val vibrator = context.getSystemService(Vibrator::class.java)!!
 
-    private val packageContext = context.createPackageContext(
-        KeyHandler::class.java.getPackage()!!.name, 0
-    )
+    private val packageContext =
+        context.createPackageContext(KeyHandler::class.java.getPackage()!!.name, 0)
     private val sharedPreferences
-        get() = packageContext.getSharedPreferences(
-            packageContext.packageName + "_preferences",
-            Context.MODE_PRIVATE or Context.MODE_MULTI_PROCESS
-        )
+        get() =
+            packageContext.getSharedPreferences(
+                packageContext.packageName + "_preferences",
+                Context.MODE_PRIVATE or Context.MODE_MULTI_PROCESS,
+            )
 
     private val executorService = Executors.newSingleThreadExecutor()
 
     private var wasMuted = false
-    private val broadcastReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            val stream = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1)
-            val state = intent.getBooleanExtra(AudioManager.EXTRA_STREAM_VOLUME_MUTED, false)
-            if (stream == AudioSystem.STREAM_MUSIC && !state) {
-                wasMuted = false
+    private val broadcastReceiver =
+        object : BroadcastReceiver() {
+            override fun onReceive(context: Context, intent: Intent) {
+                when (intent.action) {
+                    AudioManager.STREAM_MUTE_CHANGED_ACTION -> {
+                        val stream = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1)
+                        val state =
+                            intent.getBooleanExtra(AudioManager.EXTRA_STREAM_VOLUME_MUTED, false)
+                        if (stream == AudioSystem.STREAM_MUSIC && !state) {
+                            wasMuted = false
+                        }
+                    }
+
+                    Intent.ACTION_BOOT_COMPLETED -> populateKeyState(false)
+                }
             }
         }
-    }
 
     init {
         context.registerReceiver(
             broadcastReceiver,
-            IntentFilter(AudioManager.STREAM_MUTE_CHANGED_ACTION)
+            IntentFilter().apply {
+                addAction(AudioManager.STREAM_MUTE_CHANGED_ACTION)
+                addAction(Intent.ACTION_BOOT_COMPLETED)
+            },
         )
     }
 
@@ -67,37 +77,40 @@ class KeyHandler(context: Context) : DeviceKeyHandler {
             return event
         }
 
-        when (File("/proc/tristatekey/tri_state").readText().trim()) {
-            "1" -> handleMode(POSITION_TOP)
-            "2" -> handleMode(POSITION_MIDDLE)
-            "3" -> handleMode(POSITION_BOTTOM)
-        }
+        populateKeyState(true)
 
         return null
     }
 
-    private fun vibrateIfNeeded(mode: Int) {
-        when (mode) {
-            AudioManager.RINGER_MODE_VIBRATE -> vibrator.vibrate(
-                MODE_VIBRATION_EFFECT,
-                HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES
-            )
-            AudioManager.RINGER_MODE_NORMAL -> vibrator.vibrate(
-                MODE_NORMAL_EFFECT,
-                HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES
-            )
+    private fun populateKeyState(vibrate: Boolean) {
+        when (File("/proc/tristatekey/tri_state").readText().trim()) {
+            "1" -> handleMode(POSITION_TOP, vibrate)
+            "2" -> handleMode(POSITION_MIDDLE, vibrate)
+            "3" -> handleMode(POSITION_BOTTOM, vibrate)
         }
     }
 
-    private fun handleMode(position: Int) {
+    private fun vibrateIfNeeded(mode: Int) {
+        when (mode) {
+            AudioManager.RINGER_MODE_VIBRATE ->
+                vibrator.vibrate(MODE_VIBRATION_EFFECT, HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES)
+            AudioManager.RINGER_MODE_NORMAL ->
+                vibrator.vibrate(MODE_NORMAL_EFFECT, HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES)
+        }
+    }
+
+    private fun handleMode(position: Int, vibrate: Boolean) {
         val muteMedia = sharedPreferences.getBoolean(MUTE_MEDIA_WITH_SILENT, false)
 
-        val mode = when (position) {
-            POSITION_TOP -> sharedPreferences.getString(ALERT_SLIDER_TOP_KEY, "0")!!.toInt()
-            POSITION_MIDDLE -> sharedPreferences.getString(ALERT_SLIDER_MIDDLE_KEY, "1")!!.toInt()
-            POSITION_BOTTOM -> sharedPreferences.getString(ALERT_SLIDER_BOTTOM_KEY, "2")!!.toInt()
-            else -> return
-        }
+        val mode =
+            when (position) {
+                POSITION_TOP -> sharedPreferences.getString(ALERT_SLIDER_TOP_KEY, "0")!!.toInt()
+                POSITION_MIDDLE ->
+                    sharedPreferences.getString(ALERT_SLIDER_MIDDLE_KEY, "1")!!.toInt()
+                POSITION_BOTTOM ->
+                    sharedPreferences.getString(ALERT_SLIDER_BOTTOM_KEY, "2")!!.toInt()
+                else -> return
+            }
 
         executorService.submit {
             when (mode) {
@@ -109,14 +122,17 @@ class KeyHandler(context: Context) : DeviceKeyHandler {
                         wasMuted = true
                     }
                 }
-                AudioManager.RINGER_MODE_VIBRATE, AudioManager.RINGER_MODE_NORMAL -> {
+                AudioManager.RINGER_MODE_VIBRATE,
+                AudioManager.RINGER_MODE_NORMAL -> {
                     setZenMode(Settings.Global.ZEN_MODE_OFF)
                     audioManager.ringerModeInternal = mode
                     if (muteMedia && wasMuted) {
                         audioManager.adjustVolume(AudioManager.ADJUST_UNMUTE, 0)
                     }
                 }
-                ZEN_PRIORITY_ONLY, ZEN_TOTAL_SILENCE, ZEN_ALARMS_ONLY -> {
+                ZEN_PRIORITY_ONLY,
+                ZEN_TOTAL_SILENCE,
+                ZEN_ALARMS_ONLY -> {
                     audioManager.ringerModeInternal = AudioManager.RINGER_MODE_NORMAL
                     setZenMode(mode - ZEN_OFFSET)
                     if (muteMedia && wasMuted) {
@@ -124,7 +140,10 @@ class KeyHandler(context: Context) : DeviceKeyHandler {
                     }
                 }
             }
-            vibrateIfNeeded(mode)
+
+            if (vibrate) {
+                vibrateIfNeeded(mode)
+            }
         }
     }
 

Pen/Android.bp

@@ -10,6 +10,7 @@ android_app {
 
     certificate: "platform",
     platform_apis: true,
+    privileged: true,
     system_ext_specific: true,
 
     optimize: {

Pen/AndroidManifest.xml

@@ -6,11 +6,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.lineageos.pen">
 
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"
+                     android:usesPermissionFlags="neverForLocation" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
 
     <application
         android:label="@string/app_name"

Pen/default-permissions_org.lineageos.pen.xml

@@ -5,7 +5,6 @@
 -->
 <exceptions>
     <exception package="org.lineageos.pen">
-        <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false" />
         <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false" />
         <permission name="android.permission.BLUETOOTH_SCAN" fixed="false" />
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false" />

Pen/res/values-az/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Qələm taxılıb</string>
+    <string name="tap_to_connect">Bağlanmaq üçün toxunun</string>
+</resources>

Pen/res/values-bg/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Дигитална писалка е сдвоена</string>
+    <string name="tap_to_connect">Натисни за сдвояване</string>
+</resources>

Pen/res/values-ca/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Bolígraf adjunt</string>
+    <string name="tap_to_connect">Toqueu per connectar</string>
+</resources>

Pen/res/values-cs/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Pero připojeno</string>
+    <string name="tap_to_connect">Klepnutím připojit</string>
+</resources>

Pen/res/values-el/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Η γραφίδα προσαρτήθηκε</string>
+    <string name="tap_to_connect">Πατήστε για σύνδεση</string>
+</resources>

Pen/res/values-en-rAU/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Pen attached</string>
+    <string name="tap_to_connect">Tap to connect</string>
+</resources>

Pen/res/values-en-rCA/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Pen attached</string>
+    <string name="tap_to_connect">Tap to connect</string>
+</resources>

Pen/res/values-en-rGB/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Pen attached</string>
+    <string name="tap_to_connect">Tap to connect</string>
+</resources>

Pen/res/values-en-rIN/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Pen attached</string>
+    <string name="tap_to_connect">Tap to connect</string>
+</resources>

Pen/res/values-es/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Bolígrafo adjunto</string>
+    <string name="tap_to_connect">Toca para conectar</string>
+</resources>

Pen/res/values-fa/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">قلم متصل شد</string>
+    <string name="tap_to_connect">برای اتصال ضربه بزنید</string>
+</resources>

Pen/res/values-fr/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Stylo attaché</string>
+    <string name="tap_to_connect">Appuyer pour connecter</string>
+</resources>

Pen/res/values-ga-rIE/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Peann ceangailte</string>
+    <string name="tap_to_connect">Tapáil chun ceangal</string>
+</resources>

Pen/res/values-hu/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Toll mellékelve</string>
+    <string name="tap_to_connect">A csatlakoztatáshoz érintse meg</string>
+</resources>

Pen/res/values-it/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Penna attaccata</string>
+    <string name="tap_to_connect">Tocca per connettere</string>
+</resources>

Pen/res/values-iw/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">עט מצורף</string>
+    <string name="tap_to_connect">נגיעה להתחברות</string>
+</resources>

Pen/res/values-ja/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">ペンを装着しました</string>
+    <string name="tap_to_connect">タップして接続</string>
+</resources>

Pen/res/values-ka/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">კალამი მიუერთდა</string>
+    <string name="tap_to_connect">შეეხეთ მიერთებისთვის</string>
+</resources>

Pen/res/values-pl/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Dołączone pióro</string>
+    <string name="tap_to_connect">Dotknij, aby połączyć</string>
+</resources>

Pen/res/values-pt-rBR/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Caneta anexada</string>
+    <string name="tap_to_connect">Toque para conectar</string>
+</resources>

Pen/res/values-pt-rPT/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Caneta anexada</string>
+    <string name="tap_to_connect">Toque para conectar</string>
+</resources>

Pen/res/values-ro/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Stilou atașat</string>
+    <string name="tap_to_connect">Atingeți pentru a conecta</string>
+</resources>

Pen/res/values-ru/strings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="tap_to_connect">Нажмите, чтобы подключить</string>
+</resources>

Pen/res/values-sc-rIT/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Pinna alligongiada</string>
+    <string name="tap_to_connect">Toca pro connètere</string>
+</resources>

Pen/res/values-sl/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Pisalo priključeno</string>
+    <string name="tap_to_connect">Tapnite za povezavo</string>
+</resources>

Pen/res/values-ta/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">எழுத்தாணி இணைக்கப்பட்டது</string>
+    <string name="tap_to_connect">இணைக்கத் தட்டுக</string>
+</resources>

Pen/res/values-ug/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">قەلەم ئۇلاندى</string>
+    <string name="tap_to_connect">چېكىلسە باغلىنىدۇ</string>
+</resources>

Pen/res/values-vi/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">Đã gắn bút</string>
+    <string name="tap_to_connect">Chạm để kết nối</string>
+</resources>

Pen/res/values-zh-rCN/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="pen_attached">笔已连接</string>
+    <string name="tap_to_connect">轻触以连接</string>
+</resources>

Pen/res/values/config.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: 2025 The LineageOS Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <!-- Max supported refresh rate when using pen. -->
+    <string name="config_penSupportedRefreshRate" translatable="false"></string>
+</resources>

Pen/src/org/lineageos/pen/PenService.kt

@@ -15,38 +15,73 @@ import android.bluetooth.le.ScanCallback
 import android.bluetooth.le.ScanFilter
 import android.bluetooth.le.ScanResult
 import android.bluetooth.le.ScanSettings
-import android.content.Context
 import android.content.Intent
+import android.database.ContentObserver
+import android.hardware.input.InputManager
+import android.os.Handler
 import android.os.IBinder
 import android.os.UEventObserver
+import android.provider.Settings
+import android.provider.Settings.System.PEAK_REFRESH_RATE
 import android.util.Log
 
 class PenService : Service() {
     private val bluetoothManager by lazy { getSystemService(BluetoothManager::class.java) }
+    private val inputManager by lazy { getSystemService(InputManager::class.java) }
     private val notificationManager by lazy { getSystemService(NotificationManager::class.java) }
 
-    private val observer = object : UEventObserver() {
-        private val lock = Any()
+    private val penSupportedRefreshRate by lazy {
+        getString(R.string.config_penSupportedRefreshRate)
+    }
 
-        override fun onUEvent(event: UEvent) {
-            synchronized(lock) {
-                val pencilStatus = event.get("pencil_status") ?: return
-                val pencilAddr = event.get("pencil_addr")?.chunked(2)?.joinToString(":") {
-                    it.uppercase()
-                } ?: return
+    private val handler by lazy { Handler(mainLooper) }
 
-                when (pencilStatus) {
-                    "0" -> notificationManager.cancel(NOTIFICATION_ID)
-                    "1" -> postNotification(pencilAddr)
+    private val observer =
+        object : UEventObserver() {
+            private val lock = Any()
+
+            override fun onUEvent(event: UEvent) {
+                synchronized(lock) {
+                    val pencilStatus = event.get("pencil_status") ?: return
+                    val pencilAddr =
+                        event.get("pencil_addr")?.chunked(2)?.joinToString(":") { it.uppercase() }
+                            ?: return
+
+                    when (pencilStatus) {
+                        "0" -> notificationManager.cancel(NOTIFICATION_ID)
+                        "1" -> postNotification(pencilAddr)
+                    }
                 }
             }
         }
+
+    private val inputObserver =
+        object : InputManager.InputDeviceListener {
+            override fun onInputDeviceAdded(deviceId: Int) {
+                overridePeakRefreshRateIfNeeded()
+            }
+
+            override fun onInputDeviceRemoved(deviceId: Int) {
+                overridePeakRefreshRateIfNeeded()
+            }
+
+            override fun onInputDeviceChanged(deviceId: Int) {
+                // Do nothing
+            }
+        }
+
+    private val peakRefreshRateSettingsObserver by lazy {
+        object : ContentObserver(handler) {
+            override fun onChange(selfChange: Boolean) {
+                super.onChange(selfChange)
+
+                overridePeakRefreshRateIfNeeded()
+            }
+        }
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        intent?.getStringExtra(EXTRA_PENCIL_ADDR)?.let {
-            bondBtDevice(it)
-        }
+        intent?.getStringExtra(EXTRA_PENCIL_ADDR)?.let { bondBtDevice(it) }
 
         return START_STICKY
     }
@@ -56,12 +91,28 @@ class PenService : Service() {
     override fun onCreate() {
         super.onCreate()
 
+        if (!penSupportedRefreshRate.isEmpty()) {
+            contentResolver.registerContentObserver(
+                Settings.System.getUriFor(PEAK_REFRESH_RATE),
+                false,
+                peakRefreshRateSettingsObserver,
+            )
+            peakRefreshRateSettingsObserver.onChange(true)
+
+            inputManager.registerInputDeviceListener(inputObserver, handler)
+        }
+
         observer.startObserving("DEVPATH=/devices/virtual/oplus_wireless/pencil")
     }
 
     override fun onDestroy() {
         super.onDestroy()
 
+        if (!penSupportedRefreshRate.isEmpty()) {
+            contentResolver.unregisterContentObserver(peakRefreshRateSettingsObserver)
+            inputManager.unregisterInputDeviceListener(inputObserver)
+        }
+
         observer.stopObserving()
     }
 
@@ -69,8 +120,16 @@ class PenService : Service() {
         val adapter = bluetoothManager.adapter
         @Suppress("DEPRECATION") adapter.enable()
 
-        val scanner = adapter.bluetoothLeScanner
-        scanner.startScan(
+        val scanner = run {
+            repeat(50) {
+                adapter.bluetoothLeScanner?.let {
+                    return@run it
+                }
+                Thread.sleep(100)
+            }
+            return@run null
+        }
+        scanner?.startScan(
             listOf(ScanFilter.Builder().setDeviceAddress(pencilAddr).build()),
             ScanSettings.Builder()
                 .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
@@ -93,10 +152,36 @@ class PenService : Service() {
                     super.onScanFailed(errorCode)
                     scanner.stopScan(this)
                 }
-            }
+            },
         )
     }
 
+    private fun overridePeakRefreshRateIfNeeded() {
+        val isPenConnected =
+            inputManager.inputDeviceIds.firstOrNull {
+                val device = inputManager.getInputDevice(it) ?: return@firstOrNull false
+                if (device.vendorId != 0x22D9 && device.vendorId != 0x330A) {
+                    // Not an OPPO/Maxeye vendor ID
+                    return@firstOrNull false
+                }
+                if (
+                    device.bluetoothAddress?.startsWith("C0:87:06") == false &&
+                        device.bluetoothAddress?.startsWith("F8:6F:DE") == false
+                ) {
+                    // Not a Maxeye/Goodix MAC prefix
+                    return@firstOrNull false
+                }
+                return@firstOrNull true
+            } != null
+        val peakRefreshRate = Settings.System.getString(contentResolver, PEAK_REFRESH_RATE)
+
+        if (isPenConnected && peakRefreshRate == "Infinity") {
+            Settings.System.putString(contentResolver, PEAK_REFRESH_RATE, penSupportedRefreshRate)
+        } else if (!isPenConnected && peakRefreshRate == penSupportedRefreshRate) {
+            Settings.System.putString(contentResolver, PEAK_REFRESH_RATE, "Infinity")
+        }
+    }
+
     private fun postNotification(pencilAddr: String) {
         val adapter = bluetoothManager.adapter
 
@@ -110,27 +195,29 @@ class PenService : Service() {
                 NotificationChannel(
                     NOTIFICATION_CHANNEL_ID,
                     NOTIFICATION_CHANNEL_ID,
-                    NotificationManager.IMPORTANCE_HIGH
+                    NotificationManager.IMPORTANCE_HIGH,
                 )
             )
         }
 
-        val contentIntent = PendingIntent.getService(
-            this,
-            0,
-            Intent(this, PenService::class.java).apply {
-                putExtra(EXTRA_PENCIL_ADDR, pencilAddr)
-            },
-            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-        )
+        val contentIntent =
+            PendingIntent.getService(
+                this,
+                0,
+                Intent(this, PenService::class.java).apply {
+                    putExtra(EXTRA_PENCIL_ADDR, pencilAddr)
+                },
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
+            )
 
-        val notification = Notification.Builder(this, NOTIFICATION_CHANNEL_ID)
-            .setSmallIcon(R.drawable.ic_stylus)
-            .setContentTitle(getString(R.string.pen_attached))
-            .setContentText(getString(R.string.tap_to_connect))
-            .setContentIntent(contentIntent)
-            .setAutoCancel(true)
-            .build()
+        val notification =
+            Notification.Builder(this, NOTIFICATION_CHANNEL_ID)
+                .setSmallIcon(R.drawable.ic_stylus)
+                .setContentTitle(getString(R.string.pen_attached))
+                .setContentText(getString(R.string.tap_to_connect))
+                .setContentIntent(contentIntent)
+                .setAutoCancel(true)
+                .build()
         notificationManager.notify(NOTIFICATION_ID, notification)
     }
 

README.md

@@ -16,4 +16,3 @@
 | OPLUS_LINEAGE_TOUCH_HAL | USE_OPLUSTOUCH | Use and interface with stock OplusTouch | false |
 | OPLUS_LINEAGE_VIBRATOR_HAL | INCLUDE_DIR | Device specific include dir path | |
 | OPLUS_LINEAGE_VIBRATOR_HAL | USE_EFFECT_STREAM | Enable effect stream feature | false |
-| QTI_GPT_UTILS | USE_BSG_FRAMEWORK | Enable BSG framework feature | true |

aidl/ir/ConsumerIr.cpp

@@ -26,15 +26,15 @@ ConsumerIr::ConsumerIr() : supportedFreqs({{MIN_FREQ, MAX_FREQ}}) {}
     return ::ndk::ScopedAStatus::ok();
 }
 
-::ndk::ScopedAStatus ConsumerIr::transmit(int32_t in_carrierFreqHz,
-                                          const std::vector<int32_t>& in_pattern) {
-    if (in_carrierFreqHz < MIN_FREQ || in_carrierFreqHz > MAX_FREQ) {
-        LOG(ERROR) << "Invalid carrier frequency: " << in_carrierFreqHz;
+::ndk::ScopedAStatus ConsumerIr::transmit(int32_t carrierFreqHz,
+                                          const std::vector<int32_t>& pattern) {
+    if (carrierFreqHz < MIN_FREQ || carrierFreqHz > MAX_FREQ) {
+        LOG(ERROR) << "Invalid carrier frequency: " << carrierFreqHz;
         return ::ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
     }
 
     int32_t totalTime = 0;
-    for (int32_t value : in_pattern) {
+    for (int32_t value : pattern) {
         if (value < 0) {
             LOG(ERROR) << "Invalid pattern value: " << value;
             return ::ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
@@ -53,7 +53,7 @@ ConsumerIr::ConsumerIr() : supportedFreqs({{MIN_FREQ, MAX_FREQ}}) {}
         return ::ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
     }
 
-    size_t paramsSize = sizeof(struct pattern_params) + in_pattern.size() * sizeof(int32_t);
+    size_t paramsSize = sizeof(struct pattern_params) + pattern.size() * sizeof(int32_t);
     auto params = std::unique_ptr<struct pattern_params, decltype(&free)>(
             static_cast<pattern_params*>(malloc(paramsSize)), free);
     if (!params) {
@@ -61,9 +61,9 @@ ConsumerIr::ConsumerIr() : supportedFreqs({{MIN_FREQ, MAX_FREQ}}) {}
         return ::ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
     }
 
-    params->carrier_freq = in_carrierFreqHz;
-    params->size = in_pattern.size();
-    memcpy(params->pattern, in_pattern.data(), in_pattern.size() * sizeof(int32_t));
+    params->carrier_freq = carrierFreqHz;
+    params->size = pattern.size();
+    memcpy(params->pattern, pattern.data(), pattern.size() * sizeof(int32_t));
 
     int result = ioctl(fd, IR_SEND_PATTERN, params.get());
 

aidl/ir/ConsumerIr.h

@@ -18,8 +18,8 @@ class ConsumerIr : public BnConsumerIr {
 
   private:
     ::ndk::ScopedAStatus getCarrierFreqs(std::vector<ConsumerIrFreqRange>* _aidl_return) override;
-    ::ndk::ScopedAStatus transmit(int32_t in_carrierFreqHz,
-                                  const std::vector<int32_t>& in_pattern) override;
+    ::ndk::ScopedAStatus transmit(int32_t carrierFreqHz,
+                                  const std::vector<int32_t>& pattern) override;
 
     std::vector<ConsumerIrFreqRange> supportedFreqs;
 };

aidl/livedisplay/AntiFlicker.cpp

@@ -19,7 +19,9 @@ AntiFlicker::AntiFlicker() : mOplusDisplayFd(open("/dev/oplus_display", O_RDWR))
 
 ndk::ScopedAStatus AntiFlicker::getEnabled(bool* _aidl_return) {
     unsigned int value;
-    if (ioctl(mOplusDisplayFd, PANEL_IOCTL_GET_DIMLAYER_BL_EN, &value) != 0) {
+    if (ioctl(mOplusDisplayFd, PANEL_IOCTL_GET_PWM_PULSE, &value) != 0 &&
+        ioctl(mOplusDisplayFd, PANEL_IOCTL_GET_PWM_TURBO, &value) != 0 &&
+        ioctl(mOplusDisplayFd, PANEL_IOCTL_GET_DIMLAYER_BL_EN, &value) != 0) {
         LOG(ERROR) << "Failed to read current AntiFlicker state";
         return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
     }
@@ -33,7 +35,8 @@ ndk::ScopedAStatus AntiFlicker::setEnabled(bool enabled) {
         return status;
     }
     unsigned int value = enabled;
-    if (isEnabled != enabled &&
+    if (isEnabled != enabled && ioctl(mOplusDisplayFd, PANEL_IOCTL_SET_PWM_PULSE, &value) != 0 &&
+        ioctl(mOplusDisplayFd, PANEL_IOCTL_SET_PWM_TURBO, &value) != 0 &&
         ioctl(mOplusDisplayFd, PANEL_IOCTL_SET_DIMLAYER_BL_EN, &value) != 0) {
         LOG(ERROR) << "Failed to set AntiFlicker state";
         return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);

aidl/performance/Android.bp

@@ -0,0 +1,21 @@
+//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+cc_binary {
+    name: "vendor.oplus.hardware.performance-service",
+    vendor: true,
+    relative_install_path: "hw",
+    init_rc: ["vendor.oplus.hardware.performance-service.rc"],
+    vintf_fragments: ["vendor.oplus.hardware.performance-service.xml"],
+    srcs: [
+        "Performance.cpp",
+        "service.cpp",
+    ],
+    shared_libs: [
+        "libbase",
+        "libbinder_ndk",
+        "vendor.oplus.hardware.performance-V1-ndk",
+    ],
+}

aidl/performance/Performance.h

@@ -0,0 +1,234 @@
+/*
+ * SPDX-FileCopyrightText: 2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <aidl/vendor/oplus/hardware/performance/BnPerformance.h>
+
+namespace aidl {
+namespace vendor {
+namespace oplus {
+namespace hardware {
+namespace performance {
+
+class Performance : public BnPerformance {
+    ndk::ScopedAStatus addAcmDirName(const std::string& dirname, int64_t flag,
+                                     int32_t* _aidl_return) override;
+    ndk::ScopedAStatus addAcmNomediaDirName(const std::string& dirname,
+                                            int32_t* _aidl_return) override;
+    ndk::ScopedAStatus addAcmPkgName(const std::string& pkgname, int64_t flag,
+                                     int32_t* _aidl_return) override;
+    ndk::ScopedAStatus addTaskTrackPid(int32_t group, int32_t pid, bool clear,
+                                       int32_t* _aidl_return) override;
+    ndk::ScopedAStatus clearTaskTrackGroup(int32_t group) override;
+    ndk::ScopedAStatus delAcmDirName(const std::string& dirname, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus delAcmNomediaDirName(const std::string& dirname,
+                                            int32_t* _aidl_return) override;
+    ndk::ScopedAStatus delAcmPkgName(const std::string& pkgname, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus disableDamonReclaim(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus disableKmallocDebug(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus disableMultiThreadOptimize(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus disableProcessReclaim(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus disableTaskCpustats(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus disableTaskPlacementDecision(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus disableVmallocDebug(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus enableAudioPerf(const std::string& value, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus enableDamonReclaim(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus enableKmallocDebug(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus enableMultiThreadOptimize(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus enableProcessReclaim(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus enableTaskCpustats(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus enableTaskPlacementDecision(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus enableVmallocDebug(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus existMemMonitor(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus getAcmDirFlag(const std::string& dirname, int64_t* _aidl_return) override;
+    ndk::ScopedAStatus getAcmOpstat(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus getAcmPkgFlag(const std::string& pkgname, int64_t* _aidl_return) override;
+    ndk::ScopedAStatus getClmMuxSwitch(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getClmThreshold(int32_t threshold_id, std::string* _aidl_return) override;
+    ndk::ScopedAStatus getDdrResidency(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getDevinfoDDRInfo(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getDevinfoUfsInfo(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getDevinfoUfsVersionInfo(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getExt4FragScore(const std::string& devpath,
+                                        std::string* _aidl_return) override;
+    ndk::ScopedAStatus getExt4FreefragInfo(const std::string& devpath,
+                                           std::string* _aidl_return) override;
+    ndk::ScopedAStatus getF2fsMovedBlks(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getHIAllocWait(ProcReqHal* _aidl_return) override;
+    ndk::ScopedAStatus getHICpuInfo(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getHICpuLoading(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getHIDState(ProcReqHal* _aidl_return) override;
+    ndk::ScopedAStatus getHIEmcdrvIowait(ProcReqHal* _aidl_return) override;
+    ndk::ScopedAStatus getHIFsyncWait(ProcReqHal* _aidl_return) override;
+    ndk::ScopedAStatus getHIIonWait(ProcReqHal* _aidl_return) override;
+    ndk::ScopedAStatus getHIIowait(ProcReqHal* _aidl_return) override;
+    ndk::ScopedAStatus getHIIowaitHung(ProcReqHal* _aidl_return) override;
+    ndk::ScopedAStatus getHIKswapdLoading(ProcReqHal* _aidl_return) override;
+    ndk::ScopedAStatus getHISchedLatency(ProcReqHal* _aidl_return) override;
+    ndk::ScopedAStatus getHIScmCall(ProcReqHal* _aidl_return) override;
+    ndk::ScopedAStatus getHIUfsFeature(ProcReqHal* _aidl_return) override;
+    ndk::ScopedAStatus getKernelVersion(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus getKmallocDebug(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getKmallocOrigin(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getKmallocUsed(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getMemMonitor(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getOswapVersion(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus getUfsSignalRecordUpload(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getUfsplusHpbStatus(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus getUfsplusTwStatus(int32_t* _aidl_return) override;
+    ndk::ScopedAStatus getVmallocDebug(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getVmallocHashCal(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getVmallocUsed(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getWakeThreadsAffinityOrdered(const std::string& handle, int32_t size,
+                                                     TaskWakeInfo* _aidl_return) override;
+    ndk::ScopedAStatus getallocwait(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getdstate(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getfsyncwait(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getionwait(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getiowait(std::string* _aidl_return) override;
+    ndk::ScopedAStatus getschedlatency(std::string* _aidl_return) override;
+    ndk::ScopedAStatus hybridswap_memcg_para_read(int32_t action, const std::string& cgroup,
+                                                  std::string* _aidl_return) override;
+    ndk::ScopedAStatus hybridswap_memcg_para_write(int32_t action, const std::string& cgroup,
+                                                   const std::string& str,
+                                                   int32_t* _aidl_return) override;
+    ndk::ScopedAStatus hybridswap_zram_para_read(int32_t action,
+                                                 std::string* _aidl_return) override;
+    ndk::ScopedAStatus hybridswap_zram_para_write(int32_t action, const std::string& str,
+                                                  int32_t* _aidl_return) override;
+    ndk::ScopedAStatus isJankTaskTrackEnable(bool* _aidl_return) override;
+    ndk::ScopedAStatus perProcessMemReadahead(int32_t uid, int32_t pid, int32_t type,
+                                              int32_t* _aidl_return) override;
+    ndk::ScopedAStatus perProcessMemReclaim(int32_t uid, int32_t pid, int32_t type,
+                                            int32_t* _aidl_return) override;
+    ndk::ScopedAStatus readCallStack(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readClmEnable(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readClmHighLoadAll(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readClmHighLoadGrp(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readClmLowLoadGrp(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readCpuTaskstats(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readDBacktrace(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readDConvert(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readFgFreqsThreshold(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readIOBacktrace(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readIomonitorInfo(const std::string& procname,
+                                         std::string* _aidl_return) override;
+    ndk::ScopedAStatus readJankCpuIndicator(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readJankCpuInfo(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readJankCpuInfoSig(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readJankCpuLoad(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readJankCpuLoad32(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readJankCpuLoad32Scale(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readJankTaskTrack(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readJankTaskTrackByPid(int32_t pid, std::string* _aidl_return) override;
+    ndk::ScopedAStatus readJankVersion(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readKmallocDebugCreate(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readLimitTable(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readMemleakDetectThread(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readMemoryByPids(const std::vector<int32_t>& pids, int32_t flags,
+                                        ProcMemStatRet* _aidl_return) override;
+    ndk::ScopedAStatus readMemoryByUids(const std::vector<int32_t>& uids, int32_t flags,
+                                        ProcMemStatRet* _aidl_return) override;
+    ndk::ScopedAStatus readNandswapProc(const std::string& inProc,
+                                        std::string* _aidl_return) override;
+    ndk::ScopedAStatus readNormalizeRealTime(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readNormalizeRunningTime(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readOplusReserve3(int32_t offset, int32_t len,
+                                         std::string* _aidl_return) override;
+    ndk::ScopedAStatus readOsvelteVersion(OsvelteVersionRet* _aidl_return) override;
+    ndk::ScopedAStatus readPidsSet(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readRealTime(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readRunningTime(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readSchedInfoThreshold(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readSgeFreqInfo(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readSgeInfo(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readStorageFeature(const std::string& name, const std::string& addr,
+                                          const std::string& isMulti,
+                                          std::string* _aidl_return) override;
+    ndk::ScopedAStatus readTargetProcess(const std::string& buffer,
+                                         std::string* _aidl_return) override;
+    ndk::ScopedAStatus readTaskCpustatsEnable(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readTaskSchedInfo(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readTidsSet(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readTmemoryDirtypages(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readTmemoryErrorStat(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readTmemoryIoLatency(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readTmemorySysdirtypages(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readUxTaskTrack(int32_t uPid, int32_t rPid,
+                                       std::string* _aidl_return) override;
+    ndk::ScopedAStatus readVaFeature(std::string* _aidl_return) override;
+    ndk::ScopedAStatus readVersion(std::string* _aidl_return) override;
+    ndk::ScopedAStatus removeTaskTrackPid(int32_t group, int32_t pid) override;
+    ndk::ScopedAStatus searchAcmNomediaDirName(const std::string& dirname,
+                                               int32_t* _aidl_return) override;
+    ndk::ScopedAStatus setAcmOpstat(int32_t flag, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus setClmMuxSwitch(const std::string& buffer) override;
+    ndk::ScopedAStatus setClmThreshold(const std::string& buffer, int32_t threshold_id) override;
+    ndk::ScopedAStatus setDamonReclaimColdTime(int32_t cold_time, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus setDamonReclaimMonitoring(int32_t sample, int32_t aggr,
+                                                 int32_t* _aidl_return) override;
+    ndk::ScopedAStatus setDamonReclaimQuota(int32_t quota_ms, int32_t quota_sz,
+                                            int32_t reset_interval, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus setDamonReclaimWmarks(int32_t metric, int32_t high, int32_t mid, int32_t low,
+                                             int32_t* _aidl_return) override;
+    ndk::ScopedAStatus setExtSchedProp(const std::string& pid, const std::string& prop) override;
+    ndk::ScopedAStatus setFgUids(const std::string& fg_uid) override;
+    ndk::ScopedAStatus setFrameRate(const std::string& frame_rate) override;
+    ndk::ScopedAStatus setFreqGoverner(const std::string& gov_name,
+                                       const std::vector<int32_t>& clusters,
+                                       int32_t* _aidl_return) override;
+    ndk::ScopedAStatus setImFlag(const std::string& pid, const std::string& im_flag) override;
+    ndk::ScopedAStatus setProcessReclaim(const std::string& info, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus setSchedAssistImptTask(const std::string& impt_info) override;
+    ndk::ScopedAStatus setSchedAssistScene(const std::string& scene_id) override;
+    ndk::ScopedAStatus setSlideboost(const std::string& boost) override;
+    ndk::ScopedAStatus setTpdID(const std::string& param, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus setTpdSerialParams(const std::string& params,
+                                          int32_t* _aidl_return) override;
+    ndk::ScopedAStatus setWakeSeedThread(const std::string& tid, bool identify_type, bool inUid,
+                                         int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeClmEnable(const std::string& buffer) override;
+    ndk::ScopedAStatus writeClmHighLoadAll(const std::string& buffer) override;
+    ndk::ScopedAStatus writeClmHighLoadGrp(const std::string& buffer) override;
+    ndk::ScopedAStatus writeClmLowLoadGrp(const std::string& buffer) override;
+    ndk::ScopedAStatus writeDBacktrace(const std::string& buffer) override;
+    ndk::ScopedAStatus writeFgFreqsThreshold(const std::string& buffer) override;
+    ndk::ScopedAStatus writeIOBacktrace(const std::string& buffer) override;
+    ndk::ScopedAStatus writeJankTaskTrackEnable(bool enable) override;
+    ndk::ScopedAStatus writeKmallocDebugCreate(int32_t kcreate, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeKmallocDebugCreateWithType(const std::string& type,
+                                                       int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeMemMonitor(const std::string& buffer, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeMemleakDetectThread(int32_t memdect, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeMonitorStatus(const std::string& buffer,
+                                          int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeNandswapProc(const std::string& inProc, const std::string& cmd,
+                                         int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeOplusReserve3(int32_t offset, int32_t len, const std::string& info,
+                                          int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writePidsSet(const std::string& buffer) override;
+    ndk::ScopedAStatus writeSchedInfoThreshold(const std::string& buffer) override;
+    ndk::ScopedAStatus writeStorageFeature(const std::string& name, const std::string& addr,
+                                           const std::string& isMulti, const std::string& cmd,
+                                           int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeTaskSchedInfo(const std::string& buffer) override;
+    ndk::ScopedAStatus writeTidsSet(const std::string& buffer) override;
+    ndk::ScopedAStatus writeTmemoryCapacity(int32_t param, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeTmemoryFlushBusy(int32_t param, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeTmemoryFlushIdle(int32_t param, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeTmemoryHighWaterRatio(int32_t param, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeTmemoryMemory(const std::string& str, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeTmemorySwitch(int32_t param, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeUxState(const std::string& ux_state, const std::string& pid,
+                                    const std::string& tid, int32_t* _aidl_return) override;
+    ndk::ScopedAStatus writeVaFeature(int32_t vafeature, int32_t* _aidl_return) override;
+};
+
+}  // namespace performance
+}  // namespace hardware
+}  // namespace oplus
+}  // namespace vendor
+}  // namespace aidl

aidl/performance/service.cpp

@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "Performance.h"
+
+#include <android-base/logging.h>
+#include <android/binder_manager.h>
+#include <android/binder_process.h>
+
+using ::aidl::vendor::oplus::hardware::performance::Performance;
+
+int main() {
+    ABinderProcess_setThreadPoolMaxThreadCount(0);
+    std::shared_ptr<Performance> performance = ndk::SharedRefBase::make<Performance>();
+
+    const std::string instance = std::string() + Performance::descriptor + "/default";
+    binder_status_t status =
+            AServiceManager_addService(performance->asBinder().get(), instance.c_str());
+    CHECK_EQ(status, STATUS_OK);
+
+    ABinderProcess_joinThreadPool();
+    return EXIT_FAILURE;  // should not reach
+}

aidl/performance/vendor.oplus.hardware.performance-service.rc

@@ -0,0 +1,4 @@
+service oplus.performance.hal.service /vendor/bin/hw/vendor.oplus.hardware.performance-service
+    class hal
+    user system
+    group system

aidl/performance/vendor.oplus.hardware.performance-service.xml

@@ -0,0 +1,7 @@
+<manifest version="1.0" type="device">
+    <hal format="aidl">
+        <name>vendor.oplus.hardware.performance</name>
+        <version>1</version>
+        <fqname>IPerformance/default</fqname>
+    </hal>
+</manifest>

aidl/sensors/.clang-format

@@ -0,0 +1 @@
+../../../../build/soong/scripts/system-clang-format

aidl/sensors/Android.bp

@@ -0,0 +1,57 @@
+//
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package {
+    // See: http://go/android-license-faq
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+cc_binary {
+    name: "android.hardware.sensors-service.oplus-multihal",
+    vendor: true,
+    relative_install_path: "hw",
+    srcs: [
+        "service.cpp",
+        "HalProxy.cpp",
+        "HalProxyCallback.cpp",
+    ],
+    header_libs: [
+        "android.hardware.sensors@2.X-multihal.header",
+        "android.hardware.sensors@2.X-shared-utils",
+    ],
+    init_rc: ["android.hardware.sensors-service.oplus-multihal.rc"],
+    vintf_fragments: ["android.hardware.sensors.oplus-multihal.xml"],
+    shared_libs: [
+        "android.hardware.sensors@2.0-ScopedWakelock",
+        "android.hardware.sensors@2.0",
+        "android.hardware.sensors@2.1",
+        "android.hardware.sensors-V3-ndk",
+        "libbase",
+        "libcutils",
+        "libfmq",
+        "liblog",
+        "libpower",
+        "libutils",
+        "libbinder_ndk",
+        "libhidlbase",
+    ],
+    static_libs: [
+        "libaidlcommonsupport",
+        "android.hardware.sensors@1.0-convert",
+        "android.hardware.sensors@2.X-multihal",
+        "android.hardware.sensors@aidl-multihal",
+    ],
+}

aidl/sensors/HalProxy.cpp

@@ -0,0 +1,810 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "HalProxy.h"
+
+#include <android/hardware/sensors/2.0/types.h>
+
+#include <android-base/file.h>
+#include "hardware_legacy/power.h"
+
+#include <dlfcn.h>
+
+#include <cinttypes>
+#include <cmath>
+#include <fstream>
+#include <functional>
+#include <thread>
+
+namespace android {
+namespace hardware {
+namespace sensors {
+namespace V2_1 {
+namespace implementation {
+
+using ::android::hardware::sensors::V1_0::Result;
+using ::android::hardware::sensors::V2_0::EventQueueFlagBits;
+using ::android::hardware::sensors::V2_0::WakeLockQueueFlagBits;
+using ::android::hardware::sensors::V2_0::implementation::getTimeNow;
+using ::android::hardware::sensors::V2_0::implementation::kWakelockTimeoutNs;
+
+typedef V2_0::implementation::ISensorsSubHal*(SensorsHalGetSubHalFunc)(uint32_t*);
+typedef V2_1::implementation::ISensorsSubHal*(SensorsHalGetSubHalV2_1Func)(uint32_t*);
+
+static constexpr int32_t kBitsAfterSubHalIndex = 24;
+
+/**
+ * Set the subhal index as first byte of sensor handle and return this modified version.
+ *
+ * @param sensorHandle The sensor handle to modify.
+ * @param subHalIndex The index in the hal proxy of the sub hal this sensor belongs to.
+ *
+ * @return The modified sensor handle.
+ */
+int32_t setSubHalIndex(int32_t sensorHandle, size_t subHalIndex) {
+    return sensorHandle | (static_cast<int32_t>(subHalIndex) << kBitsAfterSubHalIndex);
+}
+
+/**
+ * Extract the subHalIndex from sensorHandle.
+ *
+ * @param sensorHandle The sensorHandle to extract from.
+ *
+ * @return The subhal index.
+ */
+size_t extractSubHalIndex(int32_t sensorHandle) {
+    return static_cast<size_t>(sensorHandle >> kBitsAfterSubHalIndex);
+}
+
+/**
+ * Convert nanoseconds to milliseconds.
+ *
+ * @param nanos The nanoseconds input.
+ *
+ * @return The milliseconds count.
+ */
+int64_t msFromNs(int64_t nanos) {
+    constexpr int64_t nanosecondsInAMillsecond = 1000000;
+    return nanos / nanosecondsInAMillsecond;
+}
+
+bool patchOplusGlanceSensor(V2_1::SensorInfo& sensor) {
+    if (sensor.typeAsString != "qti.sensor.amd") {
+        return true;
+    }
+    /*
+     * Implement only the wake-up version of this sensor.
+     */
+    if (!(sensor.flags & V1_0::SensorFlagBits::WAKE_UP)) {
+        return false;
+    }
+    sensor.type = V2_1::SensorType::GLANCE_GESTURE;
+    sensor.typeAsString = SENSOR_STRING_TYPE_GLANCE_GESTURE;
+    sensor.maxRange = 2;
+    return true;
+}
+
+bool patchOplusPickupSensor(V2_1::SensorInfo& sensor) {
+    if (sensor.typeAsString != "android.sensor.tilt_detector") {
+        return true;
+    }
+
+    /*
+     * Implement only the wake-up version of this sensor.
+     */
+    if (!(sensor.flags & V1_0::SensorFlagBits::WAKE_UP)) {
+        return false;
+    }
+
+    sensor.type = V2_1::SensorType::PICK_UP_GESTURE;
+    sensor.typeAsString = SENSOR_STRING_TYPE_PICK_UP_GESTURE;
+    sensor.maxRange = 1;
+
+    return true;
+}
+
+HalProxy::HalProxy() {
+    static const std::string kMultiHalConfigFiles[] = {"/vendor/etc/sensors/hals.conf",
+                                                       "/odm/etc/sensors/hals.conf"};
+    for (const std::string& configFile : kMultiHalConfigFiles) {
+        initializeSubHalListFromConfigFile(configFile.c_str());
+    }
+    init();
+}
+
+HalProxy::HalProxy(std::vector<ISensorsSubHalV2_0*>& subHalList) {
+    for (ISensorsSubHalV2_0* subHal : subHalList) {
+        mSubHalList.push_back(std::make_unique<SubHalWrapperV2_0>(subHal));
+    }
+
+    init();
+}
+
+HalProxy::HalProxy(std::vector<ISensorsSubHalV2_0*>& subHalList,
+                   std::vector<ISensorsSubHalV2_1*>& subHalListV2_1) {
+    for (ISensorsSubHalV2_0* subHal : subHalList) {
+        mSubHalList.push_back(std::make_unique<SubHalWrapperV2_0>(subHal));
+    }
+
+    for (ISensorsSubHalV2_1* subHal : subHalListV2_1) {
+        mSubHalList.push_back(std::make_unique<SubHalWrapperV2_1>(subHal));
+    }
+
+    init();
+}
+
+HalProxy::~HalProxy() {
+    stopThreads();
+}
+
+Return<void> HalProxy::getSensorsList_2_1(ISensorsV2_1::getSensorsList_2_1_cb _hidl_cb) {
+    std::vector<V2_1::SensorInfo> sensors;
+    for (const auto& iter : mSensors) {
+        sensors.push_back(iter.second);
+    }
+    _hidl_cb(sensors);
+    return Void();
+}
+
+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));
+      }
+    }
+    _hidl_cb(sensors);
+    return Void();
+}
+
+Return<Result> HalProxy::setOperationMode(OperationMode mode) {
+    Result result = Result::OK;
+    size_t subHalIndex;
+    for (subHalIndex = 0; subHalIndex < mSubHalList.size(); subHalIndex++) {
+        result = mSubHalList[subHalIndex]->setOperationMode(mode);
+        if (result != Result::OK) {
+            ALOGE("setOperationMode failed for SubHal: %s",
+                  mSubHalList[subHalIndex]->getName().c_str());
+            break;
+        }
+    }
+
+    if (result != Result::OK) {
+        // Reset the subhal operation modes that have been flipped
+        for (size_t i = 0; i < subHalIndex; i++) {
+            mSubHalList[i]->setOperationMode(mCurrentOperationMode);
+        }
+    } else {
+        mCurrentOperationMode = mode;
+    }
+    return result;
+}
+
+Return<Result> HalProxy::activate(int32_t sensorHandle, bool enabled) {
+    if (!isSubHalIndexValid(sensorHandle)) {
+        return Result::BAD_VALUE;
+    }
+    return getSubHalForSensorHandle(sensorHandle)
+            ->activate(clearSubHalIndex(sensorHandle), enabled);
+}
+
+Return<Result> HalProxy::initialize_2_1(
+        const ::android::hardware::MQDescriptorSync<V2_1::Event>& eventQueueDescriptor,
+        const ::android::hardware::MQDescriptorSync<uint32_t>& wakeLockDescriptor,
+        const sp<V2_1::ISensorsCallback>& sensorsCallback) {
+    sp<ISensorsCallbackWrapperBase> dynamicCallback =
+            new ISensorsCallbackWrapperV2_1(sensorsCallback);
+
+    // Create the Event FMQ from the eventQueueDescriptor. Reset the read/write positions.
+    auto eventQueue =
+            std::make_unique<EventMessageQueueV2_1>(eventQueueDescriptor, true /* resetPointers */);
+    std::unique_ptr<EventMessageQueueWrapperBase> queue =
+            std::make_unique<EventMessageQueueWrapperV2_1>(eventQueue);
+
+    // Create the Wake Lock FMQ from the wakeLockDescriptor. Reset the read/write positions.
+    auto hidlWakeLockQueue =
+            std::make_unique<WakeLockMessageQueue>(wakeLockDescriptor, true /* resetPointers */);
+    std::unique_ptr<WakeLockMessageQueueWrapperBase> wakeLockQueue =
+            std::make_unique<WakeLockMessageQueueWrapperHidl>(hidlWakeLockQueue);
+
+    return initializeCommon(queue, wakeLockQueue, dynamicCallback);
+}
+
+Return<Result> HalProxy::initialize(
+        const ::android::hardware::MQDescriptorSync<V1_0::Event>& eventQueueDescriptor,
+        const ::android::hardware::MQDescriptorSync<uint32_t>& wakeLockDescriptor,
+        const sp<V2_0::ISensorsCallback>& sensorsCallback) {
+    sp<ISensorsCallbackWrapperBase> dynamicCallback =
+            new ISensorsCallbackWrapperV2_0(sensorsCallback);
+
+    // Create the Event FMQ from the eventQueueDescriptor. Reset the read/write positions.
+    auto eventQueue =
+            std::make_unique<EventMessageQueueV2_0>(eventQueueDescriptor, true /* resetPointers */);
+    std::unique_ptr<EventMessageQueueWrapperBase> queue =
+            std::make_unique<EventMessageQueueWrapperV1_0>(eventQueue);
+
+    // Create the Wake Lock FMQ from the wakeLockDescriptor. Reset the read/write positions.
+    auto hidlWakeLockQueue =
+            std::make_unique<WakeLockMessageQueue>(wakeLockDescriptor, true /* resetPointers */);
+    std::unique_ptr<WakeLockMessageQueueWrapperBase> wakeLockQueue =
+            std::make_unique<WakeLockMessageQueueWrapperHidl>(hidlWakeLockQueue);
+
+    return initializeCommon(queue, wakeLockQueue, dynamicCallback);
+}
+
+Return<Result> HalProxy::initializeCommon(
+        std::unique_ptr<EventMessageQueueWrapperBase>& eventQueue,
+        std::unique_ptr<WakeLockMessageQueueWrapperBase>& wakeLockQueue,
+        const sp<ISensorsCallbackWrapperBase>& sensorsCallback) {
+    Result result = Result::OK;
+
+    stopThreads();
+    resetSharedWakelock();
+
+    // So that the pending write events queue can be cleared safely and when we start threads
+    // again we do not get new events until after initialize resets the subhals.
+    disableAllSensors();
+
+    // Clears the queue if any events were pending write before.
+    mPendingWriteEventsQueue = std::queue<std::pair<std::vector<V2_1::Event>, size_t>>();
+    mSizePendingWriteEventsQueue = 0;
+
+    // Clears previously connected dynamic sensors
+    mDynamicSensors.clear();
+
+    mDynamicSensorsCallback = sensorsCallback;
+
+    // Create the Event FMQ from the eventQueueDescriptor. Reset the read/write positions.
+    mEventQueue = std::move(eventQueue);
+
+    // Create the Wake Lock FMQ that is used by the framework to communicate whenever WAKE_UP
+    // events have been successfully read and handled by the framework.
+    mWakeLockQueue = std::move(wakeLockQueue);
+
+    if (mEventQueueFlag != nullptr) {
+        EventFlag::deleteEventFlag(&mEventQueueFlag);
+    }
+    if (mWakelockQueueFlag != nullptr) {
+        EventFlag::deleteEventFlag(&mWakelockQueueFlag);
+    }
+    if (EventFlag::createEventFlag(mEventQueue->getEventFlagWord(), &mEventQueueFlag) != OK) {
+        result = Result::BAD_VALUE;
+    }
+    if (EventFlag::createEventFlag(mWakeLockQueue->getEventFlagWord(), &mWakelockQueueFlag) != OK) {
+        result = Result::BAD_VALUE;
+    }
+    if (!mDynamicSensorsCallback || !mEventQueue || !mWakeLockQueue || mEventQueueFlag == nullptr) {
+        result = Result::BAD_VALUE;
+    }
+
+    mThreadsRun.store(true);
+
+    mPendingWritesThread = std::thread(startPendingWritesThread, this);
+    mWakelockThread = std::thread(startWakelockThread, this);
+
+    for (size_t i = 0; i < mSubHalList.size(); i++) {
+        Result currRes = mSubHalList[i]->initialize(this, this, i);
+        if (currRes != Result::OK) {
+            result = currRes;
+            ALOGE("Subhal '%s' failed to initialize with reason %" PRId32 ".",
+                  mSubHalList[i]->getName().c_str(), static_cast<int32_t>(currRes));
+        }
+    }
+
+    mCurrentOperationMode = OperationMode::NORMAL;
+
+    return result;
+}
+
+Return<Result> HalProxy::batch(int32_t sensorHandle, int64_t samplingPeriodNs,
+                               int64_t maxReportLatencyNs) {
+    if (!isSubHalIndexValid(sensorHandle)) {
+        return Result::BAD_VALUE;
+    }
+    return getSubHalForSensorHandle(sensorHandle)
+            ->batch(clearSubHalIndex(sensorHandle), samplingPeriodNs, maxReportLatencyNs);
+}
+
+Return<Result> HalProxy::flush(int32_t sensorHandle) {
+    if (!isSubHalIndexValid(sensorHandle)) {
+        return Result::BAD_VALUE;
+    }
+    return getSubHalForSensorHandle(sensorHandle)->flush(clearSubHalIndex(sensorHandle));
+}
+
+Return<Result> HalProxy::injectSensorData_2_1(const V2_1::Event& event) {
+    return injectSensorData(convertToOldEvent(event));
+}
+
+Return<Result> HalProxy::injectSensorData(const V1_0::Event& event) {
+    Result result = Result::OK;
+    if (mCurrentOperationMode == OperationMode::NORMAL &&
+        event.sensorType != V1_0::SensorType::ADDITIONAL_INFO) {
+        ALOGE("An event with type != ADDITIONAL_INFO passed to injectSensorData while operation"
+              " mode was NORMAL.");
+        result = Result::BAD_VALUE;
+    }
+    if (result == Result::OK) {
+        V1_0::Event subHalEvent = event;
+        if (!isSubHalIndexValid(event.sensorHandle)) {
+            return Result::BAD_VALUE;
+        }
+        subHalEvent.sensorHandle = clearSubHalIndex(event.sensorHandle);
+        result = getSubHalForSensorHandle(event.sensorHandle)
+                         ->injectSensorData(convertToNewEvent(subHalEvent));
+    }
+    return result;
+}
+
+Return<void> HalProxy::registerDirectChannel(const SharedMemInfo& mem,
+                                             ISensorsV2_0::registerDirectChannel_cb _hidl_cb) {
+    if (mDirectChannelSubHal == nullptr) {
+        _hidl_cb(Result::INVALID_OPERATION, -1 /* channelHandle */);
+    } else {
+        mDirectChannelSubHal->registerDirectChannel(mem, _hidl_cb);
+    }
+    return Return<void>();
+}
+
+Return<Result> HalProxy::unregisterDirectChannel(int32_t channelHandle) {
+    Result result;
+    if (mDirectChannelSubHal == nullptr) {
+        result = Result::INVALID_OPERATION;
+    } else {
+        result = mDirectChannelSubHal->unregisterDirectChannel(channelHandle);
+    }
+    return result;
+}
+
+Return<void> HalProxy::configDirectReport(int32_t sensorHandle, int32_t channelHandle,
+                                          RateLevel rate,
+                                          ISensorsV2_0::configDirectReport_cb _hidl_cb) {
+    if (mDirectChannelSubHal == nullptr) {
+        _hidl_cb(Result::INVALID_OPERATION, -1 /* reportToken */);
+    } else if (sensorHandle == -1 && rate != RateLevel::STOP) {
+        _hidl_cb(Result::BAD_VALUE, -1 /* reportToken */);
+    } else {
+        // -1 denotes all sensors should be disabled
+        if (sensorHandle != -1) {
+            sensorHandle = clearSubHalIndex(sensorHandle);
+        }
+        mDirectChannelSubHal->configDirectReport(sensorHandle, channelHandle, rate, _hidl_cb);
+    }
+    return Return<void>();
+}
+
+Return<void> HalProxy::debug(const hidl_handle& fd, const hidl_vec<hidl_string>& args) {
+    if (fd.getNativeHandle() == nullptr || fd->numFds < 1) {
+        ALOGE("%s: missing fd for writing", __FUNCTION__);
+        return Void();
+    }
+
+    int writeFd = fd->data[0];
+
+    std::ostringstream stream;
+    stream << "===HalProxy===" << std::endl;
+    stream << "Internal values:" << std::endl;
+    stream << "  Threads are running: " << (mThreadsRun.load() ? "true" : "false") << std::endl;
+    int64_t now = getTimeNow();
+    stream << "  Wakelock timeout start time: " << msFromNs(now - mWakelockTimeoutStartTime)
+           << " ms ago" << std::endl;
+    stream << "  Wakelock timeout reset time: " << msFromNs(now - mWakelockTimeoutResetTime)
+           << " ms ago" << std::endl;
+    // TODO(b/142969448): Add logging for history of wakelock acquisition per subhal.
+    stream << "  Wakelock ref count: " << mWakelockRefCount << std::endl;
+    stream << "  # of events on pending write writes queue: " << mSizePendingWriteEventsQueue
+           << std::endl;
+    stream << " Most events seen on pending write events queue: "
+           << mMostEventsObservedPendingWriteEventsQueue << std::endl;
+    if (!mPendingWriteEventsQueue.empty()) {
+        stream << "  Size of events list on front of pending writes queue: "
+               << mPendingWriteEventsQueue.front().first.size() << std::endl;
+    }
+    stream << "  # of non-dynamic sensors across all subhals: " << mSensors.size() << std::endl;
+    stream << "  # of dynamic sensors across all subhals: " << mDynamicSensors.size() << std::endl;
+    stream << "SubHals (" << mSubHalList.size() << "):" << std::endl;
+    for (auto& subHal : mSubHalList) {
+        stream << "  Name: " << subHal->getName() << std::endl;
+        stream << "  Debug dump: " << std::endl;
+        android::base::WriteStringToFd(stream.str(), writeFd);
+        subHal->debug(fd, args);
+        stream.str("");
+        stream << std::endl;
+    }
+    android::base::WriteStringToFd(stream.str(), writeFd);
+    return Return<void>();
+}
+
+Return<void> HalProxy::onDynamicSensorsConnected(const hidl_vec<SensorInfo>& dynamicSensorsAdded,
+                                                 int32_t subHalIndex) {
+    std::vector<SensorInfo> sensors;
+    {
+        std::lock_guard<std::mutex> lock(mDynamicSensorsMutex);
+        for (SensorInfo sensor : dynamicSensorsAdded) {
+            if (!subHalIndexIsClear(sensor.sensorHandle)) {
+                ALOGE("Dynamic sensor added %s had sensorHandle with first byte not 0.",
+                      sensor.name.c_str());
+            } else {
+                sensor.sensorHandle = setSubHalIndex(sensor.sensorHandle, subHalIndex);
+                mDynamicSensors[sensor.sensorHandle] = sensor;
+                sensors.push_back(sensor);
+            }
+        }
+    }
+    mDynamicSensorsCallback->onDynamicSensorsConnected(sensors);
+    return Return<void>();
+}
+
+Return<void> HalProxy::onDynamicSensorsDisconnected(
+        const hidl_vec<int32_t>& dynamicSensorHandlesRemoved, int32_t subHalIndex) {
+    // TODO(b/143302327): Block this call until all pending events are flushed from queue
+    std::vector<int32_t> sensorHandles;
+    {
+        std::lock_guard<std::mutex> lock(mDynamicSensorsMutex);
+        for (int32_t sensorHandle : dynamicSensorHandlesRemoved) {
+            if (!subHalIndexIsClear(sensorHandle)) {
+                ALOGE("Dynamic sensorHandle removed had first byte not 0.");
+            } else {
+                sensorHandle = setSubHalIndex(sensorHandle, subHalIndex);
+                if (mDynamicSensors.find(sensorHandle) != mDynamicSensors.end()) {
+                    mDynamicSensors.erase(sensorHandle);
+                    sensorHandles.push_back(sensorHandle);
+                }
+            }
+        }
+    }
+    mDynamicSensorsCallback->onDynamicSensorsDisconnected(sensorHandles);
+    return Return<void>();
+}
+
+void HalProxy::initializeSubHalListFromConfigFile(const char* configFileName) {
+    std::ifstream subHalConfigStream(configFileName);
+    if (!subHalConfigStream) {
+        ALOGE("Failed to load subHal config file: %s", configFileName);
+    } else {
+        std::string subHalLibraryFile;
+        while (subHalConfigStream >> subHalLibraryFile) {
+            void* handle = getHandleForSubHalSharedObject(subHalLibraryFile);
+            if (handle == nullptr) {
+                ALOGE("dlopen failed for library: %s", subHalLibraryFile.c_str());
+            } else {
+                SensorsHalGetSubHalFunc* sensorsHalGetSubHalPtr =
+                        (SensorsHalGetSubHalFunc*)dlsym(handle, "sensorsHalGetSubHal");
+                if (sensorsHalGetSubHalPtr != nullptr) {
+                    std::function<SensorsHalGetSubHalFunc> sensorsHalGetSubHal =
+                            *sensorsHalGetSubHalPtr;
+                    uint32_t version;
+                    ISensorsSubHalV2_0* subHal = sensorsHalGetSubHal(&version);
+                    if (version != SUB_HAL_2_0_VERSION) {
+                        ALOGE("SubHal version was not 2.0 for library: %s",
+                              subHalLibraryFile.c_str());
+                    } else {
+                        ALOGV("Loaded SubHal from library: %s", subHalLibraryFile.c_str());
+                        mSubHalList.push_back(std::make_unique<SubHalWrapperV2_0>(subHal));
+                    }
+                } else {
+                    SensorsHalGetSubHalV2_1Func* getSubHalV2_1Ptr =
+                            (SensorsHalGetSubHalV2_1Func*)dlsym(handle, "sensorsHalGetSubHal_2_1");
+
+                    if (getSubHalV2_1Ptr == nullptr) {
+                        ALOGE("Failed to locate sensorsHalGetSubHal function for library: %s",
+                              subHalLibraryFile.c_str());
+                    } else {
+                        std::function<SensorsHalGetSubHalV2_1Func> sensorsHalGetSubHal_2_1 =
+                                *getSubHalV2_1Ptr;
+                        uint32_t version;
+                        ISensorsSubHalV2_1* subHal = sensorsHalGetSubHal_2_1(&version);
+                        if (version != SUB_HAL_2_1_VERSION) {
+                            ALOGE("SubHal version was not 2.1 for library: %s",
+                                  subHalLibraryFile.c_str());
+                        } else {
+                            ALOGV("Loaded SubHal from library: %s", subHalLibraryFile.c_str());
+                            mSubHalList.push_back(std::make_unique<SubHalWrapperV2_1>(subHal));
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+void HalProxy::initializeSensorList() {
+    for (size_t subHalIndex = 0; subHalIndex < mSubHalList.size(); subHalIndex++) {
+        auto result = mSubHalList[subHalIndex]->getSensorsList([&](const auto& list) {
+            for (SensorInfo sensor : list) {
+                if (!subHalIndexIsClear(sensor.sensorHandle)) {
+                    ALOGE("SubHal sensorHandle's first byte was not 0");
+                } else {
+                    ALOGV("Loaded sensor: %s", sensor.name.c_str());
+                    sensor.sensorHandle = setSubHalIndex(sensor.sensorHandle, subHalIndex);
+                    setDirectChannelFlags(&sensor, mSubHalList[subHalIndex]);
+                    bool keep = patchOplusPickupSensor(sensor) && patchOplusGlanceSensor(sensor);
+                    if (!keep) {
+                        continue;
+                    }
+
+                    mSensors[sensor.sensorHandle] = sensor;
+                }
+            }
+        });
+        if (!result.isOk()) {
+            ALOGE("getSensorsList call failed for SubHal: %s",
+                  mSubHalList[subHalIndex]->getName().c_str());
+        }
+    }
+}
+
+void* HalProxy::getHandleForSubHalSharedObject(const std::string& filename) {
+    static const std::string kSubHalShareObjectLocations[] = {
+            "",  // Default locations will be searched
+#ifdef __LP64__
+            "/vendor/lib64/hw/", "/odm/lib64/hw/"
+#else
+            "/vendor/lib/hw/", "/odm/lib/hw/"
+#endif
+    };
+
+    for (const std::string& dir : kSubHalShareObjectLocations) {
+        void* handle = dlopen((dir + filename).c_str(), RTLD_NOW);
+        if (handle != nullptr) {
+            return handle;
+        }
+    }
+    return nullptr;
+}
+
+void HalProxy::init() {
+    initializeSensorList();
+}
+
+void HalProxy::stopThreads() {
+    mThreadsRun.store(false);
+    if (mEventQueueFlag != nullptr && mEventQueue != nullptr) {
+        size_t numToRead = mEventQueue->availableToRead();
+        std::vector<Event> events(numToRead);
+        mEventQueue->read(events.data(), numToRead);
+        mEventQueueFlag->wake(static_cast<uint32_t>(EventQueueFlagBits::EVENTS_READ));
+    }
+    if (mWakelockQueueFlag != nullptr && mWakeLockQueue != nullptr) {
+        uint32_t kZero = 0;
+        mWakeLockQueue->write(&kZero);
+        mWakelockQueueFlag->wake(static_cast<uint32_t>(WakeLockQueueFlagBits::DATA_WRITTEN));
+    }
+    mWakelockCV.notify_one();
+    mEventQueueWriteCV.notify_one();
+    if (mPendingWritesThread.joinable()) {
+        mPendingWritesThread.join();
+    }
+    if (mWakelockThread.joinable()) {
+        mWakelockThread.join();
+    }
+}
+
+void HalProxy::disableAllSensors() {
+    for (const auto& sensorEntry : mSensors) {
+        int32_t sensorHandle = sensorEntry.first;
+        activate(sensorHandle, false /* enabled */);
+    }
+    std::lock_guard<std::mutex> dynamicSensorsLock(mDynamicSensorsMutex);
+    for (const auto& sensorEntry : mDynamicSensors) {
+        int32_t sensorHandle = sensorEntry.first;
+        activate(sensorHandle, false /* enabled */);
+    }
+}
+
+void HalProxy::startPendingWritesThread(HalProxy* halProxy) {
+    halProxy->handlePendingWrites();
+}
+
+void HalProxy::handlePendingWrites() {
+    // TODO(b/143302327): Find a way to optimize locking strategy maybe using two mutexes instead of
+    // one.
+    std::unique_lock<std::mutex> lock(mEventQueueWriteMutex);
+    while (mThreadsRun.load()) {
+        mEventQueueWriteCV.wait(
+                lock, [&] { return !mPendingWriteEventsQueue.empty() || !mThreadsRun.load(); });
+        if (mThreadsRun.load()) {
+            std::vector<Event>& pendingWriteEvents = mPendingWriteEventsQueue.front().first;
+            size_t numWakeupEvents = mPendingWriteEventsQueue.front().second;
+            size_t eventQueueSize = mEventQueue->getQuantumCount();
+            size_t numToWrite = std::min(pendingWriteEvents.size(), eventQueueSize);
+            lock.unlock();
+            if (!mEventQueue->writeBlocking(
+                        pendingWriteEvents.data(), numToWrite,
+                        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);
+                if (numWakeupEvents > 0) {
+                    if (pendingWriteEvents.size() > eventQueueSize) {
+                        decrementRefCountAndMaybeReleaseWakelock(
+                                countNumWakeupEvents(pendingWriteEvents, eventQueueSize));
+                    } else {
+                        decrementRefCountAndMaybeReleaseWakelock(numWakeupEvents);
+                    }
+                }
+            }
+            lock.lock();
+            mSizePendingWriteEventsQueue -= numToWrite;
+            if (pendingWriteEvents.size() > eventQueueSize) {
+                // TODO(b/143302327): Check if this erase operation is too inefficient. It will copy
+                // all the events ahead of it down to fill gap off array at front after the erase.
+                pendingWriteEvents.erase(pendingWriteEvents.begin(),
+                                         pendingWriteEvents.begin() + eventQueueSize);
+            } else {
+                mPendingWriteEventsQueue.pop();
+            }
+        }
+    }
+}
+
+void HalProxy::startWakelockThread(HalProxy* halProxy) {
+    halProxy->handleWakelocks();
+}
+
+void HalProxy::handleWakelocks() {
+    std::unique_lock<std::recursive_mutex> lock(mWakelockMutex);
+    while (mThreadsRun.load()) {
+        mWakelockCV.wait(lock, [&] { return mWakelockRefCount > 0 || !mThreadsRun.load(); });
+        if (mThreadsRun.load()) {
+            int64_t timeLeft;
+            if (sharedWakelockDidTimeout(&timeLeft)) {
+                resetSharedWakelock();
+            } else {
+                uint32_t numWakeLocksProcessed;
+                lock.unlock();
+                bool success = mWakeLockQueue->readBlocking(
+                        &numWakeLocksProcessed, 1, 0,
+                        static_cast<uint32_t>(WakeLockQueueFlagBits::DATA_WRITTEN), timeLeft);
+                lock.lock();
+                if (success) {
+                    decrementRefCountAndMaybeReleaseWakelock(
+                            static_cast<size_t>(numWakeLocksProcessed));
+                }
+            }
+        }
+    }
+    resetSharedWakelock();
+}
+
+bool HalProxy::sharedWakelockDidTimeout(int64_t* timeLeft) {
+    bool didTimeout;
+    int64_t duration = getTimeNow() - mWakelockTimeoutStartTime;
+    if (duration > kWakelockTimeoutNs) {
+        didTimeout = true;
+    } else {
+        didTimeout = false;
+        *timeLeft = kWakelockTimeoutNs - duration;
+    }
+    return didTimeout;
+}
+
+void HalProxy::resetSharedWakelock() {
+    std::lock_guard<std::recursive_mutex> lockGuard(mWakelockMutex);
+    decrementRefCountAndMaybeReleaseWakelock(mWakelockRefCount);
+    mWakelockTimeoutResetTime = getTimeNow();
+}
+
+void HalProxy::postEventsToMessageQueue(const std::vector<Event>& events, size_t numWakeupEvents,
+                                        V2_0::implementation::ScopedWakelock wakelock) {
+    size_t numToWrite = 0;
+    std::lock_guard<std::mutex> lock(mEventQueueWriteMutex);
+    if (wakelock.isLocked()) {
+        incrementRefCountAndMaybeAcquireWakelock(numWakeupEvents);
+    }
+    if (mPendingWriteEventsQueue.empty()) {
+        numToWrite = std::min(events.size(), mEventQueue->availableToWrite());
+        if (numToWrite > 0) {
+            if (mEventQueue->write(events.data(), numToWrite)) {
+                // TODO(b/143302327): While loop if mEventQueue->avaiableToWrite > 0 to possibly fit
+                // in more writes immediately
+                mEventQueueFlag->wake(static_cast<uint32_t>(EventQueueFlagBits::READ_AND_PROCESS));
+            } else {
+                numToWrite = 0;
+            }
+        }
+    }
+    size_t numLeft = events.size() - numToWrite;
+    if (numToWrite < events.size() &&
+        mSizePendingWriteEventsQueue + numLeft <= kMaxSizePendingWriteEventsQueue) {
+        std::vector<Event> eventsLeft(events.begin() + numToWrite, events.end());
+        mPendingWriteEventsQueue.push({eventsLeft, numWakeupEvents});
+        mSizePendingWriteEventsQueue += numLeft;
+        mMostEventsObservedPendingWriteEventsQueue =
+                std::max(mMostEventsObservedPendingWriteEventsQueue, mSizePendingWriteEventsQueue);
+        mEventQueueWriteCV.notify_one();
+    }
+}
+
+bool HalProxy::incrementRefCountAndMaybeAcquireWakelock(size_t delta,
+                                                        int64_t* timeoutStart /* = nullptr */) {
+    if (!mThreadsRun.load()) return false;
+    std::lock_guard<std::recursive_mutex> lockGuard(mWakelockMutex);
+    if (mWakelockRefCount == 0) {
+        acquire_wake_lock(PARTIAL_WAKE_LOCK, kWakelockName);
+        mWakelockCV.notify_one();
+    }
+    mWakelockTimeoutStartTime = getTimeNow();
+    mWakelockRefCount += delta;
+    if (timeoutStart != nullptr) {
+        *timeoutStart = mWakelockTimeoutStartTime;
+    }
+    return true;
+}
+
+void HalProxy::decrementRefCountAndMaybeReleaseWakelock(size_t delta,
+                                                        int64_t timeoutStart /* = -1 */) {
+    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);
+    }
+    if (timeoutStart == -1) timeoutStart = mWakelockTimeoutResetTime;
+    if (mWakelockRefCount == 0 || timeoutStart < mWakelockTimeoutResetTime) return;
+    mWakelockRefCount -= std::min(mWakelockRefCount, delta);
+    if (mWakelockRefCount == 0) {
+        release_wake_lock(kWakelockName);
+    }
+}
+
+void HalProxy::setDirectChannelFlags(SensorInfo* sensorInfo,
+                                     std::shared_ptr<ISubHalWrapperBase> subHal) {
+    bool sensorSupportsDirectChannel =
+            (sensorInfo->flags & (V1_0::SensorFlagBits::MASK_DIRECT_REPORT |
+                                  V1_0::SensorFlagBits::MASK_DIRECT_CHANNEL)) != 0;
+    if (mDirectChannelSubHal == nullptr && sensorSupportsDirectChannel) {
+        mDirectChannelSubHal = subHal;
+    } else if (mDirectChannelSubHal != nullptr && subHal != mDirectChannelSubHal) {
+        // disable direct channel capability for sensors in subHals that are not
+        // the only one we will enable
+        sensorInfo->flags &= ~(V1_0::SensorFlagBits::MASK_DIRECT_REPORT |
+                               V1_0::SensorFlagBits::MASK_DIRECT_CHANNEL);
+    }
+}
+
+std::shared_ptr<ISubHalWrapperBase> HalProxy::getSubHalForSensorHandle(int32_t sensorHandle) {
+    return mSubHalList[extractSubHalIndex(sensorHandle)];
+}
+
+bool HalProxy::isSubHalIndexValid(int32_t sensorHandle) {
+    return extractSubHalIndex(sensorHandle) < mSubHalList.size();
+}
+
+size_t HalProxy::countNumWakeupEvents(const std::vector<Event>& events, size_t n) {
+    size_t numWakeupEvents = 0;
+    for (size_t i = 0; i < n; i++) {
+        int32_t sensorHandle = events[i].sensorHandle;
+        if (mSensors[sensorHandle].flags & static_cast<uint32_t>(V1_0::SensorFlagBits::WAKE_UP)) {
+            numWakeupEvents++;
+        }
+    }
+    return numWakeupEvents;
+}
+
+int32_t HalProxy::clearSubHalIndex(int32_t sensorHandle) {
+    return sensorHandle & (~kSensorHandleSubHalIndexMask);
+}
+
+bool HalProxy::subHalIndexIsClear(int32_t sensorHandle) {
+    return (sensorHandle & kSensorHandleSubHalIndexMask) == 0;
+}
+
+}  // namespace implementation
+}  // namespace V2_1
+}  // namespace sensors
+}  // namespace hardware
+}  // namespace android

aidl/sensors/HalProxyCallback.cpp

@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "HalProxyCallback.h"
+
+#include <cinttypes>
+#include <fstream>
+
+namespace android {
+namespace hardware {
+namespace sensors {
+namespace V2_0 {
+namespace implementation {
+
+static constexpr int32_t kBitsAfterSubHalIndex = 24;
+
+/**
+ * Set the subhal index as first byte of sensor handle and return this modified version.
+ *
+ * @param sensorHandle The sensor handle to modify.
+ * @param subHalIndex The index in the hal proxy of the sub hal this sensor belongs to.
+ *
+ * @return The modified sensor handle.
+ */
+int32_t setSubHalIndex(int32_t sensorHandle, size_t subHalIndex) {
+    return sensorHandle | (static_cast<int32_t>(subHalIndex) << kBitsAfterSubHalIndex);
+}
+
+void HalProxyCallbackBase::postEvents(const std::vector<V2_1::Event>& events,
+                                      ScopedWakelock wakelock) {
+    if (events.empty() || !mCallback->areThreadsRunning()) return;
+    size_t numWakeupEvents;
+    std::vector<V2_1::Event> processedEvents = processEvents(events, &numWakeupEvents);
+    if (numWakeupEvents > 0) {
+        ALOG_ASSERT(wakelock.isLocked(),
+                    "Wakeup events posted while wakelock unlocked for subhal"
+                    " w/ index %" PRId32 ".",
+                    mSubHalIndex);
+    } else {
+        ALOG_ASSERT(!wakelock.isLocked(),
+                    "No Wakeup events posted but wakelock locked for subhal"
+                    " w/ index %" PRId32 ".",
+                    mSubHalIndex);
+    }
+    mCallback->postEventsToMessageQueue(processedEvents, numWakeupEvents, std::move(wakelock));
+}
+
+ScopedWakelock HalProxyCallbackBase::createScopedWakelock(bool lock) {
+    ScopedWakelock wakelock(mRefCounter, lock);
+    return wakelock;
+}
+
+std::vector<V2_1::Event> HalProxyCallbackBase::processEvents(const std::vector<V2_1::Event>& events,
+                                                             size_t* numWakeupEvents) const {
+    *numWakeupEvents = 0;
+    std::vector<V2_1::Event> eventsOut;
+    const char* aodLightModeNode = "/sys/kernel/oplus_display/aod_light_mode_set";
+    for (V2_1::Event event : events) {
+        event.sensorHandle = setSubHalIndex(event.sensorHandle, mSubHalIndex);
+        if (event.sensorType == V2_1::SensorType::DYNAMIC_SENSOR_META) {
+            event.u.dynamic.sensorHandle =
+                    setSubHalIndex(event.u.dynamic.sensorHandle, mSubHalIndex);
+        }
+        const V2_1::SensorInfo& sensor = mCallback->getSensorInfo(event.sensorHandle);
+
+        if (sensor.type == V2_1::SensorType::GLANCE_GESTURE
+            && event.u.scalar != 2) {
+            continue;
+        }
+
+        if (sensor.type == V2_1::SensorType::PICK_UP_GESTURE
+            && event.u.scalar != 0) {
+            continue;
+        }
+
+        if (sensor.typeAsString == "qti.sensor.lux_aod") {
+            std::ofstream nodeFile(aodLightModeNode);
+            if (nodeFile.is_open()) {
+                nodeFile << !event.u.scalar;
+                nodeFile.close();
+            }
+        }
+
+        if ((sensor.flags & V1_0::SensorFlagBits::WAKE_UP) != 0) {
+            (*numWakeupEvents)++;
+        }
+        eventsOut.push_back(event);
+    }
+    return eventsOut;
+}
+
+}  // namespace implementation
+}  // namespace V2_0
+}  // namespace sensors
+}  // namespace hardware
+}  // namespace android

aidl/sensors/android.hardware.sensors-service.oplus-multihal.rc

@@ -0,0 +1,10 @@
+on boot
+    chmod 666 /sys/kernel/oplus_display/aod_light_mode_set
+
+service vendor.sensors-hal-multihal /vendor/bin/hw/android.hardware.sensors-service.oplus-multihal
+    class hal
+    user system
+    group system wakelock context_hub input uhid
+    task_profiles ServiceCapacityLow
+    capabilities BLOCK_SUSPEND
+    rlimit rtprio 10 10

aidl/sensors/android.hardware.sensors.oplus-multihal.xml

@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest version="1.0" type="device">
+    <hal format="aidl">
+        <name>android.hardware.sensors</name>
+        <version>2</version>
+        <fqname>ISensors/default</fqname>
+    </hal>
+</manifest>

aidl/sensors/service.cpp

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <android-base/logging.h>
+#include <android/binder_manager.h>
+#include <android/binder_process.h>
+#include "HalProxyAidl.h"
+
+using ::aidl::android::hardware::sensors::implementation::HalProxyAidl;
+
+int main() {
+    ABinderProcess_setThreadPoolMaxThreadCount(0);
+
+    // Make a default multihal sensors service
+    auto halProxy = ndk::SharedRefBase::make<HalProxyAidl>();
+    const std::string halProxyName = std::string() + HalProxyAidl::descriptor + "/default";
+    binder_status_t status =
+            AServiceManager_addService(halProxy->asBinder().get(), halProxyName.c_str());
+    CHECK_EQ(status, STATUS_OK);
+
+    ABinderProcess_joinThreadPool();
+    return EXIT_FAILURE;  // should not reach
+}

aidl/vibrator/qti/Vibrator.cpp

@@ -49,39 +49,38 @@ namespace android {
 namespace hardware {
 namespace vibrator {
 
-#define STRONG_MAGNITUDE        0x7fff
-#define MEDIUM_MAGNITUDE        0x5fff
-#define LIGHT_MAGNITUDE         0x3fff
-#define INVALID_VALUE           -1
-#define CUSTOM_DATA_LEN         3
-#define NAME_BUF_SIZE           32
+#define STRONG_MAGNITUDE 0x7fff
+#define MEDIUM_MAGNITUDE 0x5fff
+#define LIGHT_MAGNITUDE 0x3fff
+#define INVALID_VALUE -1
+#define CUSTOM_DATA_LEN 3
+#define NAME_BUF_SIZE 32
 
-#define MSM_CPU_LAHAINA         415
-#define APQ_CPU_LAHAINA         439
-#define MSM_CPU_SHIMA           450
-#define MSM_CPU_SM8325          501
-#define APQ_CPU_SM8325P         502
-#define MSM_CPU_TARO            457
-#define MSM_CPU_TARO_LTE        552
-#define MSM_CPU_YUPIK           475
-#define MSM_CPU_CAPE            530
-#define APQ_CPU_CAPE            531
-#define MSM_CPU_KALAMA          519
-#define MSM_CPU_PINEAPPLE       557
-#define MSM_CPU_SUN             618
+#define MSM_CPU_LAHAINA 415
+#define APQ_CPU_LAHAINA 439
+#define MSM_CPU_SHIMA 450
+#define MSM_CPU_SM8325 501
+#define APQ_CPU_SM8325P 502
+#define MSM_CPU_TARO 457
+#define MSM_CPU_TARO_LTE 552
+#define MSM_CPU_YUPIK 475
+#define MSM_CPU_CAPE 530
+#define APQ_CPU_CAPE 531
+#define MSM_CPU_KALAMA 519
+#define MSM_CPU_PINEAPPLE 557
+#define MSM_CPU_SUN 618
 
-#define test_bit(bit, array)    ((array)[(bit)/8] & (1<<((bit)%8)))
+#define test_bit(bit, array) ((array)[(bit) / 8] & (1 << ((bit) % 8)))
 
 #define LED_DEVICE "/sys/class/leds/vibrator"
 
-InputFFDevice::InputFFDevice()
-{
-    DIR *dp;
-    FILE *fp = NULL;
-    struct dirent *dir;
+InputFFDevice::InputFFDevice() {
+    DIR* dp;
+    FILE* fp = NULL;
+    struct dirent* dir;
     uint8_t ffBitmask[FF_CNT / 8];
     char devicename[PATH_MAX];
-    const char *INPUT_DIR = "/dev/input/";
+    const char* INPUT_DIR = "/dev/input/";
     char name[NAME_BUF_SIZE];
     int fd, ret;
     int soc = property_get_int32("ro.vendor.qti.soc_id", -1);
@@ -101,10 +100,9 @@ InputFFDevice::InputFFDevice()
     }
 
     memset(ffBitmask, 0, sizeof(ffBitmask));
-    while ((dir = readdir(dp)) != NULL){
+    while ((dir = readdir(dp)) != NULL) {
         if (dir->d_name[0] == '.' &&
-            (dir->d_name[1] == '\0' ||
-             (dir->d_name[1] == '.' && dir->d_name[2] == '\0')))
+            (dir->d_name[1] == '\0' || (dir->d_name[1] == '.' && dir->d_name[2] == '\0')))
             continue;
 
         snprintf(devicename, PATH_MAX, "%s%s", INPUT_DIR, dir->d_name);
@@ -135,34 +133,31 @@ InputFFDevice::InputFFDevice()
             continue;
         }
 
-        if (test_bit(FF_CONSTANT, ffBitmask) ||
-                test_bit(FF_PERIODIC, ffBitmask)) {
+        if (test_bit(FF_CONSTANT, ffBitmask) || test_bit(FF_PERIODIC, ffBitmask)) {
             mVibraFd = fd;
-            if (test_bit(FF_CUSTOM, ffBitmask))
-                mSupportEffects = true;
-            if (test_bit(FF_GAIN, ffBitmask))
-                mSupportGain = true;
+            if (test_bit(FF_CUSTOM, ffBitmask)) mSupportEffects = true;
+            if (test_bit(FF_GAIN, ffBitmask)) mSupportGain = true;
 
             if (soc <= 0 && (fp = fopen("/sys/devices/soc0/soc_id", "r")) != NULL) {
                 fscanf(fp, "%u", &soc);
                 fclose(fp);
             }
             switch (soc) {
-            case MSM_CPU_LAHAINA:
-            case APQ_CPU_LAHAINA:
-            case MSM_CPU_SHIMA:
-            case MSM_CPU_SM8325:
-            case APQ_CPU_SM8325P:
-            case MSM_CPU_TARO:
-            case MSM_CPU_YUPIK:
-            case MSM_CPU_KALAMA:
-            case MSM_CPU_PINEAPPLE:
-            case MSM_CPU_SUN:
-                mSupportExternalControl = true;
-                break;
-            default:
-                mSupportExternalControl = false;
-                break;
+                case MSM_CPU_LAHAINA:
+                case APQ_CPU_LAHAINA:
+                case MSM_CPU_SHIMA:
+                case MSM_CPU_SM8325:
+                case APQ_CPU_SM8325P:
+                case MSM_CPU_TARO:
+                case MSM_CPU_YUPIK:
+                case MSM_CPU_KALAMA:
+                case MSM_CPU_PINEAPPLE:
+                case MSM_CPU_SUN:
+                    mSupportExternalControl = true;
+                    break;
+                default:
+                    mSupportExternalControl = false;
+                    break;
             }
             break;
         }
@@ -191,20 +186,19 @@ InputFFDevice::InputFFDevice()
  *                    kernel driver, and the rest two parameters are used for returning
  *                    back the real playing length from kernel driver.
  */
-int InputFFDevice::play(int effectId, uint32_t timeoutMs, long *playLengthMs) {
+int InputFFDevice::play(int effectId, uint32_t timeoutMs, long* playLengthMs) {
     struct ff_effect effect;
     struct input_event play;
     int16_t data[CUSTOM_DATA_LEN] = {0, 0, 0};
     int ret;
 #ifdef USE_EFFECT_STREAM
-    const struct effect_stream *stream;
+    const struct effect_stream* stream;
 #endif
 
     /* For QMAA compliance, return OK even if vibrator device doesn't exist */
     if (mVibraFd == INVALID_VALUE) {
-        if (playLengthMs != NULL)
-            *playLengthMs = 0;
-            return 0;
+        if (playLengthMs != NULL) *playLengthMs = 0;
+        return 0;
     }
 
     if (timeoutMs != 0) {
@@ -228,7 +222,7 @@ int InputFFDevice::play(int effectId, uint32_t timeoutMs, long *playLengthMs) {
 #ifdef USE_EFFECT_STREAM
             stream = get_effect_stream(effectId);
             if (stream != NULL) {
-                effect.u.periodic.custom_data = (int16_t *)stream;
+                effect.u.periodic.custom_data = (int16_t*)stream;
                 effect.u.periodic.custom_len = sizeof(*stream);
             }
 #endif
@@ -265,8 +259,7 @@ int InputFFDevice::play(int effectId, uint32_t timeoutMs, long *playLengthMs) {
         if (ret == -1) {
             ALOGE("write failed, errno = %d\n", -errno);
             ret = TEMP_FAILURE_RETRY(ioctl(mVibraFd, EVIOCRMFF, mCurrAppId));
-            if (ret == -1)
-                ALOGE("ioctl EVIOCRMFF failed, errno = %d", -errno);
+            if (ret == -1) ALOGE("ioctl EVIOCRMFF failed, errno = %d", -errno);
             goto errout;
         }
     } else if (mCurrAppId != INVALID_VALUE) {
@@ -297,8 +290,7 @@ int InputFFDevice::setAmplitude(uint8_t amplitude) {
     struct input_event ie;
 
     /* For QMAA compliance, return OK even if vibrator device doesn't exist */
-    if (mVibraFd == INVALID_VALUE)
-        return 0;
+    if (mVibraFd == INVALID_VALUE) return 0;
 
     tmp = amplitude * (STRONG_MAGNITUDE - LIGHT_MAGNITUDE) / 255;
     tmp += LIGHT_MAGNITUDE;
@@ -316,19 +308,19 @@ int InputFFDevice::setAmplitude(uint8_t amplitude) {
     return 0;
 }
 
-int InputFFDevice::playEffect(int effectId, EffectStrength es, long *playLengthMs) {
+int InputFFDevice::playEffect(int effectId, EffectStrength es, long* playLengthMs) {
     switch (es) {
-    case EffectStrength::LIGHT:
-        mCurrMagnitude = LIGHT_MAGNITUDE;
-        break;
-    case EffectStrength::MEDIUM:
-        mCurrMagnitude = MEDIUM_MAGNITUDE;
-        break;
-    case EffectStrength::STRONG:
-        mCurrMagnitude = STRONG_MAGNITUDE;
-        break;
-    default:
-        return -1;
+        case EffectStrength::LIGHT:
+            mCurrMagnitude = LIGHT_MAGNITUDE;
+            break;
+        case EffectStrength::MEDIUM:
+            mCurrMagnitude = MEDIUM_MAGNITUDE;
+            break;
+        case EffectStrength::STRONG:
+            mCurrMagnitude = STRONG_MAGNITUDE;
+            break;
+        default:
+            return -1;
     }
 
     return play(effectId, INVALID_VALUE, playLengthMs);
@@ -350,7 +342,7 @@ LedVibratorDevice::LedVibratorDevice() {
     mDetected = true;
 }
 
-int LedVibratorDevice::write_value(const char *file, const char *value) {
+int LedVibratorDevice::write_value(const char* file, const char* value) {
     int fd;
     int ret;
 
@@ -379,7 +371,7 @@ int LedVibratorDevice::write_value(const char *file, const char *value) {
     return ret;
 }
 
-int LedVibratorDevice::write_value(const char *file, int value) {
+int LedVibratorDevice::write_value(const char* file, int value) {
     return write_value(file, std::to_string(value).c_str());
 }
 
@@ -396,6 +388,7 @@ int LedVibratorDevice::on(int32_t timeoutMs) {
     ret |= write_value(LED_DEVICE "/duration", timeoutMs);
     ret |= write_value(LED_DEVICE "/state", "1");
     ret |= write_value(LED_DEVICE "/activate", "1");
+    usleep(100 * 1000);
     ret |= write_value(LED_DEVICE "/activate", "0");
 
     return ret;
@@ -403,16 +396,13 @@ int LedVibratorDevice::on(int32_t timeoutMs) {
 
 int LedVibratorDevice::onWaveform(int waveformIndex) {
     int ret = 0;
-    ret |= write_value(LED_DEVICE "/rtp", "0");
     ret |= write_value(LED_DEVICE "/vmax", "1600");
     ret |= write_value(LED_DEVICE "/waveform_index", waveformIndex);
     ret |= write_value(LED_DEVICE "/brightness", "1");
-    ret |= write_value(LED_DEVICE "/rtp", "0");
     return ret;
 }
 
-int LedVibratorDevice::off()
-{
+int LedVibratorDevice::off() {
     char file[PATH_MAX];
     int ret;
 
@@ -430,12 +420,9 @@ ndk::ScopedAStatus Vibrator::getCapabilities(int32_t* _aidl_return) {
         return ndk::ScopedAStatus::ok();
     }
 
-    if (ff.mSupportGain)
-        *_aidl_return |= IVibrator::CAP_AMPLITUDE_CONTROL;
-    if (ff.mSupportEffects)
-        *_aidl_return |= IVibrator::CAP_PERFORM_CALLBACK;
-    if (ff.mSupportExternalControl)
-        *_aidl_return |= IVibrator::CAP_EXTERNAL_CONTROL;
+    if (ff.mSupportGain) *_aidl_return |= IVibrator::CAP_AMPLITUDE_CONTROL;
+    if (ff.mSupportEffects) *_aidl_return |= IVibrator::CAP_PERFORM_CALLBACK;
+    if (ff.mSupportExternalControl) *_aidl_return |= IVibrator::CAP_EXTERNAL_CONTROL;
 
     ALOGD("QTI Vibrator reporting capabilities: %d", *_aidl_return);
     return ndk::ScopedAStatus::ok();
@@ -449,8 +436,7 @@ ndk::ScopedAStatus Vibrator::off() {
         ret = ledVib.off();
     else
         ret = ff.off();
-    if (ret != 0)
-        return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_SERVICE_SPECIFIC));
+    if (ret != 0) return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_SERVICE_SPECIFIC));
 
     return ndk::ScopedAStatus::ok();
 }
@@ -465,8 +451,7 @@ ndk::ScopedAStatus Vibrator::on(int32_t timeoutMs,
     else
         ret = ff.on(timeoutMs);
 
-    if (ret != 0)
-        return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_SERVICE_SPECIFIC));
+    if (ret != 0) return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_SERVICE_SPECIFIC));
 
     if (callback != nullptr) {
         std::thread([=] {
@@ -482,7 +467,9 @@ ndk::ScopedAStatus Vibrator::on(int32_t timeoutMs,
     return ndk::ScopedAStatus::ok();
 }
 
-ndk::ScopedAStatus Vibrator::perform(Effect effect, EffectStrength es, const std::shared_ptr<IVibratorCallback>& callback, int32_t* _aidl_return) {
+ndk::ScopedAStatus Vibrator::perform(Effect effect, EffectStrength es,
+                                     const std::shared_ptr<IVibratorCallback>& callback,
+                                     int32_t* _aidl_return) {
     long playLengthMs;
     int ret;
 
@@ -490,64 +477,50 @@ ndk::ScopedAStatus Vibrator::perform(Effect effect, EffectStrength es, const std
 
     if (ledVib.mDetected) {
         switch (effect) {
-        case Effect::CLICK:
-            ledVib.write_value(LED_DEVICE "/rtp", "0");
-            ledVib.write_value(LED_DEVICE "/vmax", "2500");
-            ledVib.write_value(LED_DEVICE "/waveform_index", "1");
+            case Effect::CLICK:
+                ledVib.write_value(LED_DEVICE "/vmax", "2500");
+                ledVib.write_value(LED_DEVICE "/waveform_index", "1");
+                break;
+            case Effect::DOUBLE_CLICK:
+                ledVib.write_value(LED_DEVICE "/vmax", "2500");
+                ledVib.write_value(LED_DEVICE "/waveform_index", "1");
+                break;
+            case Effect::TICK:
+                ledVib.write_value(LED_DEVICE "/vmax", "1400");
+                ledVib.write_value(LED_DEVICE "/waveform_index", "1");
+                break;
+            case Effect::HEAVY_CLICK:
+                ledVib.write_value(LED_DEVICE "/vmax", "2500");
+                ledVib.write_value(LED_DEVICE "/waveform_index", "4");
+                break;
+            case Effect::TEXTURE_TICK:
+                ledVib.write_value(LED_DEVICE "/vmax", "60");
+                ledVib.write_value(LED_DEVICE "/waveform_index", "2");
+                break;
+            default:
+                return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION));
+        }
+
+        if (effect == Effect::DOUBLE_CLICK) {
             ledVib.write_value(LED_DEVICE "/brightness", "1");
-            ledVib.write_value(LED_DEVICE "/rtp", "0");
-            break;
-        case Effect::DOUBLE_CLICK:
-            ledVib.write_value(LED_DEVICE "/rtp", "0");
-            ledVib.write_value(LED_DEVICE "/vmax", "2500");
-            ledVib.write_value(LED_DEVICE "/waveform_index", "1");
-            ledVib.write_value(LED_DEVICE "/brightness", "1");
-            ledVib.write_value(LED_DEVICE "/rtp", "0");
             usleep(100 * 1000);
-            ledVib.write_value(LED_DEVICE "/rtp", "0");
-            ledVib.write_value(LED_DEVICE "/vmax", "2500");
-            ledVib.write_value(LED_DEVICE "/waveform_index", "1");
             ledVib.write_value(LED_DEVICE "/brightness", "1");
-            ledVib.write_value(LED_DEVICE "/rtp", "0");
-            break;
-        case Effect::TICK:
-            ledVib.write_value(LED_DEVICE "/rtp", "0");
-            ledVib.write_value(LED_DEVICE "/vmax", "1400");
-            ledVib.write_value(LED_DEVICE "/waveform_index", "1");
+        } else {
             ledVib.write_value(LED_DEVICE "/brightness", "1");
-            ledVib.write_value(LED_DEVICE "/rtp", "0");
-            break;
-        case Effect::HEAVY_CLICK:
-            ledVib.write_value(LED_DEVICE "/rtp", "0");
-            ledVib.write_value(LED_DEVICE "/vmax", "2500");
-            ledVib.write_value(LED_DEVICE "/waveform_index", "4");
-            ledVib.write_value(LED_DEVICE "/brightness", "1");
-            ledVib.write_value(LED_DEVICE "/rtp", "0");
-            break;
-        case Effect::TEXTURE_TICK:
-            ledVib.write_value(LED_DEVICE "/rtp", "0");
-            ledVib.write_value(LED_DEVICE "/vmax", "60");
-            ledVib.write_value(LED_DEVICE "/waveform_index", "2");
-            ledVib.write_value(LED_DEVICE "/brightness", "1");
-            ledVib.write_value(LED_DEVICE "/rtp", "0");
-            break;
-        default:
-            return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION));
         }
 
         // Return magic value for play length so that we won't end up calling on() / off()
         playLengthMs = 150;
     } else {
-        if (effect < Effect::CLICK ||  effect > Effect::HEAVY_CLICK)
+        if (effect < Effect::CLICK || effect > Effect::HEAVY_CLICK)
             return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION));
 
         if (es != EffectStrength::LIGHT && es != EffectStrength::MEDIUM &&
-                es != EffectStrength::STRONG)
+            es != EffectStrength::STRONG)
             return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION));
 
         ret = ff.playEffect((static_cast<int>(effect)), es, &playLengthMs);
-        if (ret != 0)
-            return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_SERVICE_SPECIFIC));
+        if (ret != 0) return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_SERVICE_SPECIFIC));
     }
 
     if (callback != nullptr) {
@@ -568,8 +541,8 @@ ndk::ScopedAStatus Vibrator::getSupportedEffects(std::vector<Effect>* _aidl_retu
         *_aidl_return = {Effect::CLICK, Effect::DOUBLE_CLICK, Effect::TICK, Effect::HEAVY_CLICK,
                          Effect::TEXTURE_TICK};
     } else {
-        *_aidl_return = {Effect::CLICK, Effect::DOUBLE_CLICK, Effect::TICK, Effect::THUD,
-                         Effect::POP, Effect::HEAVY_CLICK};
+        *_aidl_return = {Effect::CLICK, Effect::DOUBLE_CLICK, Effect::TICK,
+                         Effect::THUD,  Effect::POP,          Effect::HEAVY_CLICK};
     }
     return ndk::ScopedAStatus::ok();
 }
@@ -591,8 +564,7 @@ ndk::ScopedAStatus Vibrator::setAmplitude(float amplitude) {
 
     tmp = (uint8_t)(amplitude * 0xff);
     ret = ff.setAmplitude(tmp);
-    if (ret != 0)
-        return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_SERVICE_SPECIFIC));
+    if (ret != 0) return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_SERVICE_SPECIFIC));
 
     return ndk::ScopedAStatus::ok();
 }
@@ -609,7 +581,7 @@ ndk::ScopedAStatus Vibrator::setExternalControl(bool enabled) {
     return ndk::ScopedAStatus::ok();
 }
 
-ndk::ScopedAStatus Vibrator::getCompositionDelayMax(int32_t* maxDelayMs  __unused) {
+ndk::ScopedAStatus Vibrator::getCompositionDelayMax(int32_t* maxDelayMs __unused) {
     return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION));
 }
 
@@ -617,7 +589,8 @@ ndk::ScopedAStatus Vibrator::getCompositionSizeMax(int32_t* maxSize __unused) {
     return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION));
 }
 
-ndk::ScopedAStatus Vibrator::getSupportedPrimitives(std::vector<CompositePrimitive>* supported __unused) {
+ndk::ScopedAStatus Vibrator::getSupportedPrimitives(
+        std::vector<CompositePrimitive>* supported __unused) {
     return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION));
 }
 
@@ -631,7 +604,8 @@ ndk::ScopedAStatus Vibrator::compose(const std::vector<CompositeEffect>& composi
     return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION));
 }
 
-ndk::ScopedAStatus Vibrator::getSupportedAlwaysOnEffects(std::vector<Effect>* _aidl_return __unused) {
+ndk::ScopedAStatus Vibrator::getSupportedAlwaysOnEffects(
+        std::vector<Effect>* _aidl_return __unused) {
     return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION));
 }
 
@@ -648,4 +622,3 @@ ndk::ScopedAStatus Vibrator::alwaysOnDisable(int32_t id __unused) {
 }  // namespace hardware
 }  // namespace android
 }  // namespace aidl
-

aidl/vibrator/qti/effect/VibrationEffectConfig.h

@@ -27,227 +27,276 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* Wly THUD as DOUBLE_CLICK */
 static const int8_t effect_1[] = {
-    1,    1,    1,    1,    1,    1,    2,    2,    2,    3,    3,    4,
-    4,    5,    6,    7,    8,    9,    10,   11,   13,   15,   17,   20,
-    22,   26,   29,   33,   38,   43,   49,   56,   64,   71,   76,   81,
-    85,   88,   90,   92,   93,   93,   93,   92,   91,   90,   88,   86,
-    84,   81,   78,   75,   72,   68,   65,   61,   57,   53,   49,   44,
-    40,   36,   31,   27,   22,   17,   12,   7,    2,    -3,   -9,   -15,
-    -21,  -28,  -35,  -43,  -51,  -60,  -71,  -82,  -94,  -103, -112, -118,
-    -123, -126, -127, -127, -127, -127, -124, -121, -117, -112, -107, -101,
-    -94,  -87,  -80,  -72,  -64,  -55,  -47,  -38,  -30,  -21,  -12,  -4,
-    5,    13,   21,   29,   37,   44,   51,   57,   63,   68,   73,   77,
-    81,   84,   86,   88,   89,   89,   88,   86,   84,   81,   78,   75,
-    72,   68,   64,   59,   54,   49,   44,   38,   32,   25,   19,   12,
-    5,    -2,   -9,   -17,  -24,  -32,  -40,  -47,  -55,  -62,  -69,  -76,
-    -83,  -89,  -95,  -101, -106, -111, -115, -119, -122, -124, -125, -125,
-    -125, -123, -120, -116, -111, -104, -95,  -85,  -74,  -65,  -56,  -49,
-    -42,  -35,  -30,  -24,  -19,  -15,  -10,  -6,   -3,   1,    5,    8,
-    11,   15,   18,   21,   24,   26,   29,   32,   34,   37,   39,   41,
-    43,   45,   47,   49,   50,   51,   52,   53,   54,   54,   54,   54,
-    53,   52,   50,   48,   45,   42,   38,   33,   29,   25,   22,   19,
-    17,   14,   12,   11,   9,    8,    7,    6,    5,    4,    4,    3,
-    3,    2,    2,    2,    1,    1,    1,    1,    1,    0
+    0,   5,   10,  15,  20,  25,  29,  34,  38,  43,  47,  51,  55,  58,  62,
+    65,  68,  70,  73,  75,  77,  78,  79,  80,  81,  81,  81,  81,  80,  79,
+    78,  77,  75,  73,  70,  68,  65,  62,  59,  55,  51,  47,  43,  39,  34,
+    30,  25,  20,  15,  10,  5,   0,   -5,  -10, -15, -19, -24, -29, -34, -38,
+    -42, -47, -51, -54, -58, -61, -65, -68, -70, -73, -75, -77, -78, -79, -80,
+    -81, -81, -81, -81, -80, -79, -78, -77, -75, -73, -71, -68, -65, -62, -59,
+    -55, -51, -47, -43, -39, -35, -30, -25, -20, -16, -11, -6,  -1,  4,   9,
+    14,  19,  24,  29,  33,  38,  42,  46,  50,  54,  58,  61,  64,  67,  70,
+    72,  75,  76,  78,  79,  80,  81,  81,  81,  81,  80,  80,  78,  77,  75,
+    73,  71,  68,  65,  62,  59,  55,  52,  48,  44,  39,  35,  30,  26,  21,
+    16,  11,  6,   1,   -4,  -9,  -14, -19, -24, -28, -33, -38, -42, -46, -50,
+    -54, -58, -61, -64, -67, -70, -72, -74, -76, -78, -79, -80, -81, -81, -81,
+    -81, -80, -80, -78, -77, -75, -73, -71, -68, -66, -62, -59, -56, -52, -48,
+    -44, -40, -35, -31, -26, -21, -16, -11, -6,  -1,  4,   9,   14,  19,  23,
+    28,  33,  37,  42,  46,  50,  54,  57,  61,  64,  67,  70,  72,  74,  76,
+    78,  79,  80,  81,  81,  81,  81,  81,  80,  79,  77,  75,  73,  71,  69,
+    66,  63,  59,  56,  52,  48,  44,  40,  35,  31,  26,  21,  16,  12,  7,
+    2,   -3,  -8,  -13, -18, -23, -28, -32, -37, -41, -46, -50, -54, -57, -61,
+    -64, -67, -70, -72, -74, -76, -78, -79, -80, -81, -81, -81, -81, -81, -80,
+    -79, -77, -76, -74, -71, -69, -66, -63, -60, -56, -52, -48, -44, -40, -36,
+    -31, -26, -22, -17, -12, -7,  0,   2,   3,   5,   7,   8,   10,  12,  13,
+    15,  16,  17,  19,  20,  21,  22,  23,  24,  25,  26,  26,  27,  27,  28,
+    28,  28,  28,  28,  28,  27,  27,  26,  26,  25,  24,  23,  22,  21,  20,
+    19,  18,  16,  15,  13,  12,  10,  9,   7,   5,   4,   2,   0,   -2,  -3,
+    -5,  -7,  -8,  -10, -12, -13, -15, -16, -17, -19, -20, -21, -22, -23, -24,
+    -25, -26, -26, -27, -27, -28, -28, -28, -28, -28, -28, -27, -27, -26, -26,
+    -25, -24, -23, -22, -21, -20, -19, -18, -16, -15, -13, -12, -10, -9,  -7,
+    -5,  -4,  -2,  0,   1,   3,   5,   7,   8,   10,  11,  13,  15,  16,  17,
+    19,  20,  21,  22,  23,  24,  25,  26,  26,  27,  27,  28,  28,  28,  28,
+    28,  28,  27,  27,  26,  26,  25,  24,  23,  22,  21,  20,  19,  18,  16,
+    15,  13,  12,  10,  9,   7,   5,   4,   2,   0,   -1,  -3,  -5,  -6,  -8,
+    -10, -11, -13, -14, -16, -17, -19, -20, -21, -22, -23, -24, -25, -26, -26,
+    -27, -27, -28, -28, -28, -28, -28, -28, -27, -27, -26, -26, -25, -24, -24,
+    -23, -21, -20, -19, -18, -16, -15, -14, -12, -10, -9,  -7,  -6,  -4,  -2,
+    0,   1,   3,   5,   6,   8,   10,  11,  13,  14,  16,  17,  18,  20,  21,
+    22,  23,  24,  25,  26,  26,  27,  27,  28,  28,  28,  28,  28,  28,  27,
+    27,  27,  26,  25,  24,  24,  23,  22,  20,  19,  18,  17,  15,  14,  12,
+    11,  9,   7,   6,   4,   2,   1,   -1,  -3,  -5,  -6,  -8,  -10, -11, -13,
+    -14, -16, -17, -18, -20, -21, -22, -23, -24, -25, -25, -26, -27, -27, -28,
+    -28, -28, -28, -28, -28, -27, -27, -27, -26, -25, -24, -24, -23, -22, -20,
+    -19, -18, -17, -15, -14, -12, -11, -9,  -7,  -6,  -4,  -2,  -1,  1,   3,
+    4,   6,   8,   9,   11,  13,  14,  16,  17,  18,  20,  21,  22,  23,  24,
+    25,  25,  26,  27,  27,  27,  28,  28,  28,  28,  28,  27,  27,  27,  26,
+    25,  25,  24,  23,  22,  21,  19,  18,  17,  15,  14,  12,  11,  9,   8,
+    6,   4,   2,   1,   -1,  -3,  -4,  -6,  -8,  -9,  -11, -13, -14, -15, -17,
+    -18, -19, -21, -22, -23, -24, -25, -25, -26, -27, -27, -27, -28, -28, -28,
+    -28, -28, -27, -27, -27, -26, -25, -25, -24, -23, -22, -21, -19, -18, -17,
+    -15, -14, -12, -11, -9,  -8,  -6,  -4,  -3,  -1,  1,   3,   4,   6,   8,
+    9,   11,  12,  14,  15,  17,  18,  19,  21,  22,  23,  24,  25,  25,  26,
+    27,  27,  27,  28,  28,  28,  28,  28,  27,  27,  27,  26,  25,  25,  24,
+    23,  22,  21,  20,  18,  17,  16,  14,  13,  11,  9,   8,   6,   4,   3,
+    1,   -1,  -2,  -4,  -6,  -8,  -9,  -11, -12, -14, -15, -17, -18, -19, -21,
+    -22, -23, -24, -25, -25, -26, -27, -27, -27, -28, -28, -28, -28, -28, -27,
+    -27, -27, -26, -25, -25, -24, -23, -22, -21, -20, -18, -17, -16, -14, -13,
+    -11, -9,  -8,  -6,  -5,  -3,  -1,  1,   2,   4,   6,   7,   9,   11,  12,
+    14,  15,  17,  18,  19,  20,  22,  23,  24,  24,  25,  26,  27,  27,  27,
+    28,  28,  28,  28,  28,  28,  27,  27,  26,  26,  25,  24,  23,  22,  21,
+    20,  18,  17,  16,  14,  13,  11,  10,  8,   6,   5,   3,   1,   -1,  -2,
+    -4,  -6,  -7,  -9,  -11, -12, -14, -15, -17, -18, -19, -20, -22, -23, -24,
+    -24, -25, -26, -27, -27, -27, -28, -28, -28, -28, -28, -28, -27, -27, -26,
+    -26, -25, -24, -23, -22, -21, -20, -19, -17, -16, -14, -13, -11, -10, -8,
+    -6,  -5,  -3,  -1,  0,   2,   4,   6,   7,   9,   10,  12,  14,  15,  16,
+    18,  19,  20,  21,  23,  23,  24,  25,  26,  26,  27,  27,  28,  28,  28,
+    28,  28,  28,  27,  27,  26,  26,  25,  24,  23,  22,  21,  20,  19,  17,
+    16,  14,  13,  11,  10,  8,   7,   5,   3,   1,   0,   -2,  -4,  -5,  -7,
+    -9,  -10, -12, -13, -15, -16, -18, -19, -20, -21, -22, -23, -24, -25, -26,
+    -26, -27, -27, -28, -28, -28, -28, -28, -28, -27, -27, -26, -26, -25, -24,
+    -23, -22, -21, -20, -19, -17, -16, -15, -13, -11, -10, -8,  -7,  -5,  -3,
+    -2,  0,   2,   4,   5,   7,   9,   10,  12,  13,  15,  16,  18,  19,  20,
+    21,  22,  23,  24,  25,  26,  26,  27,  27,  28,  28,  28,  28,  28,  28,
+    27,  27,  26,  26,  25,  24,  23,  22,  21,  20,  19,  17,  16,  15,  13,
+    12,  10,  8,   7,   5,   3,   2,   0,   -2,  -3,  -5,  -7,  -9,  -10, -12,
+    -13, -15, -16, -18, -19, -20, -21, -22, -23, -24, -25, -26, -26, -27, -27,
+    -28, -28, -28, -28, -28, -28, -27, -27, -26, -26, -25, -24, -23, -22, -21,
+    -20, -19, -18, -16, -15, -13, -12, -10, -8,  -7,  -5,  -3,  -2,  0,   2,
+    3,   5,   7,   8,   10,  12,  13,  15,  16,  17,  19,  20,  21,  22,  23,
+    24,  25,  26,  26,  27,  27,  28,  28,  28,  28,  28,  28,  27,  27,  26,
+    26,  25,  24,  23,  22,  21,  20,  19,  18,  16,  15,  13,  12,  10,  9,
+    7,   5,   4,   2,   0,   -2,  -3,  -5,  -7,  -8,  -10, -12, -13, -15, -16,
+    -17, -19, -20, -21, -22, -23, -24, -25, -26, -26, -27, -27, -28, -28, -28,
+    -28, -28, -28, -27, -27, -26, -26, -25, -24, -23, -22, -21, -20, -19, -18,
+    -16, -15, -13, -12, -10, -9,  -7,  -5,  -4,  -2,  0,   -6,  -12, -18, -24,
+    -30, -35, -41, -46, -51, -56, -61, -66, -70, -74, -78, -81, -85, -87, -90,
+    -92, -94, -95, -97, -97, -98, -98, -97, -97, -96, -94, -92, -90, -88, -85,
+    -82, -78, -74, -70, -66, -62, -57, -52, -47, -41, -36, -30, -24, -18, -12,
+    -6,  0,   6,   12,  18,  23,  29,  35,  40,  46,  51,  56,  61,  66,  70,
+    74,  78,  81,  84,  87,  90,  92,  94,  95,  97,  97,  98,  98,  97,  97,
+    96,  94,  92,  90,  88,  85,  82,  78,  75,  71,  66,  62,  57,  52,  47,
+    42,  36,  30,  25,  19,  13,  7,   1,   -5,  -11, -17, -23, -29, -35, -40,
+    -46, -51, -56, -61, -65, -70, -74, -77, -81, -84, -87, -90, -92, -94, -95,
+    -96, -97, -98, -98, -97, -97, -96, -94, -93, -90, -88, -85, -82, -79, -75,
+    -71, -67, -62, -57, -52, -47, -42, -36, -31, -25, -19, -13, -7,  -1,  5,
+    11,  17,  23,  29,  34,  40,  45,  50,  55,  60,  65,  69,  73,  77,  81,
+    84,  87,  90,  92,  94,  95,  96,  97,  98,  98,  97,  97,  96,  94,  93,
+    91,  88,  85,  82,  79,  75,  71,  67,  62,  58,  53,  48,  42,  37,  31,
+    25,  19,  14,  8,   2,   -4,  -10, -16, -22, -28, -34, -39, -45, -50, -55,
+    -60, -65, -69, -73, -77, -81, -84, -87, -89, -92, -94, -95, -96, -97, -98,
+    -98, -98, -97, -96, -95, -93, -91, -88, -86, -82, -79, -75, -71, -67, -63,
+    -58, -53, -48, -43, -37, -31, -26, -20, -14, -8,  0
 };
 
 static const int8_t effect_2[] = {
-    1,    1,    1,    1,    1,    1,    2,    2,    2,    3,    3,    4,
-    4,    5,    6,    7,    8,    9,    10,   12,   13,   14,   16,   19,
-    22,   25,   28,   32,   36,   42,   48,   54,   61,   69,   78,   85,
-    92,   97,   102,  106,  110,  113,  115,  117,  119,  121,  121,  123,
-    123,  123,  124,  124,  124,  123,  123,  123,  122,  121,  121,  120,
-    119,  118,  117,  115,  114,  113,  112,  111,  109,  108,  106,  105,
-    103,  101,  99,   97,   95,   93,   91,   89,   86,   83,   80,   77,
-    73,   69,   64,   60,   54,   48,   41,   34,   25,   15,   4,    -7,
-    -22,  -37,  -51,  -64,  -74,  -83,  -91,  -99,  -104, -109, -112, -115,
-    -119, -120, -122, -122, -123, -122, -122, -122, -120, -120, -118, -116,
-    -114, -112, -110, -107, -105, -103, -99,  -97,  -95,  -91,  -89,  -86,
-    -83,  -80,  -77,  -74,  -71,  -68,  -64,  -61,  -58,  -55,  -52,  -49,
-    -46,  -43,  -40,  -36,  -33,  -29,  -26,  -22,  -18,  -14,  -10,  -5,
-    0,    6,    12,   19,   27,   35,   42,   47,   52,   57,   60,   63,
-    65,   66,   67,   68,   68,   67,   67,   66,   64,   62,   61,   58,
-    56,   53,   51,   49,   45,   43,   39,   35,   33,   29,   26,   22,
-    19,   15,   12,   8,    5,    1,    -2,   -5,   -9,   -12,  -14,  -17,
-    -20,  -22,  -25,  -27,  -28,  -30,  -32,  -32,  -34,  -34,  -34,  -34,
-    -33,  -31,  -29,  -27,  -24,  -21,  -16,  -11,  -4,   2,    8,    14,
-    19,   23,   27,   31,   35,   38,   42,   45,   48,   51,   54,   56,
-    58,   62,   65,   67,   69,   72,   75,   78,   80,   83,   86,   88,
-    91,   94,   97,   99,   102,  104,  107,  109,  111,  114,  116,  118,
-    120,  121,  123,  124,  125,  126,  127,  127,  127,  127,  127,  126,
-    124,  123,  120,  117,  113,  109,  103,  96,   89,   80,   70,   58,
-    45,   32,   21,   11,   2,    -6,   -12,  -18,  -24,  -29,  -33,  -37,
-    -41,  -43,  -47,  -49,  -51,  -54,  -56,  -58,  -59,  -61,  -62,  -64,
-    -65,  -66,  -67,  -68,  -69,  -70,  -71,  -72,  -73,  -74,  -75,  -76,
-    -77,  -77,  -78,  -78,  -79,  -79,  -80,  -80,  -80,  -80,  -80,  -80,
-    -80,  -80,  -79,  -79,  -78,  -77,  -75,  -74,  -72,  -70,  -67,  -64,
-    -61,  -57,  -53,  -47,  -42,  -37,  -32,  -28,  -25,  -22,  -19,  -16,
-    -15,  -12,  -11,  -10,  -8,   -7,   -6,   -6,   -5,   -4,   -4,   -3,
-    -3,   -3,   -3,   -2,   -2,   -2,   -2,   -2,   -2,   -2,   -1,   0
-};
+        1,    1,    1,    1,    1,    1,    2,    2,    2,    3,    3,    4,    4,    5,    6,
+        7,    8,    9,    10,   12,   13,   14,   16,   19,   22,   25,   28,   32,   36,   42,
+        48,   54,   61,   69,   78,   85,   92,   97,   102,  106,  110,  113,  115,  117,  119,
+        121,  121,  123,  123,  123,  124,  124,  124,  123,  123,  123,  122,  121,  121,  120,
+        119,  118,  117,  115,  114,  113,  112,  111,  109,  108,  106,  105,  103,  101,  99,
+        97,   95,   93,   91,   89,   86,   83,   80,   77,   73,   69,   64,   60,   54,   48,
+        41,   34,   25,   15,   4,    -7,   -22,  -37,  -51,  -64,  -74,  -83,  -91,  -99,  -104,
+        -109, -112, -115, -119, -120, -122, -122, -123, -122, -122, -122, -120, -120, -118, -116,
+        -114, -112, -110, -107, -105, -103, -99,  -97,  -95,  -91,  -89,  -86,  -83,  -80,  -77,
+        -74,  -71,  -68,  -64,  -61,  -58,  -55,  -52,  -49,  -46,  -43,  -40,  -36,  -33,  -29,
+        -26,  -22,  -18,  -14,  -10,  -5,   0,    6,    12,   19,   27,   35,   42,   47,   52,
+        57,   60,   63,   65,   66,   67,   68,   68,   67,   67,   66,   64,   62,   61,   58,
+        56,   53,   51,   49,   45,   43,   39,   35,   33,   29,   26,   22,   19,   15,   12,
+        8,    5,    1,    -2,   -5,   -9,   -12,  -14,  -17,  -20,  -22,  -25,  -27,  -28,  -30,
+        -32,  -32,  -34,  -34,  -34,  -34,  -33,  -31,  -29,  -27,  -24,  -21,  -16,  -11,  -4,
+        2,    8,    14,   19,   23,   27,   31,   35,   38,   42,   45,   48,   51,   54,   56,
+        58,   62,   65,   67,   69,   72,   75,   78,   80,   83,   86,   88,   91,   94,   97,
+        99,   102,  104,  107,  109,  111,  114,  116,  118,  120,  121,  123,  124,  125,  126,
+        127,  127,  127,  127,  127,  126,  124,  123,  120,  117,  113,  109,  103,  96,   89,
+        80,   70,   58,   45,   32,   21,   11,   2,    -6,   -12,  -18,  -24,  -29,  -33,  -37,
+        -41,  -43,  -47,  -49,  -51,  -54,  -56,  -58,  -59,  -61,  -62,  -64,  -65,  -66,  -67,
+        -68,  -69,  -70,  -71,  -72,  -73,  -74,  -75,  -76,  -77,  -77,  -78,  -78,  -79,  -79,
+        -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -79,  -79,  -78,  -77,  -75,  -74,  -72,
+        -70,  -67,  -64,  -61,  -57,  -53,  -47,  -42,  -37,  -32,  -28,  -25,  -22,  -19,  -16,
+        -15,  -12,  -11,  -10,  -8,   -7,   -6,   -6,   -5,   -4,   -4,   -3,   -3,   -3,   -3,
+        -2,   -2,   -2,   -2,   -2,   -2,   -2,   -1,   0};
 
 static const int8_t effect_3[] = {
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,
-    1,    2,    2,    3,    4,    6,    7,    9,    11,   14,   16,   19,
-    22,   26,   29,   33,   37,   41,   45,   49,   54,   58,   62,   66,
-    70,   74,   78,   81,   85,   88,   91,   94,   97,   99,   101,  103,
-    105,  106,  108,  108,  109,  110,  110,  110,  109,  109,  108,  107,
-    105,  104,  102,  100,  98,   96,   93,   90,   87,   84,   81,   78,
-    74,   70,   67,   63,   59,   54,   50,   46,   41,   37,   32,   28,
-    23,   18,   13,   9,    4,    -1,   -6,   -11,  -15,  -20,  -25,  -29,
-    -34,  -39,  -43,  -47,  -52,  -56,  -60,  -64,  -68,  -71,  -75,  -78,
-    -82,  -85,  -88,  -90,  -93,  -95,  -97,  -99,  -101, -103, -104, -106,
-    -107, -107, -108, -108, -108, -108, -108, -107, -107, -106, -105, -103,
-    -102, -100, -98,  -96,  -94,  -91,  -88,  -86,  -83,  -79,  -76,  -72,
-    -69,  -65,  -61,  -57,  -53,  -49,  -44,  -40,  -35,  -31,  -26,  -21,
-    -17,  -12,  -7,   -2,   3,    7,    12,   17,   22,   27,   31,   36,
-    40,   45,   49,   53,   57,   61,   65,   69,   73,   76,   80,   83,
-    86,   89,   91,   94,   96,   98,   100,  102,  104,  105,  106,  107,
-    108,  108,  108,  108,  108,  108,  107,  106,  105,  104,  103,  101,
-    99,   97,   95,   93,   90,   87,   84,   81,   75,   72,   68,   65,
-    61,   58,   54,   51,   47,   44,   41,   38,   35,   32,   30,   27,
-    24,   22,   19,   16,   14,   11,   8,    6,    3,    1,    -2,   -4,
-    -6,   -8,   -10,  -11,  -13,  -14,  -15,  -16,  -17,  -18,  -19,  -20,
-    -20,  -21,  -21,  -21,  -21,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
-    -22,  -22,  -21,  -21,  -21,  -21,  -21,  -20,  -20,  -20,  -20,  -19,
-    -19,  -18,  -18,  -18,  -17,  -17,  -16,  -16,  -15,  -14,  -14,  -13,
-    -12,  -12,  -11,  -10,  -9,   -9,   -8,   -7,   -6,   -5,   -4,   -3,
-    -3,   -2,   -1,   0,    1,    2,    3,    4,    5,    6,    7,    8,
-    8,    9,    10,   11,   12,   13,   13,   14,   15,   15,   16,   17,
-    17,   18,   18,   19,   19,   19,   20,   20,   20,   21,   21,   21,
-    21,   21,   21,   21,   21,   21,   21,   21,   20,   20,   20,   19,
-    19,   19,   18,   18,   17,   16,   16,   15,   15,   14,   13,   12,
-    12,   11,   10,   9,    8,    8,    7,    6,    5,    4,    3,    2,
-    1,    0,    -1,   -2,   -3,   -4,   -4,   -5,   -6,   -7,   -8,   -9,
-    -10,  -11,  -11,  -12,  -13,  -14,  -14,  -15,  -16,  -16,  -17,  -17,
-    -18,  -18,  -19,  -19,  -20,  -20,  -20,  -20,  -21,  -21,  -21,  -21,
-    -21,  -21,  -21,  -21,  -21,  -21,  -20,  -20,  -20,  -20,  -19,  -19,
-    -18,  -18,  -17,  -17,  -16,  -16,  -15,  -14,  -14,  -13,  -12,  -11,
-    -11,  -10,  -9,   -8,   -7,   -6,   -5,   -4,   -4,   -3,   -2,   -1,
-    0,    1,    2,    3,    4,    5,    6,    7,    8,    8,    9,    10,
-    11,   12,   12,   13,   14,   15,   15,   16,   16,   17,   18,   18,
-    19,   19,   19,   20,   20,   20,   20,   21,   21,   21,   21,   21,
-    21,   21,   21,   21,   21,   20,   20,   20,   19,   19,   19,   18,
-    18,   17,   17,   16,   15,   15,   14,   13,   13,   12,   11,   10,
-    9,    9,    8,    7,    6,    5,    4,    3,    2,    1,    0,    -1,
-    -1,   -2,   -3,   -4,   -5,   -6,   -7,   -8,   -9,   -9,   -10,  -11,
-    -12,  -13,  -13,  -14,  -15,  -15,  -16,  -17,  -17,  -18,  -18,  -19,
-    -19,  -19,  -20,  -20,  -20,  -21,  -21,  -21,  -21,  -21,  -21,  -21,
-    -21,  -21,  -21,  -20,  -20,  -20,  -20,  -19,  -19,  -18,  -18,  -18,
-    -17,  -16,  -16,  -15,  -15,  -14,  -13,  -12,  -12,  -11,  -10,  -9,
-    -8,   -7,   -7,   -6,   -5,   -4,   -3,   -2,   -1,   0,    1,    2,
-    3,    4,    4,    5,    6,    7,    8,    9,    10,   11,   11,   12,
-    13,   14,   14,   15,   16,   16,   17,   17,   18,   18,   19,   19,
-    20,   20,   20,   20,   21,   21,   21,   21,   21,   21,   21,   21,
-    21,   21,   20,   20,   20,   20,   19,   19,   18,   18,   17,   17,
-    16,   16,   15,   14,   14,   13,   12,   11,   10,   10,   9,    8,
-    7,    6,    5,    4,    3,    3,    2,    1,    0,    -1,   -2,   -3,
-    -4,   -5,   -6,   -7,   -8,   -8,   -10,  -10,  -11,  -12,  -13,  -14,
-    -14,  -15,  -16,  -16,  -17,  -17,  -17,  -17,  -17,  -17,  -16,  -14,
-    -12,  -10,  -7,   -4,   0,    4,    8,    13,   19,   24,   30,   36,
-    42,   48,   53,   59,   64,   69,   74,   78,   82,   85,   87,   89,
-    91,   92,   92,   91,   89,   87,   83,   79,   73,   67,   60,   52,
-    44,   36,   27,   18,   10,   1,    -7,   -14,  -22,  -29,  -36,  -43,
-    -50,  -56,  -62,  -69,  -75,  -81,  -86,  -92,  -97,  -102, -107, -111,
-    -115, -118, -121, -123, -124, -126, -127, -127, -127, -127, -127, -127,
-    -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-    -126, -124, -122, -120, -117, -114, -110, -106, -101, -96,  -90,  -84,
-    -79,  -73,  -67,  -60,  -54,  -48,  -42,  -36,  -30,  -24,  -18,  -13,
-    -7,   -1,   4,    9,    14,   19,   24,   28,   33,   37,   41,   44,
-    48,   51,   54,   57,   60,   62,   64,   66,   68,   69,   70,   71,
-    72,   73,   73,   73,   73,   73,   73,   72,   71,   71,   70,   68,
-    67,   66,   64,   63,   61,   59,   57,   55,   53,   51,   49,   46,
-    44,   42,   39,   37,   35,   32,   30,   28,   25,   23,   21,   18,
-    16,   14,   12,   10,   8,    6,    4,    2,    1,    -1,   -3,   -4,
-    -5,   -7,   -8,   -9,   -10,  -11,  -12,  -13,  -14,  -15,  -15,  -16,
-    -16,  -16,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
-    -17,  -16,  -16,  -15,  -15,  -15,  -14,  -14,  -13,  -13,  -12,  -11,
-    -11,  -10,  -10,  -9,   -8,   -8,   -7,   -7,   -6,   -5,   -5,   -4,
-    -4,   -3,   -3,   -2,   -2,   -1,   -1,   0
-};
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,    1,    2,    2,
+        3,    4,    6,    7,    9,    11,   14,   16,   19,   22,   26,   29,   33,   37,   41,
+        45,   49,   54,   58,   62,   66,   70,   74,   78,   81,   85,   88,   91,   94,   97,
+        99,   101,  103,  105,  106,  108,  108,  109,  110,  110,  110,  109,  109,  108,  107,
+        105,  104,  102,  100,  98,   96,   93,   90,   87,   84,   81,   78,   74,   70,   67,
+        63,   59,   54,   50,   46,   41,   37,   32,   28,   23,   18,   13,   9,    4,    -1,
+        -6,   -11,  -15,  -20,  -25,  -29,  -34,  -39,  -43,  -47,  -52,  -56,  -60,  -64,  -68,
+        -71,  -75,  -78,  -82,  -85,  -88,  -90,  -93,  -95,  -97,  -99,  -101, -103, -104, -106,
+        -107, -107, -108, -108, -108, -108, -108, -107, -107, -106, -105, -103, -102, -100, -98,
+        -96,  -94,  -91,  -88,  -86,  -83,  -79,  -76,  -72,  -69,  -65,  -61,  -57,  -53,  -49,
+        -44,  -40,  -35,  -31,  -26,  -21,  -17,  -12,  -7,   -2,   3,    7,    12,   17,   22,
+        27,   31,   36,   40,   45,   49,   53,   57,   61,   65,   69,   73,   76,   80,   83,
+        86,   89,   91,   94,   96,   98,   100,  102,  104,  105,  106,  107,  108,  108,  108,
+        108,  108,  108,  107,  106,  105,  104,  103,  101,  99,   97,   95,   93,   90,   87,
+        84,   81,   75,   72,   68,   65,   61,   58,   54,   51,   47,   44,   41,   38,   35,
+        32,   30,   27,   24,   22,   19,   16,   14,   11,   8,    6,    3,    1,    -2,   -4,
+        -6,   -8,   -10,  -11,  -13,  -14,  -15,  -16,  -17,  -18,  -19,  -20,  -20,  -21,  -21,
+        -21,  -21,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -21,  -21,  -21,  -21,
+        -21,  -20,  -20,  -20,  -20,  -19,  -19,  -18,  -18,  -18,  -17,  -17,  -16,  -16,  -15,
+        -14,  -14,  -13,  -12,  -12,  -11,  -10,  -9,   -9,   -8,   -7,   -6,   -5,   -4,   -3,
+        -3,   -2,   -1,   0,    1,    2,    3,    4,    5,    6,    7,    8,    8,    9,    10,
+        11,   12,   13,   13,   14,   15,   15,   16,   17,   17,   18,   18,   19,   19,   19,
+        20,   20,   20,   21,   21,   21,   21,   21,   21,   21,   21,   21,   21,   21,   20,
+        20,   20,   19,   19,   19,   18,   18,   17,   16,   16,   15,   15,   14,   13,   12,
+        12,   11,   10,   9,    8,    8,    7,    6,    5,    4,    3,    2,    1,    0,    -1,
+        -2,   -3,   -4,   -4,   -5,   -6,   -7,   -8,   -9,   -10,  -11,  -11,  -12,  -13,  -14,
+        -14,  -15,  -16,  -16,  -17,  -17,  -18,  -18,  -19,  -19,  -20,  -20,  -20,  -20,  -21,
+        -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -20,  -20,  -20,  -20,  -19,  -19,
+        -18,  -18,  -17,  -17,  -16,  -16,  -15,  -14,  -14,  -13,  -12,  -11,  -11,  -10,  -9,
+        -8,   -7,   -6,   -5,   -4,   -4,   -3,   -2,   -1,   0,    1,    2,    3,    4,    5,
+        6,    7,    8,    8,    9,    10,   11,   12,   12,   13,   14,   15,   15,   16,   16,
+        17,   18,   18,   19,   19,   19,   20,   20,   20,   20,   21,   21,   21,   21,   21,
+        21,   21,   21,   21,   21,   20,   20,   20,   19,   19,   19,   18,   18,   17,   17,
+        16,   15,   15,   14,   13,   13,   12,   11,   10,   9,    9,    8,    7,    6,    5,
+        4,    3,    2,    1,    0,    -1,   -1,   -2,   -3,   -4,   -5,   -6,   -7,   -8,   -9,
+        -9,   -10,  -11,  -12,  -13,  -13,  -14,  -15,  -15,  -16,  -17,  -17,  -18,  -18,  -19,
+        -19,  -19,  -20,  -20,  -20,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,
+        -20,  -20,  -20,  -20,  -19,  -19,  -18,  -18,  -18,  -17,  -16,  -16,  -15,  -15,  -14,
+        -13,  -12,  -12,  -11,  -10,  -9,   -8,   -7,   -7,   -6,   -5,   -4,   -3,   -2,   -1,
+        0,    1,    2,    3,    4,    4,    5,    6,    7,    8,    9,    10,   11,   11,   12,
+        13,   14,   14,   15,   16,   16,   17,   17,   18,   18,   19,   19,   20,   20,   20,
+        20,   21,   21,   21,   21,   21,   21,   21,   21,   21,   21,   20,   20,   20,   20,
+        19,   19,   18,   18,   17,   17,   16,   16,   15,   14,   14,   13,   12,   11,   10,
+        10,   9,    8,    7,    6,    5,    4,    3,    3,    2,    1,    0,    -1,   -2,   -3,
+        -4,   -5,   -6,   -7,   -8,   -8,   -10,  -10,  -11,  -12,  -13,  -14,  -14,  -15,  -16,
+        -16,  -17,  -17,  -17,  -17,  -17,  -17,  -16,  -14,  -12,  -10,  -7,   -4,   0,    4,
+        8,    13,   19,   24,   30,   36,   42,   48,   53,   59,   64,   69,   74,   78,   82,
+        85,   87,   89,   91,   92,   92,   91,   89,   87,   83,   79,   73,   67,   60,   52,
+        44,   36,   27,   18,   10,   1,    -7,   -14,  -22,  -29,  -36,  -43,  -50,  -56,  -62,
+        -69,  -75,  -81,  -86,  -92,  -97,  -102, -107, -111, -115, -118, -121, -123, -124, -126,
+        -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
+        -127, -127, -127, -126, -124, -122, -120, -117, -114, -110, -106, -101, -96,  -90,  -84,
+        -79,  -73,  -67,  -60,  -54,  -48,  -42,  -36,  -30,  -24,  -18,  -13,  -7,   -1,   4,
+        9,    14,   19,   24,   28,   33,   37,   41,   44,   48,   51,   54,   57,   60,   62,
+        64,   66,   68,   69,   70,   71,   72,   73,   73,   73,   73,   73,   73,   72,   71,
+        71,   70,   68,   67,   66,   64,   63,   61,   59,   57,   55,   53,   51,   49,   46,
+        44,   42,   39,   37,   35,   32,   30,   28,   25,   23,   21,   18,   16,   14,   12,
+        10,   8,    6,    4,    2,    1,    -1,   -3,   -4,   -5,   -7,   -8,   -9,   -10,  -11,
+        -12,  -13,  -14,  -15,  -15,  -16,  -16,  -16,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+        -17,  -17,  -17,  -17,  -16,  -16,  -15,  -15,  -15,  -14,  -14,  -13,  -13,  -12,  -11,
+        -11,  -10,  -10,  -9,   -8,   -8,   -7,   -7,   -6,   -5,   -5,   -4,   -4,   -3,   -3,
+        -2,   -2,   -1,   -1,   0};
 
 static const int8_t effect_4[] = {
-    0,    0,    0,    0,    0,    1,    1,    1,    1,    1,    1,    2,
-    2,    2,    3,    3,    4,    4,    5,    6,    7,    8,    9,    10,
-    12,   13,   15,   17,   19,   22,   25,   28,   32,   37,   42,   48,
-    55,   62,   70,   79,   86,   92,   97,   102,  107,  110,  113,  115,
-    117,  119,  121,  121,  123,  123,  123,  124,  124,  124,  123,  123,
-    123,  121,  121,  121,  119,  119,  118,  117,  115,  114,  113,  112,
-    110,  109,  107,  106,  105,  102,  101,  99,   97,   95,   93,   91,
-    89,   86,   83,   80,   77,   73,   69,   64,   60,   54,   48,   41,
-    33,   24,   14,   3,    -9,   -23,  -38,  -52,  -65,  -75,  -84,  -92,
-    -99,  -104, -109, -113, -115, -119, -120, -122, -122, -123, -122, -122,
-    -121, -120, -119, -118, -116, -114, -112, -110, -107, -105, -102, -99,
-    -97,  -94,  -91,  -88,  -85,  -82,  -79,  -76,  -74,  -70,  -68,  -64,
-    -61,  -58,  -55,  -52,  -49,  -46,  -43,  -39,  -36,  -33,  -29,  -26,
-    -22,  -18,  -14,  -10,  -5,   0,    7,    13,   20,   28,   35,   42,
-    48,   53,   58,   60,   63,   65,   66,   67,   68,   68,   67,   67,
-    66,   64,   62,   61,   58,   56,   53,   51,   48,   45,   42,   38,
-    35,   33,   28,   26,   22,   19,   15,   12,   8,    5,    1,    -2,
-    -5,   -9,   -12,  -14,  -17,  -20,  -22,  -25,  -28,  -29,  -30,  -32,
-    -32,  -34,  -34,  -34,  -33,  -33,  -31,  -29,  -27,  -24,  -20,  -16,
-    -10,  -3,   3,    9,    14,   19,   24,   27,   32,   35,   38,   42,
-    45,   48,   51,   54,   57,   59,   62,   65,   68,   70,   73,   76,
-    78,   80,   84,   86,   88,   91,   94,   97,   99,   102,  104,  107,
-    109,  111,  114,  116,  118,  120,  121,  123,  124,  125,  126,  127,
-    127,  127,  127,  127,  125,  124,  123,  120,  117,  113,  108,  102,
-    96,   88,   79,   69,   57,   44,   31,   20,   10,   2,    -6,   -13,
-    -19,  -24,  -29,  -33,  -37,  -41,  -44,  -47,  -49,  -52,  -54,  -56,
-    -58,  -59,  -61,  -62,  -64,  -66,  -66,  -67,  -68,  -69,  -70,  -71,
-    -72,  -73,  -74,  -75,  -76,  -77,  -77,  -78,  -78,  -79,  -79,  -80,
-    -80,  -80,  -80,  -80,  -80,  -80,  -80,  -79,  -79,  -78,  -77,  -75,
-    -74,  -72,  -70,  -67,  -64,  -61,  -56,  -52,  -46,  -41,  -36,  -31,
-    -27,  -24,  -21,  -18,  -16,  -14,  -12,  -11,  -9,   -8,   -7,   -6,
-    -6,   -5,   -4,   -4,   -3,   -3,   -3,   -3,   -2,   -2,   -2,   -2,
-    -2,   -2,   -2,   -1,   0,    0,    0,    0,    0,    0,    0
-};
+        0,    0,    0,    0,    0,    1,    1,    1,    1,    1,    1,    2,    2,    2,    3,
+        3,    4,    4,    5,    6,    7,    8,    9,    10,   12,   13,   15,   17,   19,   22,
+        25,   28,   32,   37,   42,   48,   55,   62,   70,   79,   86,   92,   97,   102,  107,
+        110,  113,  115,  117,  119,  121,  121,  123,  123,  123,  124,  124,  124,  123,  123,
+        123,  121,  121,  121,  119,  119,  118,  117,  115,  114,  113,  112,  110,  109,  107,
+        106,  105,  102,  101,  99,   97,   95,   93,   91,   89,   86,   83,   80,   77,   73,
+        69,   64,   60,   54,   48,   41,   33,   24,   14,   3,    -9,   -23,  -38,  -52,  -65,
+        -75,  -84,  -92,  -99,  -104, -109, -113, -115, -119, -120, -122, -122, -123, -122, -122,
+        -121, -120, -119, -118, -116, -114, -112, -110, -107, -105, -102, -99,  -97,  -94,  -91,
+        -88,  -85,  -82,  -79,  -76,  -74,  -70,  -68,  -64,  -61,  -58,  -55,  -52,  -49,  -46,
+        -43,  -39,  -36,  -33,  -29,  -26,  -22,  -18,  -14,  -10,  -5,   0,    7,    13,   20,
+        28,   35,   42,   48,   53,   58,   60,   63,   65,   66,   67,   68,   68,   67,   67,
+        66,   64,   62,   61,   58,   56,   53,   51,   48,   45,   42,   38,   35,   33,   28,
+        26,   22,   19,   15,   12,   8,    5,    1,    -2,   -5,   -9,   -12,  -14,  -17,  -20,
+        -22,  -25,  -28,  -29,  -30,  -32,  -32,  -34,  -34,  -34,  -33,  -33,  -31,  -29,  -27,
+        -24,  -20,  -16,  -10,  -3,   3,    9,    14,   19,   24,   27,   32,   35,   38,   42,
+        45,   48,   51,   54,   57,   59,   62,   65,   68,   70,   73,   76,   78,   80,   84,
+        86,   88,   91,   94,   97,   99,   102,  104,  107,  109,  111,  114,  116,  118,  120,
+        121,  123,  124,  125,  126,  127,  127,  127,  127,  127,  125,  124,  123,  120,  117,
+        113,  108,  102,  96,   88,   79,   69,   57,   44,   31,   20,   10,   2,    -6,   -13,
+        -19,  -24,  -29,  -33,  -37,  -41,  -44,  -47,  -49,  -52,  -54,  -56,  -58,  -59,  -61,
+        -62,  -64,  -66,  -66,  -67,  -68,  -69,  -70,  -71,  -72,  -73,  -74,  -75,  -76,  -77,
+        -77,  -78,  -78,  -79,  -79,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -79,  -79,
+        -78,  -77,  -75,  -74,  -72,  -70,  -67,  -64,  -61,  -56,  -52,  -46,  -41,  -36,  -31,
+        -27,  -24,  -21,  -18,  -16,  -14,  -12,  -11,  -9,   -8,   -7,   -6,   -6,   -5,   -4,
+        -4,   -3,   -3,   -3,   -3,   -2,   -2,   -2,   -2,   -2,   -2,   -2,   -1,   0,    0,
+        0,    0,    0,    0,    0};
 
 static const struct effect_stream effects[] = {
-    {
-        /* CLICK */
-        .effect_id = 0,
-        .data = effect_2,
-        .length = ARRAY_SIZE(effect_2),
-        .play_rate_hz = 24000,
-    },
+        {
+                /* CLICK */
+                .effect_id = 0,
+                .data = effect_2,
+                .length = ARRAY_SIZE(effect_2),
+                .play_rate_hz = 24000,
+        },
 
-    {
-        /* DOUBLE_CLICK */
-        .effect_id = 1,
-        .data = effect_1,
-        .length = ARRAY_SIZE(effect_1),
-        .play_rate_hz = 24000,
-    },
+        {
+                /* DOUBLE_CLICK */
+                .effect_id = 1,
+                .data = effect_1,
+                .length = ARRAY_SIZE(effect_1),
+                .play_rate_hz = 24000,
+        },
 
-    {
-        /* TICK */
-        .effect_id = 2,
-        .data = effect_2,
-        .length = ARRAY_SIZE(effect_2),
-        .play_rate_hz = 24000,
-    },
+        {
+                /* TICK */
+                .effect_id = 2,
+                .data = effect_2,
+                .length = ARRAY_SIZE(effect_2),
+                .play_rate_hz = 24000,
+        },
 
-    {
-        /* THUD */
-        .effect_id = 3,
-        .data = effect_3,
-        .length = ARRAY_SIZE(effect_3),
-        .play_rate_hz = 24000,
-    },
+        {
+                /* THUD */
+                .effect_id = 3,
+                .data = effect_3,
+                .length = ARRAY_SIZE(effect_3),
+                .play_rate_hz = 24000,
+        },
 
-    {
-        /* POP */
-        .effect_id = 4,
-        .data = effect_4,
-        .length = ARRAY_SIZE(effect_4),
-        .play_rate_hz = 24000,
-    },
+        {
+                /* POP */
+                .effect_id = 4,
+                .data = effect_4,
+                .length = ARRAY_SIZE(effect_4),
+                .play_rate_hz = 24000,
+        },
 
-    {
-        /* HEAVY_CLICK */
-        .effect_id = 5,
-        .data = effect_3,
-        .length = ARRAY_SIZE(effect_3),
-        .play_rate_hz = 24000,
-    },
+        {
+                /* HEAVY_CLICK */
+                .effect_id = 5,
+                .data = effect_3,
+                .length = ARRAY_SIZE(effect_3),
+                .play_rate_hz = 24000,
+        },
 };

aidl/vibrator/qti/effect/effect.h

@@ -32,12 +32,12 @@
 #include <sys/types.h>
 
 struct effect_stream {
-    uint32_t   	    effect_id;
-    uint32_t        length;
-    uint32_t        play_rate_hz;
-    const int8_t    *data;
+    uint32_t effect_id;
+    uint32_t length;
+    uint32_t play_rate_hz;
+    const int8_t* data;
 };
 
-const struct effect_stream *get_effect_stream(uint32_t effect_id);
+const struct effect_stream* get_effect_stream(uint32_t effect_id);
 
 #endif

aidl/vibrator/qti/include/Vibrator.h

@@ -37,9 +37,9 @@ namespace hardware {
 namespace vibrator {
 
 class InputFFDevice {
-public:
+  public:
     InputFFDevice();
-    int playEffect(int effectId, EffectStrength es, long *playLengthMs);
+    int playEffect(int effectId, EffectStrength es, long* playLengthMs);
     int on(int32_t timeoutMs);
     int off();
     int setAmplitude(uint8_t amplitude);
@@ -47,36 +47,37 @@ public:
     bool mSupportEffects;
     bool mSupportExternalControl;
     bool mInExternalControl;
-private:
-    int play(int effectId, uint32_t timeoutMs, long *playLengthMs);
+
+  private:
+    int play(int effectId, uint32_t timeoutMs, long* playLengthMs);
     int mVibraFd;
     int16_t mCurrAppId;
     int16_t mCurrMagnitude;
 };
 
 class LedVibratorDevice {
-public:
+  public:
     LedVibratorDevice();
     int on(int32_t timeoutMs);
     int onWaveform(int waveformIndex);
     int off();
     bool mDetected;
-    int write_value(const char *file, const char *value);
-    int write_value(const char *file, int value);
+    int write_value(const char* file, const char* value);
+    int write_value(const char* file, int value);
 };
 
 class Vibrator : public BnVibrator {
-public:
+  public:
     class InputFFDevice ff;
     class LedVibratorDevice ledVib;
 
     ndk::ScopedAStatus getCapabilities(int32_t* _aidl_return) override;
     ndk::ScopedAStatus off() override;
     ndk::ScopedAStatus on(int32_t timeoutMs,
-            const std::shared_ptr<IVibratorCallback>& callback) override;
+                          const std::shared_ptr<IVibratorCallback>& callback) override;
     ndk::ScopedAStatus perform(Effect effect, EffectStrength strength,
-            const std::shared_ptr<IVibratorCallback>& callback,
-            int32_t* _aidl_return) override;
+                               const std::shared_ptr<IVibratorCallback>& callback,
+                               int32_t* _aidl_return) override;
     ndk::ScopedAStatus getSupportedEffects(std::vector<Effect>* _aidl_return) override;
     ndk::ScopedAStatus setAmplitude(float amplitude) override;
     ndk::ScopedAStatus setExternalControl(bool enabled) override;

aidl/vibrator/richtap/Vibrator.cpp

@@ -143,7 +143,7 @@ ndk::ScopedAStatus Vibrator::getCompositionSizeMax(int32_t* maxSize __unused) {
 }
 
 ndk::ScopedAStatus Vibrator::getSupportedPrimitives(
-    std::vector<CompositePrimitive>* supported __unused) {
+        std::vector<CompositePrimitive>* supported __unused) {
     return ndk::ScopedAStatus::ok();
 }
 
@@ -157,7 +157,8 @@ ndk::ScopedAStatus Vibrator::compose(const std::vector<CompositeEffect>& composi
     return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION));
 }
 
-ndk::ScopedAStatus Vibrator::getSupportedAlwaysOnEffects(std::vector<Effect>* _aidl_return __unused) {
+ndk::ScopedAStatus Vibrator::getSupportedAlwaysOnEffects(
+        std::vector<Effect>* _aidl_return __unused) {
     return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION));
 }
 
@@ -203,7 +204,8 @@ ndk::ScopedAStatus Vibrator::getSupportedBraking(std::vector<Braking>* supported
 }
 
 ndk::ScopedAStatus Vibrator::composePwle(const std::vector<PrimitivePwle>& composite __unused,
-                                         const std::shared_ptr<IVibratorCallback>& callback __unused) {
+                                         const std::shared_ptr<IVibratorCallback>& callback
+                                                 __unused) {
     return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION));
 }
 

audio_amplifier/audio_amplifier.c

@@ -5,7 +5,7 @@
  */
 
 #define LOG_TAG "audio_amplifier"
-//#define LOG_NDEBUG 0
+// #define LOG_NDEBUG 0
 
 #include <cutils/str_parms.h>
 #include <dlfcn.h>

dolby/Android.bp

@@ -0,0 +1,28 @@
+//
+// Copyright (C) 2017-2021 The LineageOS Project
+//           (C) 2023-24 Paranoid Android
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+android_app {
+    name: "OplusDolby",
+
+    srcs: ["src/**/*.kt"],
+    resource_dirs: ["res"],
+    certificate: "platform",
+    platform_apis: true,
+    system_ext_specific: true,
+    privileged: true,
+
+    overrides: ["MusicFX"],
+    static_libs: [
+        "SettingsLib",
+        "SpaLib",
+        "androidx.activity_activity-compose",
+        "androidx.compose.material3_material3",
+        "androidx.compose.runtime_runtime",
+        "androidx.preference_preference",
+        "org.lineageos.settings.resources",
+    ],
+}

dolby/AndroidManifest.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2023-24 Paranoid Android
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="co.aospa.dolby.oplus"
+    android:sharedUserId="android.uid.system">
+
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+    <application
+        android:icon="@mipmap/ic_launcher"
+        android:allowBackup="false"
+        android:label="@string/dolby_title"
+        android:persistent="true">
+
+        <receiver
+            android:name=".BootCompletedReceiver"
+            android:exported="true">
+            <intent-filter android:priority="1000">
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
+        <activity
+            android:name=".DolbyActivity"
+            android:label="@string/dolby_title"
+            android:theme="@style/Theme.SubSettingsBase"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.settings.action.IA_SETTINGS" />
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.media.action.DISPLAY_AUDIO_EFFECT_CONTROL_PANEL" />
+                <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"
+                       android:value="content://co.aospa.dolby.oplus.summary/dolby" />
+        </activity>
+
+        <activity
+            android:name=".geq.EqualizerActivity"
+            android:label="@string/dolby_preset"
+            android:theme="@style/Theme.SubSettingsBase"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name=".DolbyTileService"
+            android:icon="@drawable/ic_dolby_qs"
+            android:label="@string/dolby_title"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+            </intent-filter>
+        </service>
+
+        <provider
+            android:name=".SummaryProvider"
+            android:authorities="co.aospa.dolby.oplus.summary">
+        </provider>
+
+    </application>
+</manifest>
+

dolby/dolby.mk

@@ -0,0 +1,5 @@
+# DolbyManager
+PRODUCT_PACKAGES += \
+    OplusDolby
+
+BOARD_VENDOR_SEPOLICY_DIRS += hardware/oplus/sepolicy/qti/dolby

dolby/res/drawable/ic_dolby.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24" android:tint="?android:attr/colorControlNormal">
+    <path android:fillColor="#000000" android:pathData="M1,4.0214C2.2767,4.0743 3.5798,3.9866 4.8252,4.2063C8.8352,4.9133 11.4129,8.3489 11.0507,12.3402C10.7124,16.0695 7.3661,18.9511 3.3484,18.9651C2.5657,18.9678 1.7827,18.9441 1,18.9324L1,4.0214Z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <group>
+        <clip-path android:pathData="M12.9332,4l10.0668,0l0,15l-10.0668,0z"/>
+        <path android:fillColor="#000000" android:pathData="M23,4.0924L23,18.8825C19.4973,19.298 16.399,18.6968 14.3366,15.6947C12.5148,13.043 12.4594,10.2265 14.2129,7.5241C16.244,4.394 19.3953,3.7204 23,4.0924" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
+    </group>
+</vector>

dolby/res/drawable/ic_dolby_qs.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#191c1e" android:pathData="M1,4.0214C2.2767,4.0743 3.5798,3.9866 4.8252,4.2063C8.8352,4.9133 11.4129,8.3489 11.0507,12.3402C10.7124,16.0695 7.3661,18.9511 3.3484,18.9651C2.5657,18.9678 1.7827,18.9441 1,18.9324L1,4.0214Z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <group>
+        <clip-path android:pathData="M12.9332,4l10.0668,0l0,15l-10.0668,0z"/>
+        <path android:fillColor="#191c1e" android:pathData="M23,4.0924L23,18.8825C19.4973,19.298 16.399,18.6968 14.3366,15.6947C12.5148,13.043 12.4594,10.2265 14.2129,7.5241C16.244,4.394 19.3953,3.7204 23,4.0924" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
+    </group>
+</vector>

dolby/res/drawable/ic_ieq_balanced.xml

@@ -0,0 +1,24 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="192"
+    android:viewportHeight="192"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 69.584 66.547 L 63.792 70.797 L 38.646 71.697 L 13.5 72.597 L 13.5 89.723 C 13.5 99.143 13.865 111.999 14.313 118.292 L 15.124 129.734 L 178.5 129.734 L 178.5 102.234 L 121.248 102.234 L 99.203 82.234 C 87.078 71.234 76.756 62.248 76.266 62.266 C 75.776 62.282 72.769 64.209 69.584 66.547"
+        android:strokeWidth="1.25"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 69.125 67.065 L 62.875 71.921 L 38.188 71.99 L 13.5 72.06 L 13.504 81.122 C 13.506 86.106 13.876 99.044 14.325 109.872 L 15.141 129.56 L 178.5 129.56 L 178.5 103.31 L 122.126 103.31 L 99.675 82.997 C 87.326 71.826 76.808 62.577 76.299 62.446 C 75.791 62.315 72.563 64.394 69.125 67.065"
+        android:strokeWidth="1.25"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 69.854 67.249 L 63.237 72.187 L 13.311 72.187 L 14.119 84.374 C 14.562 91.077 14.929 104.016 14.932 113.124 L 14.939 129.687 L 178.689 129.687 L 178.689 103.437 L 150.251 103.428 L 121.814 103.418 L 99.143 82.865 L 76.471 62.313 L 69.854 67.249"
+        android:strokeWidth="1.25"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 69.141 67.266 L 63.221 71.609 L 45.888 71.609 C 36.354 71.609 25.238 71.956 21.184 72.378 L 13.813 73.147 L 14.115 93.316 C 14.281 104.408 14.748 117.001 15.151 121.297 L 15.886 129.109 L 178.188 129.109 L 178.188 102.859 L 120.703 102.859 L 98.696 82.859 C 86.594 71.859 76.324 62.873 75.876 62.891 C 75.429 62.907 72.399 64.876 69.141 67.266"
+        android:strokeWidth="1.25"/>
+</vector>