zenfone8: zenfone6 --> zenfone8
diff --git a/Android.mk b/Android.mk
index cc75bcb..2a31127 100755
--- a/Android.mk
+++ b/Android.mk
@@ -27,7 +27,7 @@
LOCAL_PATH := $(call my-dir)
-ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),zenfone6))
+ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),zenfone8))
include $(CLEAR_VARS)
HELPER_LIBS := libsystemhelper_jni.so
diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index b5f3a09..ed61ca8 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -16,6 +16,6 @@
LOCAL_PATH := $(call my-dir)
-ifneq ($(filter zenfone6,$(TARGET_DEVICE)),)
+ifneq ($(filter zenfone8,$(TARGET_DEVICE)),)
include $(call all-makefiles-under,$(LOCAL_PATH))
endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index fda8653..037498c 100755
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,8 +1,8 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/device.mk \
- $(LOCAL_DIR)/omni_zenfone6.mk
+ $(LOCAL_DIR)/omni_zenfone8.mk
COMMON_LUNCH_CHOICES := \
- omni_zenfone6-user \
- omni_zenfone6-userdebug \
- omni_zenfone6-eng
\ No newline at end of file
+ omni_zenfone8-user \
+ omni_zenfone8-userdebug \
+ omni_zenfone8-eng
\ No newline at end of file
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6713ec5..2d4db1f 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -18,44 +18,57 @@
# device-specific aspects (drivers) with a device-agnostic
# product configuration (apps).
#
-DEVICE_PATH := device/asus/zenfone6
+DEVICE_PATH := device/asus/zenfone8
BOARD_VENDOR := asus
+# A/B
+AB_OTA_UPDATER := true
+
+AB_OTA_PARTITIONS += \
+ boot \
+ dtbo \
+ product \
+ system \
+ system_ext \
+ vbmeta \
+ vbmeta_system
+
# Architecture
TARGET_ARCH := arm64
TARGET_ARCH_VARIANT := armv8-a
TARGET_CPU_ABI := arm64-v8a
TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := generic
-TARGET_CPU_VARIANT_RUNTIME := kryo385
+TARGET_CPU_VARIANT := kryo300
TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv8-a
+TARGET_2ND_ARCH_VARIANT := armv8-2a
TARGET_2ND_CPU_ABI := armeabi-v7a
TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_CPU_VARIANT := generic
-TARGET_CPU_VARIANT_RUNTIME := kryo385
+TARGET_2ND_CPU_VARIANT := cortex-a75
-TARGET_USES_64_BIT_BINDER := true
-
-ENABLE_CPUSETS := true
-ENABLE_SCHEDBOOST := true
+# Bluetooth
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
# Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := msmnile
+TARGET_BOOTLOADER_BOARD_NAME := lahaina
TARGET_NO_BOOTLOADER := true
# A/B
BOARD_AVB_ENABLE := true
BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2
+BOARD_AVB_VBMETA_SYSTEM := system
+BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
+BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
+BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 2
# ANT+
BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
# Audio
-USE_CUSTOM_AUDIO_POLICY := 1
+#USE_CUSTOM_AUDIO_POLICY := 1
USE_XML_AUDIO_POLICY_CONF := 1
AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := true
AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true
@@ -64,14 +77,8 @@
AUDIO_FEATURE_ENABLED_RECORD_PLAY_CONCURRENCY := true
AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY := true
-# Bluetooth
-BOARD_HAVE_BLUETOOTH := true
-BOARD_HAVE_BLUETOOTH_QCOM := true
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
-QCOM_BT_USE_BTNV := true
-
# charger
-HEALTHD_USE_BATTERY_INFO := true
+BOARD_CHARGER_DISABLE_INIT_BLANK := true
# Dex
ifeq ($(HOST_OS),linux)
@@ -89,10 +96,6 @@
# Filesystem
TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs
-# FM
-BOARD_HAS_QCA_FM_SOC := "cherokee"
-BOARD_HAVE_QCOM_FM := true
-
# Global
BOARD_USES_QCOM_HARDWARE := true
TARGET_SPECIFIC_HEADER_PATH := $(DEVICE_PATH)/include
@@ -106,55 +109,81 @@
DEVICE_FRAMEWORK_MANIFEST_FILE += $(DEVICE_PATH)/framework_manifest.xml
# Kernel
-BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 earlycon=msm_geni_serial,0xa90000 androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 swiotlb=2048 loop.max_part=7 androidboot.usbcontroller=a600000.dwc3
+BOARD_BOOT_HEADER_VERSION := 3
+BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
+BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 androidboot.usbcontroller=a600000.dwc3 swiotlb=0 loop.max_part=7 cgroup.memory=nokmem,nosocket pcie_ports=compat loop.max_part=7 iptable_raw.raw_before_defrag=1 ip6table_raw.raw_before_defrag=1
#BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
BOARD_KERNEL_PAGESIZE := 4096
BOARD_KERNEL_BASE := 0x00000000
-BOARD_KERNEL_TAGS_OFFSET := 0x00008000
-BOARD_RAMDISK_OFFSET := 0x01000000
-BOARD_TAGS_OFFSET := 0x00000100
TARGET_KERNEL_ARCH := arm64
TARGET_KERNEL_HEADER_ARCH := arm64
-BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
+BOARD_KERNEL_IMAGE_NAME := Image
TARGET_COMPILE_WITH_MSM_KERNEL := true
-TARGET_KERNEL_SOURCE := kernel/asus/sm8150
-TARGET_KERNEL_CONFIG := vendor/zs630kl_defconfig
+TARGET_KERNEL_CONFIG := vendor/zf8_defconfig
+TARGET_KERNEL_SOURCE := kernel/asus/sm8350
+BOARD_INCLUDE_DTB_IN_BOOTIMG := true
BOARD_KERNEL_SEPARATED_DTBO := true
TARGET_KERNEL_CLANG_COMPILE := true
-BOARD_BOOT_HEADER_VERSION := 1
-BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
TARGET_KERNEL_ADDITIONAL_FLAGS := DTC_EXT=$(shell pwd)/prebuilts/misc/linux-x86/dtc/dtc
+# NFC
+TARGET_USES_NQ_NFC := true
+
# Partitions
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
+ifneq ($(ROM_BUILDTYPE),$(filter $(ROM_BUILDTYPE),GAPPS MICROG))
+BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 1258291200
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 1258291200
+BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE := 1258291200
+endif
+
+BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296
BOARD_DTBOIMG_PARTITION_SIZE := 8388608
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3758096384
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 118112366592
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 495457218560
+BOARD_VENDORIMAGE_PARTITION_SIZE := 1280151552
BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64)
BOARD_USES_METADATA_PARTITION := true
+TARGET_COPY_OUT_ODM := odm
+TARGET_COPY_OUT_PRODUCT := product
+TARGET_COPY_OUT_SYSTEM_EXT := system_ext
TARGET_COPY_OUT_VENDOR := vendor
-BOARD_ROOT_EXTRA_FOLDERS := ADF APD asdf batinfo xrom
+BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST := \
+ system \
+ system_ext \
+ product
+BOARD_QTI_DYNAMIC_PARTITIONS_SIZE := 6438256640
+BOARD_SUPER_PARTITION_GROUPS := qti_dynamic_partitions
+BOARD_SUPER_PARTITION_SIZE := 6238515724
+
+
+BOARD_ROOT_EXTRA_FOLDERS += ADF APD asdf batinfo
# Platform
-TARGET_BOARD_PLATFORM := msmnile
-TARGET_BOARD_PLATFORM_GPU := qcom-adreno640
+TARGET_BOARD_PLATFORM := lahaina
+TARGET_BOARD_PLATFORM_GPU := qcom-adreno660
+
+# Properties
+TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
# Recovery
BOARD_USES_RECOVERY_AS_BOOT := true
TARGET_NO_RECOVERY := true
TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/recovery.fstab
TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
-TARGET_USERIMAGES_USE_EXT4 := true
-TARGET_USERIMAGES_USE_F2FS := true
-TARGET_USES_MKE2FS := true
+BOARD_AVB_RECOVERY_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
+BOARD_AVB_RECOVERY_ALGORITHM := SHA256_RSA4096
+BOARD_AVB_RECOVERY_ROLLBACK_INDEX := 1
+BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1
# Sepolicy
include vendor/omni/sepolicy/sepolicy.mk
-include $(DEVICE_PATH)/sepolicy/SEPolicy.mk
-BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(DEVICE_PATH)/sepolicy/private \
- $(DEVICE_PATH)/sepolicy/qva/private
+include device/qcom/sepolicy/SEPolicy.mk
+
+BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(DEVICE_PATH)/sepolicy/private
PRODUCT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/product/private
# Treble
diff --git a/OmniDisplayManager/Android.mk b/OmniDisplayManager/Android.mk
deleted file mode 100644
index ba28cbd..0000000
--- a/OmniDisplayManager/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (C) 2018 The OmniROM Project
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := OmniDisplayManager
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_USE_AAPT2 := true
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- androidx.core_core \
- androidx.preference_preference
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_DEX_PREOPT := false
-
-include packages/apps/OmniLib/common.mk
-
-include $(BUILD_PACKAGE)
diff --git a/OmniDisplayManager/AndroidManifest.xml b/OmniDisplayManager/AndroidManifest.xml
deleted file mode 100644
index 02edc69..0000000
--- a/OmniDisplayManager/AndroidManifest.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (C) 2017 The OmniROM Project
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.omnirom.omnidisplaymanager"
- android:versionCode="1"
- android:versionName="1.0"
- android:sharedUserId="android.uid.system" >
-
- <uses-sdk
- android:minSdkVersion="28"
- android:targetSdkVersion="28" />
-
- <uses-permission android:name="android.permission.HARDWARE_TEST" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
- <application
- android:label="@string/app_name"
- android:icon="@drawable/omnirom_logo"
- android:theme="@style/AppTheme" >
- <activity
- android:name="org.omnirom.omnidisplaymanager.ColorSettingsActivity"
- android:label="@string/app_name"
- android:launchMode="singleInstance" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
-
- <receiver android:name="org.omnirom.omnidisplaymanager.Startup" >
- <intent-filter android:priority="100" >
- <action android:name="android.intent.action.BOOT_COMPLETED" />
- </intent-filter>
- </receiver>
-
- <service
- android:name=".DisplayManagerTileService"
- android:icon="@drawable/ic_settings_displaymanager"
- android:label="@string/display_manager_tile"
- android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
- <intent-filter>
- <action
- android:name="android.service.quicksettings.action.QS_TILE"/>
- </intent-filter>
- </service>
-
- <service
- android:name=".ReadingModeTileService"
- android:icon="@drawable/ic_tile_reading_mode"
- android:label="@string/reading_mode_title"
- android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
- <intent-filter>
- <action
- android:name="android.service.quicksettings.action.QS_TILE"/>
- </intent-filter>
- </service>
- </application>
-</manifest>
diff --git a/OmniDisplayManager/proguard.flags b/OmniDisplayManager/proguard.flags
deleted file mode 100644
index 276720f..0000000
--- a/OmniDisplayManager/proguard.flags
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a configuration file for ProGuard.
-# http://proguard.sourceforge.net/index.html#manual/usage.html
-
diff --git a/OmniDisplayManager/res/drawable-nodpi/header_image.jpeg b/OmniDisplayManager/res/drawable-nodpi/header_image.jpeg
deleted file mode 100644
index b97f849..0000000
--- a/OmniDisplayManager/res/drawable-nodpi/header_image.jpeg
+++ /dev/null
Binary files differ
diff --git a/OmniDisplayManager/res/drawable/ic_settings_backup_restore.xml b/OmniDisplayManager/res/drawable/ic_settings_backup_restore.xml
deleted file mode 100644
index 1276fda..0000000
--- a/OmniDisplayManager/res/drawable/ic_settings_backup_restore.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="@android:color/white"
- android:pathData="M12,3A9,9 0 0,0 3,12H0L4,16L8,12H5A7,7 0 0,1 12,5A7,7 0 0,1 19,12A7,7 0 0,1 12,19C10.5,19 9.09,18.5 7.94,17.7L6.5,19.14C8.04,20.3 9.94,21 12,21A9,9 0 0,0 21,12A9,9 0 0,0 12,3M14,12A2,2 0 0,0 12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12Z" />
-</vector>
diff --git a/OmniDisplayManager/res/drawable/ic_settings_displaymanager.xml b/OmniDisplayManager/res/drawable/ic_settings_displaymanager.xml
deleted file mode 100644
index 125dd8e..0000000
--- a/OmniDisplayManager/res/drawable/ic_settings_displaymanager.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24"
- android:tint="?android:attr/colorControlNormal">
- <path
- android:fillColor="#ffffff"
- android:pathData="M9,1C7.9,1 7,1.9 7,3L7,6L9,6L9,4L19,4L19,20L9,20L9,18L7,18L7,21C7,22.1 7.9,23 9,23L19,23C20.1,23 21,22.1 21,21L21,3C21,1.9 20.1,1 19,1L9,1zM9.2012,7.2773C9.2172,7.2882 9.2333,7.299 9.25,7.3086C9.2496,7.3064 9.2504,7.3049 9.25,7.3027C9.2334,7.2948 9.2179,7.285 9.2012,7.2773zM7.8906,7.7676C7.8889,7.7679 7.8865,7.7692 7.8848,7.7695C7.8991,7.7699 7.9152,7.7692 7.9297,7.7695C7.9162,7.7684 7.9023,7.7653 7.8906,7.7676zM10.4492,8.3516C10.4479,8.3522 10.4466,8.3529 10.4453,8.3535C10.4497,8.357 10.4546,8.3598 10.459,8.3633C10.4563,8.359 10.4519,8.3559 10.4492,8.3516zM6.4961,9.0586C6.4955,9.0621 6.4948,9.0625 6.4941,9.0664C6.4935,9.0673 6.4945,9.0725 6.4941,9.0742C6.5031,9.0765 6.513,9.0783 6.5195,9.0801C6.513,9.0725 6.5041,9.0667 6.4961,9.0586zM6.6172,12.7051C6.6172,12.7012 6.6142,12.713 6.6133,12.7168C6.6132,12.7189 6.6133,12.7206 6.6133,12.7227C6.6144,12.7172 6.6172,12.7107 6.6172,12.7051zM6.7227,13.0742C6.7256,13.0779 6.7275,13.0823 6.7305,13.0859C6.7481,13.1073 6.7344,13.0887 6.7363,13.0898C6.7336,13.0861 6.7325,13.0804 6.7285,13.0781C6.7265,13.077 6.7247,13.0754 6.7227,13.0742zM6.2578,14.2461C6.2575,14.2474 6.2562,14.2486 6.2559,14.25C6.2574,14.2491 6.2579,14.2481 6.2598,14.248L6.2578,14.2461zM8.2695,14.5508C8.2869,14.5431 8.2327,14.5637 8.2148,14.5703C8.2324,14.5627 8.2439,14.5638 8.2559,14.5586C8.2648,14.5548 8.2581,14.5558 8.2695,14.5508z"/>
- <path
- android:fillColor="#ffffff"
- android:pathData="m7.7662,6.299c-3.1036,0 -5.6203,2.5166 -5.6203,5.6203 0,3.1036 2.5166,5.6203 5.6203,5.6203 0.5183,0 0.9367,-0.4184 0.9367,-0.9367 0,-0.2435 -0.0937,-0.4621 -0.2435,-0.6307 -0.1436,-0.1624 -0.2373,-0.3809 -0.2373,-0.6182 0,-0.5183 0.4184,-0.9367 0.9367,-0.9367l1.1053,0c1.7235,0 3.1224,-1.3988 3.1224,-3.1224 0,-2.7602 -2.5166,-4.9958 -5.6203,-4.9958zM4.3316,11.9193c-0.5183,0 -0.9367,-0.4184 -0.9367,-0.9367 0,-0.5183 0.4184,-0.9367 0.9367,-0.9367 0.5183,0 0.9367,0.4184 0.9367,0.9367 0,0.5183 -0.4184,0.9367 -0.9367,0.9367zM6.205,9.4214c-0.5183,0 -0.9367,-0.4184 -0.9367,-0.9367 0,-0.5183 0.4184,-0.9367 0.9367,-0.9367 0.5183,0 0.9367,0.4184 0.9367,0.9367 0,0.5183 -0.4184,0.9367 -0.9367,0.9367zM9.3274,9.4214c-0.5183,0 -0.9367,-0.4184 -0.9367,-0.9367 0,-0.5183 0.4184,-0.9367 0.9367,-0.9367 0.5183,0 0.9367,0.4184 0.9367,0.9367 0,0.5183 -0.4184,0.9367 -0.9367,0.9367zM11.2008,11.9193c-0.5183,0 -0.9367,-0.4184 -0.9367,-0.9367 0,-0.5183 0.4184,-0.9367 0.9367,-0.9367 0.5183,0 0.9367,0.4184 0.9367,0.9367 0,0.5183 -0.4184,0.9367 -0.9367,0.9367z"/>
-</vector>
diff --git a/OmniDisplayManager/res/drawable/ic_tile_reading_mode.xml b/OmniDisplayManager/res/drawable/ic_tile_reading_mode.xml
deleted file mode 100644
index 5846419..0000000
--- a/OmniDisplayManager/res/drawable/ic_tile_reading_mode.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="#ffffff"
- android:pathData="M21,5C19.89,4.65 18.67,4.5 17.5,4.5C15.55,4.5 13.45,4.9 12,6C10.55,4.9 8.45,4.5 6.5,4.5C4.55,4.5 2.45,4.9 1,6V20.65C1,20.9 1.25,21.15 1.5,21.15C1.6,21.15 1.65,21.1 1.75,21.1C3.1,20.45 5.05,20 6.5,20C8.45,20 10.55,20.4 12,21.5C13.35,20.65 15.8,20 17.5,20C19.15,20 20.85,20.3 22.25,21.05C22.35,21.1 22.4,21.1 22.5,21.1C22.75,21.1 23,20.85 23,20.6V6C22.4,5.55 21.75,5.25 21,5M21,18.5C19.9,18.15 18.7,18 17.5,18C15.8,18 13.35,18.65 12,19.5V8C13.35,7.15 15.8,6.5 17.5,6.5C18.7,6.5 19.9,6.65 21,7V18.5Z" />
-</vector>
diff --git a/OmniDisplayManager/res/drawable/omnirom_logo.xml b/OmniDisplayManager/res/drawable/omnirom_logo.xml
deleted file mode 100644
index 079afe6..0000000
--- a/OmniDisplayManager/res/drawable/omnirom_logo.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017 The OmniROM 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.
-*/
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="48dp"
- android:height="48dp"
- android:viewportWidth="512.000000"
- android:viewportHeight="512.000000">
-
- <group
- android:translateY="512.000000"
- android:scaleX="0.100000"
- android:scaleY="-0.100000">
- <path
- android:fillColor="#a1c729"
- android:strokeWidth="1"
- android:pathData="M1425 4703 c-526 -71 -929 -439 -1041 -953 -18 -80 -19 -149 -19 -1200 0 -1051 1
--1120 19 -1200 104 -475 461 -832 936 -936 80 -18 150 -19 1230 -19 1080 0 1150 1
-1230 19 475 104 832 461 936 936 18 80 19 149 19 1200 0 1051 -1 1120 -19 1200
--102 468 -444 816 -916 933 -84 21 -102 21 -1215 23 -621 1 -1143 0 -1160 -3z
-m2248 -578 c183 -39 350 -170 433 -342 66 -136 64 -102 62 -1243 l-3 -1030 -70 97
-c-134 186 -378 410 -571 524 -41 24 -74 47 -74 51 0 5 65 122 143 261 79 138 149
-262 155 273 10 20 7 24 -46 52 l-57 31 -159 -280 c-87 -153 -161 -279 -165 -279 -3
-0 -39 14 -80 30 -394 161 -889 172 -1301 29 -63 -22 -122 -43 -132 -46 -12 -4 -49
-54 -169 265 l-154 271 -57 -31 c-53 -28 -56 -32 -46 -52 6 -11 73 -131 150 -265 76
--134 138 -246 138 -250 0 -3 -38 -28 -84 -54 -134 -78 -252 -172 -386 -306 -69 -70
--156 -170 -195 -224 l-70 -97 -3 1030 c-2 1141 -4 1107 62 1243 82 170 249 303 428
-342 96 21 2153 21 2251 0z m-1880 -2429 c104 -43 127 -180 42 -255 -61 -53 -139
--53 -201 1 -128 112 2 320 159 254z m1630 0 c104 -43 127 -180 42 -255 -61 -53
--139 -53 -201 1 -128 112 2 320 159 254z" />
- </group>
-</vector>
diff --git a/OmniDisplayManager/res/layout/header_layout.xml b/OmniDisplayManager/res/layout/header_layout.xml
deleted file mode 100644
index 3022b5c..0000000
--- a/OmniDisplayManager/res/layout/header_layout.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2017 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.
- -->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="24dp"
- android:orientation="horizontal">
-
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scaleType="centerCrop"
- android:src="@drawable/header_image" />
-
-</LinearLayout>
diff --git a/OmniDisplayManager/res/layout/layout_preference_frame.xml b/OmniDisplayManager/res/layout/layout_preference_frame.xml
deleted file mode 100644
index eec3d7a..0000000
--- a/OmniDisplayManager/res/layout/layout_preference_frame.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
diff --git a/OmniDisplayManager/res/values/config.xml b/OmniDisplayManager/res/values/config.xml
deleted file mode 100644
index e991aac..0000000
--- a/OmniDisplayManager/res/values/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <bool name="display_mode_support">false</bool>
- <bool name="color_balance_support">false</bool>
-</resources>
diff --git a/OmniDisplayManager/res/values/custom_arrays.xml b/OmniDisplayManager/res/values/custom_arrays.xml
deleted file mode 100644
index 818fbd3..0000000
--- a/OmniDisplayManager/res/values/custom_arrays.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (C) 2013 The OmniROM Project
-
- Parts Copyright (C) 2012-2013 The CyanogenMod Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="adaptive_backlight_entries" translatable="false">
- <item>@string/adaptive_backlight_low</item>
- <item>@string/adaptive_backlight_medium</item>
- <item>@string/adaptive_backlight_hight</item>
- <item>@string/adaptive_backlight_auto</item>
- </string-array>
-
- <string-array name="adaptive_backlight_values" translatable="false">
- <item>0</item>
- <item>1</item>
- <item>2</item>
- <item>3</item>
- </string-array>
-</resources>
diff --git a/OmniDisplayManager/res/values/custom_strings.xml b/OmniDisplayManager/res/values/custom_strings.xml
deleted file mode 100644
index 0aa3811..0000000
--- a/OmniDisplayManager/res/values/custom_strings.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The OmniROM Project
-
- Parts Copyright (C) 2012-2013 The CyanogenMod Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name">Omni Display Management</string>
- <string name="title">Display colors</string>
- <string name="display_settings_title">Display</string>
- <string name="color_balance_title">Color balance</string>
- <string name="display_management_mode">Display mode</string>
- <string name="sunlight_enhancement_title">Sunlight Enhancement</string>
- <string name="adaptive_backlight_title">Adaptive Backlight</string>
- <string name="adaptive_backlight_low">Low</string>
- <string name="adaptive_backlight_medium">Medium</string>
- <string name="adaptive_backlight_hight">Hight</string>
- <string name="adaptive_backlight_auto">Auto</string>
- <string name="reading_mode_title">Reading mode</string>
- <string name="hue_title">Hue</string>
- <string name="saturation_title">Saturation</string>
- <string name="intensity_title">Intensity</string>
- <string name="contrast_title">Contrast</string>
- <string name="reset">Reset</string>
- <string name="display_manager_tile">Display colors</string>
-</resources>
diff --git a/OmniDisplayManager/res/values/styles.xml b/OmniDisplayManager/res/values/styles.xml
deleted file mode 100644
index ae909bd..0000000
--- a/OmniDisplayManager/res/values/styles.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014-2017 The OmniROM Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Settings">
- <item name="preferenceTheme">@style/PreferenceTheme</item>
- </style>
-
- <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">
- </style>
-</resources>
diff --git a/OmniDisplayManager/res/xml/display_management_settings.xml b/OmniDisplayManager/res/xml/display_management_settings.xml
deleted file mode 100644
index 2c248f9..0000000
--- a/OmniDisplayManager/res/xml/display_management_settings.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014-2016 The OmniROM 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.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/title">
-
- <org.omnirom.omnidisplaymanager.preferences.LayoutPreference
- android:key="header"
- android:layout="@layout/header_layout"
- android:selectable="false"/>
-
- <org.omnirom.omnidisplaymanager.preferences.ColorBalancePreference
- android:key="color_balance"
- android:title="@string/color_balance_title"
- android:dependency="reading_mode" />
-
- <org.omnirom.omnidisplaymanager.preferences.PictureAdjustmentPreference
- android:key="hue_value"
- adjustmentType="hue"
- android:title="@string/hue_title" />
-
- <org.omnirom.omnidisplaymanager.preferences.PictureAdjustmentPreference
- android:key="saturation_value"
- adjustmentType="saturation"
- android:title="@string/saturation_title" />
-
- <org.omnirom.omnidisplaymanager.preferences.PictureAdjustmentPreference
- android:key="intensity_value"
- adjustmentType="intensity"
- android:title="@string/intensity_title" />
-
- <org.omnirom.omnidisplaymanager.preferences.PictureAdjustmentPreference
- android:key="contrast_value"
- adjustmentType="contrast"
- android:title="@string/contrast_title" />
-
- <org.omnirom.omnidisplaymanager.preferences.SunlightVisibilityPreference
- android:key="sunlight_enhancement"
- android:title="@string/sunlight_enhancement_title" />
-
- <ListPreference
- android:key="display_management_mode"
- android:title="@string/display_management_mode"
- android:summary="%s"
- android:persistent="false" />
-
- <SwitchPreference
- android:key="reading_mode"
- android:title="@string/reading_mode_title"
- android:disableDependentsState="true" />
-</PreferenceScreen>
diff --git a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/ColorSettings.java b/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/ColorSettings.java
deleted file mode 100644
index 1a26643..0000000
--- a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/ColorSettings.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (C) 2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package org.omnirom.omnidisplaymanager;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.opengl.Matrix;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.Parcel;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceFragment;
-import androidx.preference.SwitchPreference;
-import android.os.ServiceManager;
-import android.provider.Settings;
-import android.provider.SearchIndexableResource;
-import android.util.SparseArray;
-import android.util.Slog;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.util.omni.DeviceUtils;
-
-import com.qti.snapdragon.sdk.display.ModeInfo;
-
-import org.omnirom.omnidisplaymanager.preferences.ColorBalancePreference;
-import org.omnirom.omnidisplaymanager.preferences.SunlightVisibilityPreference;
-import org.omnirom.omnidisplaymanager.preferences.PictureAdjustmentPreference;
-
-import java.util.List;
-import java.util.Arrays;
-
-public class ColorSettings extends PreferenceFragment implements Preference.OnPreferenceChangeListener {
- private static final String TAG = "DisplaySettings";
- private ListPreference mDisplayMode;
- private ListPreference mAdaptiveBacklightMode;
- private SwitchPreference mReadingMode;
-
- private static final String PREF_DISPLAY_MODE = "display_management_mode";
- private static final String PREF_COLOR_BALANCE = "color_balance";
- private static final String PREF_SVI = "sunlight_enhancement";
- public static final String PREF_READING_MODE = "reading_mode";
-
- private static final int LEVEL_COLOR_MATRIX_READING = 201;
-
- private static final SparseArray<float[]> mColorMatrix = new SparseArray<>(3);
- private static final int SURFACE_FLINGER_TRANSACTION_COLOR_MATRIX = 1015;
- private static final float[][] mTempColorMatrix = new float[2][16];
-
- private static final int MENU_RESET = Menu.FIRST;
-
- /**
- * Matrix and offset used for converting color to grayscale.
- * Copied from com.android.server.accessibility.DisplayAdjustmentUtils.MATRIX_GRAYSCALE
- */
- private static final float[] MATRIX_GRAYSCALE = new float[] {
- .2126f, .2126f, .2126f, 0,
- .7152f, .7152f, .7152f, 0,
- .0722f, .0722f, .0722f, 0,
- 0, 0, 0, 1
- };
-
- /** Full color matrix and offset */
- private static final float[] MATRIX_NORMAL = new float[] {
- 1, 0, 0, 0,
- 0, 1, 0, 0,
- 0, 0, 1, 0,
- 0, 0, 0, 1
- };
-
- @Override
- public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- setPreferencesFromResource(R.xml.display_management_settings, rootKey);
- if (!DisplayManagement.isFeatureSupported(DisplayManagement.FEATURE_COLOR_BALANCE) ||
- !getResources().getBoolean(R.bool.color_balance_support)) {
- Preference pref = getPreferenceScreen().findPreference(PREF_COLOR_BALANCE);
- if (pref != null) {
- getPreferenceScreen().removePreference(pref);
- }
- }
-
- if (!DisplayManagement.isFeatureSupported(DisplayManagement.FEATURE_SUNLIGHT_VISBILITY_IMPROVEMENT)) {
- Preference pref = getPreferenceScreen().findPreference(PREF_SVI);
- if (pref != null) {
- getPreferenceScreen().removePreference(pref);
- }
- }
-
- if (!DisplayManagement.isFeatureSupported(DisplayManagement.FEATURE_COLOR_MODE_SELECTION) ||
- !getResources().getBoolean(R.bool.display_mode_support)) {
- Preference pref = getPreferenceScreen().findPreference(PREF_DISPLAY_MODE);
- if (pref != null) {
- getPreferenceScreen().removePreference(pref);
- }
- } else {
- mDisplayMode = (ListPreference) findPreference(PREF_DISPLAY_MODE);
- mDisplayMode.setOnPreferenceChangeListener(this);
-
- ModeInfo[] modes = DisplayManagement.getModes();
- if (modes != null) {
- CharSequence[] entries = new CharSequence[modes.length];
- CharSequence[] entryValues = new CharSequence[modes.length];
- for (int i = 0; i < modes.length; i++) {
- entries[i] = modes[i].getName();
- entryValues[i] = String.valueOf(modes[i].getId());
- }
-
- mDisplayMode.setEntries(entries);
- mDisplayMode.setEntryValues(entryValues);
- mDisplayMode.setValueIndex(DisplayManagement.getActiveMode());
- }
- }
-
- mReadingMode = (SwitchPreference) findPreference(PREF_READING_MODE);
- setHasOptionsMenu(true);
- }
-
- @Override
- public boolean onPreferenceTreeClick(Preference preference) {
- if (preference == mReadingMode) {
- boolean checked = ((SwitchPreference)preference).isChecked();
- setReadingMode(checked);
- return true;
- }
- return super.onPreferenceTreeClick(preference);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (preference == mDisplayMode) {
- int val = Integer.parseInt((String) newValue);
- int index = mDisplayMode.findIndexOfValue((String) newValue);
- DisplayManagement.setMode(index);
- mDisplayMode.setSummary(mDisplayMode.getEntries()[index]);
- return true;
- }
- return false;
- }
-
- public static void setReadingMode(boolean state) {
- setColorMatrix(LEVEL_COLOR_MATRIX_READING,
- state ? MATRIX_GRAYSCALE : MATRIX_NORMAL);
- }
-
- public static void setColorMatrix(int level, float[] value) {
- if (value != null && value.length != 16) {
- throw new IllegalArgumentException("Expected length: 16 (4x4 matrix)"
- + ", actual length: " + value.length);
- }
-
- synchronized (mColorMatrix) {
- final float[] oldValue = mColorMatrix.get(level);
- if (!Arrays.equals(oldValue, value)) {
- if (value == null) {
- mColorMatrix.remove(level);
- } else if (oldValue == null) {
- mColorMatrix.put(level, Arrays.copyOf(value, value.length));
- } else {
- System.arraycopy(value, 0, oldValue, 0, value.length);
- }
-
- // Update the current color transform.
- applyColorMatrix(computeColorMatrixLocked());
- }
- }
- }
-
- private static void applyColorMatrix(float[] m) {
- final IBinder flinger = ServiceManager.getService("SurfaceFlinger");
- if (flinger != null) {
- final Parcel data = Parcel.obtain();
- data.writeInterfaceToken("android.ui.ISurfaceComposer");
- if (m != null) {
- data.writeInt(1);
- for (int i = 0; i < 16; i++) {
- data.writeFloat(m[i]);
- }
- } else {
- data.writeInt(0);
- }
- try {
- flinger.transact(SURFACE_FLINGER_TRANSACTION_COLOR_MATRIX, data, null, 0);
- } catch (RemoteException ex) {
- Slog.e(TAG, "Failed to set color transform", ex);
- } finally {
- data.recycle();
- }
- }
- }
-
- private static float[] computeColorMatrixLocked() {
- final int count = mColorMatrix.size();
- if (count == 0) {
- return null;
- }
-
- final float[][] result = mTempColorMatrix;
- Matrix.setIdentityM(result[0], 0);
- for (int i = 0; i < count; i++) {
- float[] rhs = mColorMatrix.valueAt(i);
- Matrix.multiplyMM(result[(i + 1) % 2], 0, result[i % 2], 0, rhs, 0);
- }
- return result[count % 2];
- }
-
- private void resetToDefaults() {
- SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getContext());
- SharedPreferences.Editor editor = sharedPrefs.edit();
- editor.remove(DisplayManagement.KEY_CONTRAST_VALUE);
- editor.remove(DisplayManagement.KEY_HUE_VALUE);
- editor.remove(DisplayManagement.KEY_INTENSITY_VALUE);
- editor.remove(DisplayManagement.KEY_SATURATION_VALUE);
- editor.remove(DisplayManagement.KEY_COLOR_BALANCE);
- editor.remove(DisplayManagement.KEY_SUNLIGHT_VISIBILITY);
- editor.commit();
-
- for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
- Preference p = getPreferenceScreen().getPreference(i);
- if (p instanceof PictureAdjustmentPreference) {
- ((PictureAdjustmentPreference)p).resetToDefaults();
- }
- if (p instanceof ColorBalancePreference) {
- ((ColorBalancePreference)p).resetToDefaults();
- }
- if (p instanceof SunlightVisibilityPreference) {
- ((SunlightVisibilityPreference)p).resetToDefaults();
- }
- }
- }
-
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- menu.add(0, MENU_RESET, 0, R.string.reset)
- .setIcon(R.drawable.ic_settings_backup_restore)
- .setAlphabeticShortcut('r')
- .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case MENU_RESET:
- resetToDefaults();
- return true;
- }
- return false;
- }
-}
-
diff --git a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/ColorSettingsActivity.java b/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/ColorSettingsActivity.java
deleted file mode 100644
index 57c12c0..0000000
--- a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/ColorSettingsActivity.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-* Copyright (C) 2018 The OmniROM Project
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package org.omnirom.omnidisplaymanager;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import androidx.preference.PreferenceFragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-public class ColorSettingsActivity extends Activity {
-
- private ColorSettings mColorSettingsFragment;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- getActionBar().setDisplayHomeAsUpEnabled(true);
- getActionBar().setTitle(getResources().getString(R.string.title));
-
- Fragment fragment = getFragmentManager().findFragmentById(android.R.id.content);
- if (fragment == null) {
- mColorSettingsFragment = new ColorSettings();
- getFragmentManager().beginTransaction()
- .add(android.R.id.content, mColorSettingsFragment)
- .commit();
- } else {
- mColorSettingsFragment = (ColorSettings) fragment;
- }
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- finish();
- return true;
- default:
- break;
- }
- return super.onOptionsItemSelected(item);
- }
-}
diff --git a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/DisplayManagement.java b/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/DisplayManagement.java
deleted file mode 100644
index 7f1b5d1..0000000
--- a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/DisplayManagement.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) 2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package org.omnirom.omnidisplaymanager;
-
-import android.os.SystemProperties;
-import android.util.Log;
-
-import com.qti.service.colorservice.IColorServiceImpl;
-import com.qti.snapdragon.sdk.display.ModeInfo;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-public class DisplayManagement {
-
- private static IColorServiceImpl mColorService;
- public static final String TAG = "DisplayManagement";
- private static boolean isDisplayManagementSupported;
-
- public static final int FEATURE_COLOR_BALANCE = 0;
- public static final int FEATURE_COLOR_MODE_SELECTION = 1;
- public static final int FEATURE_COLOR_MODE_MANAGEMENT = 2;
- public static final int FEATURE_ADAPTIVE_BACKLIGHT = 3;
- public static final int FEATURE_GLOBAL_PICTURE_ADJUSTMENT = 4;
- public static final int FEATURE_MEMORY_COLOR_ADJUSTMENT = 5;
- public static final int FEATURE_SUNLIGHT_VISBILITY_IMPROVEMENT = 6;
-
- public static final String KEY_CONTRAST_VALUE = "contrast_value";
- public static final String KEY_HUE_VALUE = "hue_value";
- public static final String KEY_INTENSITY_VALUE = "intensity_value";
- public static final String KEY_SATURATION_VALUE = "saturation_value";
- public static final String KEY_COLOR_BALANCE = "color_balance";
- public static final String KEY_SUNLIGHT_VISIBILITY = "sunlight_enhancement";
-
- private static Map<String, String> mDefaultValues = new HashMap();
-
- private static void init(){
- if (mColorService == null) {
- try {
- mColorService = new IColorServiceImpl();
- mColorService.native_init();
- isDisplayManagementSupported = true;
- saveDefaults();
- } catch (Throwable t) {
- // Ignore, DisplayEngineService not available.
- Log.e(TAG, "init", t);
- }
- }
- }
-
- public static int getActiveMode() {
- try {
- int defaultMode = getColorService().native_getDefaultMode(0);
- return defaultMode;
- } catch (Exception e) {
- return 0;
- }
- }
-
- public static ModeInfo[] getModes() {
- try {
- ModeInfo[] modes = getColorService().native_getModes(0, 2);
- return modes;
- } catch (Exception e) {
- return null;
- }
- }
-
- public static void setMode(int modeId) {
- try {
- getColorService().native_setActiveMode(0, modeId);
- } catch (Exception e) {
- }
- }
-
- public static boolean isFeatureSupported(int featId) {
- try {
- int supported = getColorService().native_isFeatureSupported(0, featId);
- return supported > 0;
- } catch (Exception e) {
- return false;
- }
- }
-
- public static int getColorBalance() {
- try {
- int balanceValue = getColorService().native_getColorBalance(0);
- return balanceValue;
- } catch (Exception e) {
- return 0;
- }
- }
-
- public static void setColorBalance(int newValue) {
- try {
- getColorService().native_setColorBalance(0, newValue);
- } catch (Exception e) {
- }
- }
-
- public static int getSVI() {
- try {
- return getColorService().native_getSVI(0);
- } catch (Exception e) {
- return 0;
- }
- }
-
- public static int getRangeSVIStrength(int index) {
- try {
- return getColorService().native_getRangeSVI(0, index);
- } catch (Exception e) {
- return 0;
- }
- }
-
- public static void setSVI(int newValue) {
- try {
- getColorService().native_setSVI(0, newValue);
- } catch (Exception e) {
- }
- }
-
- public static int getBacklightQualityLevel() {
- try {
- return getColorService().native_getBacklightQualityLevel(0);
- } catch (Exception e) {
- return 0;
- }
- }
-
- public static void setBacklightQualityLevel(int index) {
- try {
- getColorService().native_setBacklightQualityLevel(0, index);
- } catch (Exception e) {
- }
- }
-
- public static int[] getRangePAParameter() {
- try {
- return getColorService().native_getRangePAParameter(0);
- } catch (Exception e) {
- return null;
- }
- }
-
- public static int[] getPAParameters() {
- try {
- int[] v = getColorService().native_getPAParameters(0);
- return v;
- } catch (Exception e) {
- return new int[] {0, 0, 0, 0, 0, 0};
- }
- }
-
- public static void setPAParameters(int displayId, int flag, int hue, int saturation, int intensity, int contrast, int satThreshold){
- try {
- getColorService().native_setPAParameters(displayId, flag, hue, saturation, intensity, contrast, satThreshold);
- } catch (Exception e) {
- }
- }
-
- public static String getDefaultValue(String key) {
- return mDefaultValues.get(key);
- }
-
- private static IColorServiceImpl getColorService() {
- if (mColorService == null) {
- init();
- }
- return mColorService;
- }
-
- private static void saveDefaults() {
- if (mDefaultValues.size() == 0) {
- mDefaultValues.put(KEY_CONTRAST_VALUE, "100");
- mDefaultValues.put(KEY_HUE_VALUE, "180");
- mDefaultValues.put(KEY_INTENSITY_VALUE, "100");
- mDefaultValues.put(KEY_SATURATION_VALUE, "50");
- mDefaultValues.put(KEY_COLOR_BALANCE, "0");
- mDefaultValues.put(KEY_SUNLIGHT_VISIBILITY, "-1");
- Log.i(TAG, "defaults = " + mDefaultValues);
- }
- }
-}
diff --git a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/DisplayManagerTileService.java b/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/DisplayManagerTileService.java
deleted file mode 100644
index 8273d81..0000000
--- a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/DisplayManagerTileService.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.omnirom.omnidisplaymanager;
-
-import android.content.Intent;
-import android.service.quicksettings.TileService;
-
-
-public class DisplayManagerTileService extends TileService {
- @Override
- public void onDestroy() {
- super.onDestroy();
- }
-
- @Override
- public void onTileAdded() {
- super.onTileAdded();
- }
-
- @Override
- public void onTileRemoved() {
- super.onTileRemoved();
- }
-
- @Override
- public void onStartListening() {
- super.onStartListening();
- }
-
- @Override
- public void onStopListening() {
- super.onStopListening();
- }
-
- @Override
- public void onClick() {
- super.onClick();
- sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
- Intent startIntent = new Intent(this, ColorSettingsActivity.class);
- startIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- startActivity(startIntent);
- }
-}
diff --git a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/IColorServiceImpl.java b/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/IColorServiceImpl.java
deleted file mode 100644
index e534e91..0000000
--- a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/IColorServiceImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-* Copyright (C) 2018 The OmniROM Project
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package com.qti.service.colorservice;
-
-import android.util.Log;
-import java.util.Hashtable;
-
-import com.qti.snapdragon.sdk.display.ModeInfo;
-
-public class IColorServiceImpl {
- private static final String TAG = "DeviceParts";
-
- public native int native_createNewMode(int i, String str, int i2, long j, int i3);
-
- public native int native_createNewModeAllFeatures(int i, String str, int i2);
-
- public native void native_deinit();
-
- public native int native_deleteMode(int i, int i2);
-
- public native int native_disableMemoryColorConfiguration(int i, int i2);
-
- public native long[] native_getActiveMode(int i);
-
- public native int native_getAdaptiveBacklightScale(int i);
-
- public native int native_getBacklightQualityLevel(int i);
-
- public native int native_getColorBalance(int i);
-
- public native int native_getDefaultMode(int i);
-
- public native int[] native_getMemoryColorParameters(int i, int i2);
-
- public native ModeInfo[] native_getModes(int i, int i2);
-
- public native int native_getNumberOfModes(int i, int i2);
-
- public native int[] native_getPAParameters(int i);
-
- public native int[] native_getRangeMemoryColorParameter(int i, int i2);
-
- public native int[] native_getRangePAParameter(int i);
-
- public native int native_getRangeSVI(int i, int i2);
-
- public native int native_getSVI(int i);
-
- public native int native_init();
-
- public native int native_isActiveFeatureOn(int i, int i2);
-
- public native int native_isFeatureSupported(int i, int i2);
-
- public native int native_modifyMode(int i, int i2, String str, int i3, long j, int i4);
-
- public native int native_modifyModeAllFeatures(int i, int i2, String str, int i3);
-
- public native int native_setActiveFeatureControl(int i, int i2, int i3);
-
- public native int native_setActiveMode(int i, int i2);
-
- public native int native_setBacklightQualityLevel(int i, int i2);
-
- public native int native_setColorBalance(int i, int i2);
-
- public native int native_setDefaultMode(int i, int i2);
-
- public native int native_setMemoryColorParameters(int i, int i2, int i3, int i4, int i5);
-
- public native int native_setPAParameters(int i, int i2, int i3, int i4, int i5, int i6, int i7);
-
- public native int native_setSVI(int i, int i2);
-
- public IColorServiceImpl() {
- System.loadLibrary("sdm-disp-apis.qti");
- System.loadLibrary("sd_sdk_display.qti");
- }
-
-}
diff --git a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/ModeInfo.java b/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/ModeInfo.java
deleted file mode 100644
index 5563756..0000000
--- a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/ModeInfo.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* Copyright (C) 2018 The OmniROM Project
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package com.qti.snapdragon.sdk.display;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.os.Parcelable.Creator;
-
-public class ModeInfo implements Parcelable {
- public static final Creator<ModeInfo> CREATOR = new Creator<ModeInfo>() {
- public ModeInfo createFromParcel(Parcel inParcel) {
- return new ModeInfo(inParcel.readInt(), inParcel.readString(), inParcel.readInt());
- }
-
- public ModeInfo[] newArray(int size) {
- return new ModeInfo[size];
- }
- };
- private int id = -1;
- private int modeType = 0;
- private String name = null;
-
- public ModeInfo(int pId, String pName, int pType) {
- id = pId;
- name = pName;
- modeType = pType;
- }
-
- public int getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public int getModeType() {
- return modeType;
- }
-
- public int describeContents() {
- return 0;
- }
-
- public void writeToParcel(Parcel destParcel, int flags) {
- destParcel.writeInt(id);
- destParcel.writeString(name);
- destParcel.writeInt(modeType);
- }
-}
diff --git a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/ReadingModeTileService.java b/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/ReadingModeTileService.java
deleted file mode 100644
index 34521f4..0000000
--- a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/ReadingModeTileService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.omnirom.omnidisplaymanager;
-
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.service.quicksettings.TileService;
-import androidx.preference.PreferenceManager;
-
-
-public class ReadingModeTileService extends TileService {
- @Override
- public void onDestroy() {
- super.onDestroy();
- }
-
- @Override
- public void onTileAdded() {
- super.onTileAdded();
- }
-
- @Override
- public void onTileRemoved() {
- super.onTileRemoved();
- }
-
- @Override
- public void onStartListening() {
- super.onStartListening();
- }
-
- @Override
- public void onStopListening() {
- super.onStopListening();
- }
-
- @Override
- public void onClick() {
- super.onClick();
- SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
- if (sharedPrefs.getBoolean(ColorSettings.PREF_READING_MODE, false)) {
- ColorSettings.setReadingMode(false);
- sharedPrefs.edit().putBoolean(ColorSettings.PREF_READING_MODE, false).commit();
- } else {
- ColorSettings.setReadingMode(true);
- sharedPrefs.edit().putBoolean(ColorSettings.PREF_READING_MODE, true).commit();
- }
- }
-}
diff --git a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/Startup.java b/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/Startup.java
deleted file mode 100644
index b08e322..0000000
--- a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/Startup.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.omnirom.omnidisplaymanager;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import androidx.preference.PreferenceManager;
-import android.provider.Settings;
-import android.text.TextUtils;
-
-public class Startup extends BroadcastReceiver {
-
- @Override
- public void onReceive(final Context context, final Intent bootintent) {
- SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
- int[] currentValue = DisplayManagement.getPAParameters();
-
- int contrast = Integer.valueOf(sharedPrefs.getString(DisplayManagement.KEY_CONTRAST_VALUE,
- DisplayManagement.getDefaultValue(DisplayManagement.KEY_CONTRAST_VALUE)));
- int hue = Integer.valueOf(sharedPrefs.getString(DisplayManagement.KEY_HUE_VALUE,
- DisplayManagement.getDefaultValue(DisplayManagement.KEY_HUE_VALUE)));
- int intensity = Integer.valueOf(sharedPrefs.getString(DisplayManagement.KEY_INTENSITY_VALUE,
- DisplayManagement.getDefaultValue(DisplayManagement.KEY_INTENSITY_VALUE)));
- int saturation = Integer.valueOf(sharedPrefs.getString(DisplayManagement.KEY_SATURATION_VALUE,
- DisplayManagement.getDefaultValue(DisplayManagement.KEY_SATURATION_VALUE)));
- DisplayManagement.setPAParameters(0, currentValue[0], hue, saturation, intensity, contrast, currentValue[5]);
-
- if (context.getResources().getBoolean(R.bool.color_balance_support)) {
- int colorBalance = Integer.valueOf(sharedPrefs.getString(DisplayManagement.KEY_COLOR_BALANCE,
- DisplayManagement.getDefaultValue(DisplayManagement.KEY_COLOR_BALANCE)));
- DisplayManagement.setColorBalance(colorBalance);
- }
-
- // always reset on reboot
- sharedPrefs.edit().putBoolean(ColorSettings.PREF_READING_MODE, false).commit();
- }
-}
diff --git a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/preferences/ColorBalancePreference.java b/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/preferences/ColorBalancePreference.java
deleted file mode 100644
index ce98b25..0000000
--- a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/preferences/ColorBalancePreference.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.omnirom.omnidisplaymanager.preferences;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.SharedPreferences;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceViewHolder;
-import android.database.ContentObserver;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.SeekBar;
-import android.widget.Button;
-import android.os.Bundle;
-import android.util.Log;
-import android.os.Vibrator;
-
-import org.omnirom.omnidisplaymanager.DisplayManagement;
-import org.omnirom.omnidisplaymanager.R;
-
-public class ColorBalancePreference extends Preference implements
- SeekBar.OnSeekBarChangeListener {
-
- private SeekBar mSeekBar;
- private int mOldStrength;
- private int mMinValue;
- private int mMaxValue;
- private static final String TAG = "ColorBalancePreference";
-
- public ColorBalancePreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- mMinValue = 0;
- mMaxValue = 100;
-
- setLayoutResource(R.layout.preference_seek_bar);
- }
-
- @Override
- public void onBindViewHolder(PreferenceViewHolder holder) {
- super.onBindViewHolder(holder);
-
- mOldStrength = getValue();
- mSeekBar = (SeekBar) holder.findViewById(R.id.seekbar);
- mSeekBar.setMax(mMaxValue - mMinValue);
- mSeekBar.setProgress(mOldStrength - mMinValue);
- mSeekBar.setOnSeekBarChangeListener(this);
- }
-
- public int getValue() {
- SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getContext());
- return Integer.valueOf(sharedPrefs.getString(DisplayManagement.KEY_COLOR_BALANCE,
- DisplayManagement.getDefaultValue(DisplayManagement.KEY_COLOR_BALANCE)));
- }
-
- private void setValue(String newValue, boolean withFeedback) {
- DisplayManagement.setColorBalance(Integer.parseInt(newValue));
- SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(getContext()).edit();
- editor.putString(DisplayManagement.KEY_COLOR_BALANCE, newValue);
- editor.commit();
- }
-
-
- public void onProgressChanged(SeekBar seekBar, int progress,
- boolean fromTouch) {
- setValue(String.valueOf(progress + mMinValue), true);
- }
-
- public void onStartTrackingTouch(SeekBar seekBar) {
- // NA
- }
-
- public void onStopTrackingTouch(SeekBar seekBar) {
- // NA
- }
-
- public void resetToDefaults() {
- mSeekBar.setProgress(Integer.valueOf(DisplayManagement.getDefaultValue(DisplayManagement.KEY_COLOR_BALANCE)), true);
- }
-}
-
diff --git a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/preferences/LayoutPreference.java b/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/preferences/LayoutPreference.java
deleted file mode 100644
index cfd82c8..0000000
--- a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/preferences/LayoutPreference.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.omnirom.omnidisplaymanager.preferences;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import androidx.annotation.VisibleForTesting;
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import org.omnirom.omnidisplaymanager.R;
-
-public class LayoutPreference extends Preference {
-
- private final View.OnClickListener mClickListener = v -> performClick(v);
- private boolean mAllowDividerAbove;
- private boolean mAllowDividerBelow;
-
- @VisibleForTesting
- View mRootView;
-
- public LayoutPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- init(context, attrs, 0 /* defStyleAttr */);
- }
-
- public LayoutPreference(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init(context, attrs, defStyleAttr);
- }
-
- public LayoutPreference(Context context, int resource) {
- this(context, LayoutInflater.from(context).inflate(resource, null, false));
- }
-
- public LayoutPreference(Context context, View view) {
- super(context);
- setView(view);
- }
-
- private void init(Context context, AttributeSet attrs, int defStyleAttr) {
- TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.Preference);
- mAllowDividerAbove = TypedArrayUtils.getBoolean(a, R.styleable.Preference_allowDividerAbove,
- R.styleable.Preference_allowDividerAbove, false);
- mAllowDividerBelow = TypedArrayUtils.getBoolean(a, R.styleable.Preference_allowDividerBelow,
- R.styleable.Preference_allowDividerBelow, false);
- a.recycle();
-
- a = context.obtainStyledAttributes(
- attrs, com.android.internal.R.styleable.Preference, defStyleAttr, 0);
- int layoutResource = a.getResourceId(com.android.internal.R.styleable.Preference_layout,
- 0);
- if (layoutResource == 0) {
- throw new IllegalArgumentException("LayoutPreference requires a layout to be defined");
- }
- a.recycle();
-
- // Need to create view now so that findViewById can be called immediately.
- final View view = LayoutInflater.from(getContext())
- .inflate(layoutResource, null, false);
- setView(view);
- }
-
- private void setView(View view) {
- setLayoutResource(R.layout.layout_preference_frame);
- mRootView = view;
- setShouldDisableView(false);
- }
-
- @Override
- public void onBindViewHolder(PreferenceViewHolder holder) {
- holder.itemView.setOnClickListener(mClickListener);
-
- final boolean selectable = isSelectable();
- holder.itemView.setFocusable(selectable);
- holder.itemView.setClickable(selectable);
- holder.setDividerAllowedAbove(mAllowDividerAbove);
- holder.setDividerAllowedBelow(mAllowDividerBelow);
-
- FrameLayout layout = (FrameLayout) holder.itemView;
- layout.removeAllViews();
- ViewGroup parent = (ViewGroup) mRootView.getParent();
- if (parent != null) {
- parent.removeView(mRootView);
- }
- layout.addView(mRootView);
- }
-
- public <T extends View> T findViewById(int id) {
- return mRootView.findViewById(id);
- }
-
-}
diff --git a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/preferences/PictureAdjustmentPreference.java b/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/preferences/PictureAdjustmentPreference.java
deleted file mode 100644
index 050cfc5..0000000
--- a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/preferences/PictureAdjustmentPreference.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.omnirom.omnidisplaymanager.preferences;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.SharedPreferences;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceViewHolder;
-import android.database.ContentObserver;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.SeekBar;
-import android.widget.Button;
-import android.os.Bundle;
-import android.util.Log;
-
-import org.omnirom.omnidisplaymanager.DisplayManagement;
-import org.omnirom.omnidisplaymanager.R;
-
-import java.util.Arrays;
-
-public class PictureAdjustmentPreference extends Preference implements
- SeekBar.OnSeekBarChangeListener {
-
- private SeekBar mSeekBar;
- private int mOldStrength;
- private int mMinValue;
- private int mMaxValue;
- private PictureAdjustment currentAdjustment;
-
- public PictureAdjustmentPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- init(attrs);
- int[] ranges = DisplayManagement.getRangePAParameter();
- Log.i("ranges", Arrays.toString(ranges));
- if (ranges != null && ranges.length > 0) {
- mMinValue = ranges[currentAdjustment.minRangeIndex];
- mMaxValue = ranges[currentAdjustment.maxRangeIndex];
- } else {
- mMinValue = 0;
- mMaxValue = 0;
- }
-
- setLayoutResource(R.layout.preference_seek_bar);
- }
-
- private void init(AttributeSet attrs) {
- String ajustmentType = attrs.getAttributeValue(null, "adjustmentType");
- switch (ajustmentType) {
- case "contrast":
- currentAdjustment = new PictureAdjustment(6, 7, 4, DisplayManagement.KEY_CONTRAST_VALUE);
- break;
- case "hue":
- currentAdjustment = new PictureAdjustment(0, 1, 1, DisplayManagement.KEY_HUE_VALUE);
- break;
- case "intensity":
- currentAdjustment = new PictureAdjustment(4, 5, 3, DisplayManagement.KEY_INTENSITY_VALUE);
- break;
- case "saturation":
- currentAdjustment = new PictureAdjustment(2, 3, 2, DisplayManagement.KEY_SATURATION_VALUE);
- break;
- }
- }
-
- @Override
- public void onBindViewHolder(PreferenceViewHolder holder) {
- super.onBindViewHolder(holder);
-
- mOldStrength = getValue();
- mSeekBar = (SeekBar) holder.findViewById(R.id.seekbar);
- mSeekBar.setMax(mMaxValue - mMinValue);
- mSeekBar.setProgress(mOldStrength - mMinValue);
- mSeekBar.setOnSeekBarChangeListener(this);
- }
-
- public int getValue() {
- SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getContext());
- return Integer.valueOf(sharedPrefs.getString(currentAdjustment.preferenceKey,
- DisplayManagement.getDefaultValue(currentAdjustment.preferenceKey)));
- }
-
- private void setValue(String newValue) {
- int[] currentValue = DisplayManagement.getPAParameters();
-
- SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getContext());
- int contrast = Integer.valueOf(sharedPrefs.getString(DisplayManagement.KEY_CONTRAST_VALUE,
- DisplayManagement.getDefaultValue(DisplayManagement.KEY_CONTRAST_VALUE)));
- int hue = Integer.valueOf(sharedPrefs.getString(DisplayManagement.KEY_HUE_VALUE,
- DisplayManagement.getDefaultValue(DisplayManagement.KEY_HUE_VALUE)));
- int intensity = Integer.valueOf(sharedPrefs.getString(DisplayManagement.KEY_INTENSITY_VALUE,
- DisplayManagement.getDefaultValue(DisplayManagement.KEY_INTENSITY_VALUE)));
- int saturation = Integer.valueOf(sharedPrefs.getString(DisplayManagement.KEY_SATURATION_VALUE,
- DisplayManagement.getDefaultValue(DisplayManagement.KEY_SATURATION_VALUE)));
-
- switch (currentAdjustment.preferenceKey) {
- case DisplayManagement.KEY_CONTRAST_VALUE:
- DisplayManagement.setPAParameters(0, currentValue[0], hue, saturation, intensity, Integer.parseInt(newValue), currentValue[5]);
- break;
- case DisplayManagement.KEY_HUE_VALUE:
- DisplayManagement.setPAParameters(0, currentValue[0], Integer.parseInt(newValue), saturation, intensity, contrast, currentValue[5]);
- break;
- case DisplayManagement.KEY_INTENSITY_VALUE:
- DisplayManagement.setPAParameters(0, currentValue[0], hue, saturation, Integer.parseInt(newValue), contrast, currentValue[5]);
- break;
- case DisplayManagement.KEY_SATURATION_VALUE:
- DisplayManagement.setPAParameters(0, currentValue[0], hue, Integer.parseInt(newValue), intensity, contrast, currentValue[5]);
- break;
- }
-
- SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(getContext()).edit();
- editor.putString(currentAdjustment.preferenceKey, newValue);
- editor.commit();
- }
-
- public void onProgressChanged(SeekBar seekBar, int progress,
- boolean fromTouch) {
- setValue(String.valueOf(progress + mMinValue));
- }
-
- public void onStartTrackingTouch(SeekBar seekBar) {
- // NA
- }
-
- public void onStopTrackingTouch(SeekBar seekBar) {
- // NA
- }
-
- public void resetToDefaults() {
- mSeekBar.setProgress(Integer.valueOf(DisplayManagement.getDefaultValue(currentAdjustment.preferenceKey)), true);
- }
-
- public class PictureAdjustment {
- public int minRangeIndex;
- public int maxRangeIndex;
- public int parameterIndex;
- public String preferenceKey;
-
- public PictureAdjustment(int min, int max, int param, String key) {
- minRangeIndex = min;
- maxRangeIndex = max;
- parameterIndex = param;
- preferenceKey = key;
- }
- }
-}
-
-
diff --git a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/preferences/SunlightVisibilityPreference.java b/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/preferences/SunlightVisibilityPreference.java
deleted file mode 100644
index ecb9204..0000000
--- a/OmniDisplayManager/src/org/omnirom/omnidisplaymanager/preferences/SunlightVisibilityPreference.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-* Copyright (C) 2018 The OmniROM Project
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package org.omnirom.omnidisplaymanager.preferences;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.SharedPreferences;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceViewHolder;
-import android.database.ContentObserver;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.SeekBar;
-import android.widget.Button;
-import android.os.Bundle;
-import android.util.Log;
-import android.os.Vibrator;
-
-import org.omnirom.omnidisplaymanager.DisplayManagement;
-import org.omnirom.omnidisplaymanager.R;
-
-public class SunlightVisibilityPreference extends Preference implements
- SeekBar.OnSeekBarChangeListener {
-
- private SeekBar mSeekBar;
- private int mOldStrength;
- private int mMinValue;
- private int mMaxValue;
-
- public SunlightVisibilityPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- mMinValue = DisplayManagement.getRangeSVIStrength(0);
- mMaxValue = DisplayManagement.getRangeSVIStrength(1);
-
- setLayoutResource(R.layout.preference_seek_bar);
- }
-
- @Override
- public void onBindViewHolder(PreferenceViewHolder holder) {
- super.onBindViewHolder(holder);
-
- mOldStrength = getValue();
- mSeekBar = (SeekBar) holder.findViewById(R.id.seekbar);
- mSeekBar.setMax(mMaxValue - mMinValue);
- mSeekBar.setProgress(mOldStrength - mMinValue);
- mSeekBar.setOnSeekBarChangeListener(this);
- }
-
- public int getValue() {
- SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getContext());
- return Integer.valueOf(sharedPrefs.getString(DisplayManagement.KEY_SUNLIGHT_VISIBILITY, DisplayManagement.getDefaultValue(DisplayManagement.KEY_SUNLIGHT_VISIBILITY)));
- }
-
- private void setValue(String newValue) {
- DisplayManagement.setSVI(Integer.parseInt(newValue));
- SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(getContext()).edit();
- editor.putString(DisplayManagement.KEY_SUNLIGHT_VISIBILITY, newValue);
- editor.commit();
- }
-
- public void onProgressChanged(SeekBar seekBar, int progress,
- boolean fromTouch) {
- setValue(String.valueOf(progress + mMinValue));
- }
-
- public void onStartTrackingTouch(SeekBar seekBar) {
- // NA
- }
-
- public void onStopTrackingTouch(SeekBar seekBar) {
- // NA
- }
-
- public void resetToDefaults() {
- mSeekBar.setProgress(Integer.valueOf(DisplayManagement.getDefaultValue(DisplayManagement.KEY_SUNLIGHT_VISIBILITY)), true);
- }
-}
-
diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 9513f34..0129bbe 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright (c) 2016-2019, The Linux Foundation. All rights reserved
+<!-- Copyright (c) 2016-2020, The Linux Foundation. All rights reserved
Not a Contribution.
-->
<!-- Copyright (C) 2015 The Android Open Source Project
@@ -21,7 +21,7 @@
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
<!-- Global configuration Decalaration -->
- <globalConfiguration speaker_drc_enabled="true"/>
+ <globalConfiguration speaker_drc_enabled="true" call_screen_mode_supported="true"/>
<!-- Modules section:
@@ -68,6 +68,10 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
+ <mixPort name="haptics output" role="source">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A"/>
+ </mixPort>
<mixPort name="deep_buffer" role="source"
flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
@@ -83,6 +87,12 @@
<profile name="" format="dynamic"
samplingRates="dynamic" channelMasks="dynamic"/>
</mixPort>
+ <mixPort name="dsd_compress_passthrough" role="source"
+ flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
+ <profile name="" format="AUDIO_FORMAT_DSD"
+ samplingRates="2822400,5644800"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ </mixPort>
<mixPort name="direct_pcm" role="source"
flags="AUDIO_OUTPUT_FLAG_DIRECT">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -100,6 +110,9 @@
</mixPort>
<mixPort name="compressed_offload" role="source"
flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
+ <profile name="" format="AUDIO_FORMAT_MP3"
+ samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_FLAC"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
@@ -143,12 +156,6 @@
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
</mixPort>
- <mixPort name="dsd_compress_passthrough" role="source"
- flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
- <profile name="" format="AUDIO_FORMAT_DSD"
- samplingRates="2822400,5644800"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
- </mixPort>
<mixPort name="voice_tx" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
@@ -156,7 +163,7 @@
<mixPort name="voip_rx" role="source"
flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="incall_music_uplink" role="source"
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
@@ -170,6 +177,22 @@
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
</mixPort>
+ <mixPort name="fast input" role="sink"
+ flags="AUDIO_INPUT_FLAG_FAST">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
+ </mixPort>
+ <mixPort name="quad mic" role="sink">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="48000"
+ channelMasks="AUDIO_CHANNEL_INDEX_MASK_4"/>
+ </mixPort>
+ <mixPort name="voip_tx" role="sink"
+ flags="AUDIO_INPUT_FLAG_VOIP_TX">
+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ </mixPort>
<mixPort name="usb_surround_sound" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"
@@ -181,7 +204,7 @@
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"
channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>
</mixPort>
- <mixPort name="record_24" role="sink">
+ <mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,96000,192000"
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/>
@@ -255,17 +278,17 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
- encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
+ encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP VX_AUDIO_FORMAT_LC3">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
- encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
+ encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP VX_AUDIO_FORMAT_LC3">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
- encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
+ encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP VX_AUDIO_FORMAT_LC3">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
@@ -316,49 +339,55 @@
<!-- route declaration, i.e. list all available sources for a given sink -->
<routes>
<route type="mix" sink="Earpiece"
- sources="primary output,raw,deep_buffer,voip_rx,mmap_no_irq_out"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,haptics output"/>
<route type="mix" sink="Speaker"
- sources="primary output,raw,deep_buffer,voip_rx,mmap_no_irq_out"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,haptics output"/>
<route type="mix" sink="Wired Headset"
- sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx,mmap_no_irq_out"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,haptics output,dsd_compress_passthrough"/>
<route type="mix" sink="Wired Headphones"
- sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx,mmap_no_irq_out"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,haptics output,dsd_compress_passthrough"/>
<route type="mix" sink="Line"
- sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx,mmap_no_irq_out"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,haptics output"/>
<route type="mix" sink="HDMI"
- sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough,voip_rx"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough,voip_rx,haptics output"/>
<route type="mix" sink="Proxy"
- sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,haptics output"/>
<route type="mix" sink="FM"
sources="primary output"/>
<route type="mix" sink="BT SCO"
- sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>
<route type="mix" sink="BT SCO Headset"
- sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>
<route type="mix" sink="BT SCO Car Kit"
- sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>
<route type="mix" sink="USB Device Out"
- sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback,haptics output"/>
<route type="mix" sink="USB Headset Out"
- sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback,haptics output"/>
<route type="mix" sink="Telephony Tx"
sources="voice_tx,incall_music_uplink"/>
<route type="mix" sink="voice_rx"
sources="Telephony Rx"/>
<route type="mix" sink="primary input"
- sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In,Telephony Rx"/>
+ sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>
<route type="mix" sink="usb_surround_sound"
sources="USB Device In,USB Headset In"/>
+ <route type="mix" sink="fast input"
+ sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
+ <route type="mix" sink="quad mic"
+ sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
+ <route type="mix" sink="voip_tx"
+ sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
<route type="mix" sink="record_24"
sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
<route type="mix" sink="mmap_no_irq_in"
sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In,USB Headset In"/>
<route type="mix" sink="BT A2DP Out"
- sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+ sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>
<route type="mix" sink="BT A2DP Headphones"
- sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+ sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>
<route type="mix" sink="BT A2DP Speaker"
- sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+ sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
</routes>
@@ -407,15 +436,18 @@
</module>
<!-- Remote Submix Audio HAL -->
- <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>
+ <xi:include href="/vendor/etc/audio/ZS590KS/r_submix_audio_policy_configuration_ZS590KS.xml"/>
+
+ <!-- Bluetooth Audio HAL for hearing aid -->
+ <xi:include href="/vendor/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml"/>
</modules>
<!-- End of Modules section -->
<!-- Volume section -->
- <xi:include href="/vendor/etc/audio_policy_volumes_ZS630KL.xml"/>
- <xi:include href="/vendor/etc/default_volume_tables.xml"/>
+ <xi:include href="/vendor/etc/audio/ZS590KS/audio_policy_volumes_ZS590KS.xml"/>
+ <xi:include href="/vendor/etc/audio/ZS590KS/default_volume_tables_ZS590KS.xml"/>
<!-- End of Volume section -->
diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml
new file mode 100644
index 0000000..5c87dc8
--- /dev/null
+++ b/audio/audio_policy_volumes.xml
@@ -0,0 +1,435 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- Volume section defines a volume curve for a given use case and device category.
+It contains a list of points of this curve expressing the attenuation in Millibels for a given
+volume index from 0 to 100.
+<volume stream=”AUDIO_STREAM_MUSIC” deviceCategory=””>
+<point>0,-9600</point>
+<point>100,0</point>
+</volume>
+-->
+
+<volumes>
+ <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET">
+ <point>0,-4200</point>
+ <point>33,-2800</point>
+ <point>66,-1400</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+ <point>0,-3600</point>
+ <point>33,-2400</point>
+ <point>66,-1200</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE">
+ <point>0,-2700</point>
+ <point>33,-1800</point>
+ <point>66,-900</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_BLUETOOTH">
+ <point>0,-4200</point>
+ <point>33,-2800</point>
+ <point>66,-1400</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+ <point>0,-4200</point>
+ <point>33,-2800</point>
+ <point>66,-1400</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_ACCY_EU">
+ <point>0,-4200</point>
+ <point>33,-2800</point>
+ <point>66,-1400</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEADSET">
+ <point>1,-4200</point>
+ <point>33,-3400</point>
+ <point>66,-2600</point>
+ <point>100,-1800</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+ <point>1,-4000</point>
+ <point>33,-3200</point>
+ <point>66,-2300</point>
+ <point>100,-1500</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+ ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_BLUETOOTH">
+ <point>1,-4800</point>
+ <point>33,-4000</point>
+ <point>66,-3200</point>
+ <point>100,-2400</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+ <point>1,-4800</point>
+ <point>33,-4000</point>
+ <point>66,-3200</point>
+ <point>100,-2400</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_ACCY_EU">
+ <point>1,-4200</point>
+ <point>33,-3400</point>
+ <point>66,-2600</point>
+ <point>100,-1800</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET">
+ <point>1,-5400</point>
+ <point>33,-4200</point>
+ <point>66,-3000</point>
+ <point>100,-1800</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+ <point>1,-4500</point>
+ <point>33,-3000</point>
+ <point>66,-1500</point>
+ <point>100,-300</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+ ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_BLUETOOTH">
+ <point>1,-6000</point>
+ <point>33,-4800</point>
+ <point>66,-3600</point>
+ <point>100,-2400</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+ <point>1,-6000</point>
+ <point>33,-4800</point>
+ <point>66,-3600</point>
+ <point>100,-2400</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_ACCY_EU">
+ <point>1,-5400</point>
+ <point>33,-4200</point>
+ <point>66,-3000</point>
+ <point>100,-1800</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET">
+ <point>1,-7500</point>
+ <point>33,-5000</point>
+ <point>66,-2500</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+ ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE">
+ <point>1,-2700</point>
+ <point>33,-1800</point>
+ <point>66,-900</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_BLUETOOTH">
+ <point>1,-5800</point>
+ <point>20,-4000</point>
+ <point>60,-1700</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+ <point>1,-7400</point>
+ <point>33,-5000</point>
+ <point>66,-2500</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_ACCY_EU">
+ <point>1,-7305</point>
+ <point>33,-5155</point>
+ <point>66,-2930</point>
+ <point>100,-730</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET">
+ <point>0,-4950</point>
+ <point>33,-3350</point>
+ <point>66,-1700</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+ <point>0,-6000</point>
+ <point>33,-4000</point>
+ <point>66,-2000</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+ ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_BLUETOOTH">
+ <point>0,-4950</point>
+ <point>33,-3350</point>
+ <point>66,-1700</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+ <point>0,-4950</point>
+ <point>33,-3350</point>
+ <point>66,-1700</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_ACCY_EU">
+ <point>0,-4950</point>
+ <point>33,-3350</point>
+ <point>66,-1700</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="DEFAULT_NON_MUTABLE_EXT_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET">
+ <point>1,-5400</point>
+ <point>33,-4200</point>
+ <point>66,-3000</point>
+ <point>100,-1800</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+ <point>1,-4100</point>
+ <point>33,-2900</point>
+ <point>66,-1500</point>
+ <point>100,-700</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+ ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_BLUETOOTH">
+ <point>1,-6000</point>
+ <point>33,-4800</point>
+ <point>66,-3600</point>
+ <point>100,-2400</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+ <point>1,-6000</point>
+ <point>33,-4800</point>
+ <point>66,-3600</point>
+ <point>100,-2400</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_ACCY_EU">
+ <point>1,-5400</point>
+ <point>33,-4200</point>
+ <point>66,-3000</point>
+ <point>100,-1800</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEADSET">
+ <point>0,-4200</point>
+ <point>33,-2800</point>
+ <point>66,-1400</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+ <point>0,-2400</point>
+ <point>33,-1600</point>
+ <point>66,-800</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EARPIECE">
+ <point>0,-4200</point>
+ <point>33,-2800</point>
+ <point>66,-1400</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_BLUETOOTH">
+ <point>0,-4200</point>
+ <point>33,-2800</point>
+ <point>66,-1400</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+ <point>0,-4200</point>
+ <point>33,-2800</point>
+ <point>66,-1400</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_ACCY_EU">
+ <point>0,-4200</point>
+ <point>33,-2800</point>
+ <point>66,-1400</point>
+ <point>100,0</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEADSET">
+ <point>1,-3000</point>
+ <point>33,-2600</point>
+ <point>66,-2200</point>
+ <point>100,-1800</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+ ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+ ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_BLUETOOTH">
+ <point>1,-3000</point>
+ <point>33,-2600</point>
+ <point>66,-2200</point>
+ <point>100,-1800</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+ <point>1,-3000</point>
+ <point>33,-2600</point>
+ <point>66,-2200</point>
+ <point>100,-1800</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_ACCY_EU">
+ <point>1,-3000</point>
+ <point>33,-2600</point>
+ <point>66,-2200</point>
+ <point>100,-1800</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEADSET">
+ <point>1,-4200</point>
+ <point>33,-3600</point>
+ <point>66,-3000</point>
+ <point>100,-2400</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+ <point>1,-4800</point>
+ <point>33,-4000</point>
+ <point>66,-3200</point>
+ <point>100,-2400</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+ ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_BLUETOOTH">
+ <point>1,-4800</point>
+ <point>33,-4200</point>
+ <point>66,-3600</point>
+ <point>100,-3000</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+ <point>1,-4800</point>
+ <point>33,-4200</point>
+ <point>66,-3600</point>
+ <point>100,-3000</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_ACCY_EU">
+ <point>1,-4800</point>
+ <point>33,-4200</point>
+ <point>66,-3600</point>
+ <point>100,-3000</point>
+ </volume>
+ <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEADSET"
+ ref="SILENT_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+ ref="SILENT_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_BLUETOOTH"
+ ref="SILENT_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+ ref="SILENT_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_ACCY_EU"
+ ref="SILENT_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="SILENT_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="SILENT_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEADSET"
+ ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+ ref="DEFAULT_NON_MUTABLE_SPEAKER_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+ ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_BLUETOOTH"
+ ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+ ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_ACCY_EU"
+ ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_HEADSET"
+ ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+ ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+ ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_BLUETOOTH"
+ ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+ ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_ACCY_EU"
+ ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEADSET"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_BLUETOOTH"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_ACCY_EU"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEADSET"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_BLUETOOTH"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_ACCY_EU"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+ ref="FULL_SCALE_VOLUME_CURVE"/>
+</volumes>
+
diff --git a/audio/audio_policy_volumes_ZS630KL.xml b/audio/audio_policy_volumes_ZS630KL.xml
deleted file mode 100644
index f850db7..0000000
--- a/audio/audio_policy_volumes_ZS630KL.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- Volume section defines a volume curve for a given use case and device category.
-It contains a list of points of this curve expressing the attenuation in Millibels for a given
-volume index from 0 to 100.
-<volume stream=”AUDIO_STREAM_MUSIC” deviceCategory=””>
-<point>0,-9600</point>
-<point>100,0</point>
-</volume>
--->
-
-<volumes>
- <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET">
- <point>0,-4200</point>
- <point>33,-2800</point>
- <point>66,-1400</point>
- <point>100,0</point>
- </volume>
- <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_SPEAKER">
- <point>0,-3600</point>
- <point>33,-2400</point>
- <point>66,-1200</point>
- <point>100,0</point>
- </volume>
- <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE">
- <point>0,-2700</point>
- <point>33,-1800</point>
- <point>66,-900</point>
- <point>100,0</point>
- </volume>
- <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEADSET">
- <point>1,-4200</point>
- <point>33,-3400</point>
- <point>66,-2600</point>
- <point>100,-1800</point>
- </volume>
- <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
- <point>1,-4200</point>
- <point>33,-3300</point>
- <point>66,-2400</point>
- <point>100,-1500</point>
- </volume>
- <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
- ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET">
- <point>1,-5400</point>
- <point>33,-4200</point>
- <point>66,-3000</point>
- <point>100,-1800</point>
- </volume>
- <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
- <point>1,-5400</point>
- <point>33,-3600</point>
- <point>66,-1800</point>
- <point>100,0</point>
- </volume>
- <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
- ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET">
- <point>1,-6600</point>
- <point>33,-4600</point>
- <point>66,-2250</point>
- <point>100,0</point>
- </volume>
- <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER"
- ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE">
- <point>1,-2700</point>
- <point>33,-1800</point>
- <point>66,-900</point>
- <point>100,0</point>
- </volume>
- <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET">
- <point>0,-5400</point>
- <point>33,-4200</point>
- <point>66,-3000</point>
- <point>100,-1800</point>
- </volume>
- <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
- <point>1,-5400</point>
- <point>33,-3600</point>
- <point>66,-1800</point>
- <point>100,0</point>
- </volume>
- <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
- ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="DEFAULT_NON_MUTABLE_EXT_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET">
- <point>1,-5400</point>
- <point>33,-4200</point>
- <point>66,-3000</point>
- <point>100,-1800</point>
- </volume>
- <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
- <point>1,-4800</point>
- <point>33,-3600</point>
- <point>66,-2400</point>
- <point>100,-1200</point>
- </volume>
- <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
- ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEADSET">
- <point>0,-4200</point>
- <point>33,-2800</point>
- <point>66,-1400</point>
- <point>100,0</point>
- </volume>
- <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_SPEAKER">
- <point>0,-2400</point>
- <point>33,-1600</point>
- <point>66,-800</point>
- <point>100,0</point>
- </volume>
- <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EARPIECE">
- <point>0,-4200</point>
- <point>33,-2800</point>
- <point>66,-1400</point>
- <point>100,0</point>
- </volume>
- <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEADSET">
- <point>1,-3000</point>
- <point>33,-2600</point>
- <point>66,-2200</point>
- <point>100,-1800</point>
- </volume>
- <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
- ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
- ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEADSET">
- <point>1,-4800</point>
- <point>33,-4000</point>
- <point>66,-3200</point>
- <point>100,-2400</point>
- </volume>
- <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
- <point>1,-5400</point>
- <point>33,-4600</point>
- <point>66,-3800</point>
- <point>100,-3000</point>
- </volume>
- <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
- ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEADSET"
- ref="SILENT_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_SPEAKER"
- ref="FULL_SCALE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EARPIECE"
- ref="SILENT_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="SILENT_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="SILENT_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEADSET"
- ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_SPEAKER"
- ref="DEFAULT_NON_MUTABLE_SPEAKER_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EARPIECE"
- ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEADSET"
- ref="FULL_SCALE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_SPEAKER"
- ref="FULL_SCALE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
- ref="FULL_SCALE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="FULL_SCALE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="FULL_SCALE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEADSET"
- ref="FULL_SCALE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_SPEAKER"
- ref="FULL_SCALE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EARPIECE"
- ref="FULL_SCALE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
- ref="FULL_SCALE_VOLUME_CURVE"/>
- <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
- ref="FULL_SCALE_VOLUME_CURVE"/>
-</volumes>
-
diff --git a/audio/mixer_paths_tavil.xml b/audio/mixer_paths_tavil.xml
deleted file mode 100644
index 0148d8e..0000000
--- a/audio/mixer_paths_tavil.xml
+++ /dev/null
@@ -1,4146 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. -->
-<!-- -->
-<!-- Redistribution and use in source and binary forms, with or without -->
-<!-- modification, are permitted provided that the following conditions are -->
-<!-- met: -->
-<!-- * Redistributions of source code must retain the above copyright -->
-<!-- notice, this list of conditions and the following disclaimer. -->
-<!-- * Redistributions in binary form must reproduce the above -->
-<!-- copyright notice, this list of conditions and the following -->
-<!-- disclaimer in the documentation and/or other materials provided -->
-<!-- with the distribution. -->
-<!-- * Neither the name of The Linux Foundation nor the names of its -->
-<!-- contributors may be used to endorse or promote products derived -->
-<!-- from this software without specific prior written permission. -->
-<!-- -->
-<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -->
-<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -->
-<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
-<!-- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
-<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
-<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -->
-<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -->
-<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -->
-<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
-<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
-<mixer>
- <!-- These are the initial mixer settings -->
- <ctl name="Voice Rx Device Mute" id="0" value="0" />
- <ctl name="Voice Rx Device Mute" id="1" value="-1" />
- <ctl name="Voice Rx Device Mute" id="2" value="20" />
- <ctl name="Voice Tx Mute" id="0" value="0" />
- <ctl name="Voice Tx Mute" id="1" value="-1" />
- <ctl name="Voice Tx Mute" id="2" value="500" />
- <ctl name="Voice Rx Gain" id="0" value="0" />
- <ctl name="Voice Rx Gain" id="1" value="-1" />
- <ctl name="Voice Rx Gain" id="2" value="20" />
- <ctl name="Voice Sidetone Enable" value="0" />
- <ctl name="Voip Tx Mute" id="0" value="0" />
- <ctl name="Voip Tx Mute" id="1" value="500" />
- <ctl name="Voip Rx Gain" id="0" value="0" />
- <ctl name="Voip Rx Gain" id="1" value="20" />
- <ctl name="Voip Mode Config" value="12" />
- <ctl name="Voip Rate Config" value="0" />
- <ctl name="Voip Evrc Min Max Rate Config" id="0" value="1" />
- <ctl name="Voip Evrc Min Max Rate Config" id="1" value="4" />
- <ctl name="Voip Dtx Mode" value="0" />
- <ctl name="TTY Mode" value="OFF" />
- <ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_6_RX Port Mixer SLIM_0_TX" value="0" />
- <ctl name="SLIMBUS_4_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_4_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="MultiMedia5 Mixer SLIM_0_TX" value="0" />
- <ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="0" />
- <ctl name="MultiMedia5 Mixer SLIM_8_TX" value="0" />
- <ctl name="MultiMedia5 Mixer SLIM_7_TX" value="0" />
- <ctl name="MultiMedia1 Mixer SLIM_0_TX" value="0" />
- <ctl name="MultiMedia1 Mixer SLIM_4_TX" value="0" />
- <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
- <ctl name="MultiMedia8 Mixer SLIM_0_TX" value="0" />
- <ctl name="MultiMedia8 Mixer SLIM_4_TX" value="0" />
- <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />
- <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="0" />
- <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="0" />
- <ctl name="MultiMedia10 Mixer AFE_PCM_TX" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia1" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia3" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia4" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia5" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia6" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia7" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia8" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia9" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia10" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia11" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia12" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia13" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />
- <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia8" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia8" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia8" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia3" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia3" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia6" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia8" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="QUAT_MI2S_RX_Voice Mixer Voip" value="0" />
- <ctl name="QUAT_MI2S_RX_Voice Mixer QCHAT" value="0" />
- <ctl name="QUAT_MI2S_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="QUAT_MI2S_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="QUAT_MI2S_RX Channels" value="Two" />
- <ctl name="QUAT_MI2S_TX Channels" value="Two" />
- <ctl name="QUAT_MI2S_TX Format" value="S32_LE" />
- <ctl name="TFA_Selector Speaker" value="0" />
- <ctl name="TFA_Selector Receiver" value="0" />
- <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
- <ctl name="SLIM_2_RX Format" value="UNPACKED" />
- <ctl name="SLIM_2_RX SampleRate" value="KHZ_48" />
- <ctl name="SLIM_5_RX SampleRate" value="KHZ_44P1" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="SLIM_5_RX Channels" value="One" />
- <ctl name="SLIM_6_RX Channels" value="One" />
- <ctl name="SLIM_2_RX Channels" value="One" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="SLIM_1_TX Channels" value="One" />
- <ctl name="AIF1_CAP Mixer SLIM TX9" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX4" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX3" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX2" value="0" />
- <ctl name="AIF1_CAP Mixer SLIM TX1" value="0"/>
- <ctl name="AIF1_CAP Mixer SLIM TX0" value="0"/>
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="ZERO" />
- <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="ZERO" />
- <ctl name="VI_FEED_TX Channels" value="Two" />
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="0" />
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="0" />
- <ctl name="SLIM_4_TX Format" value="UNPACKED" />
- <ctl name="AANC_SLIM_0_RX MUX" value="ZERO" />
- <!-- HFP start -->
- <ctl name="HFP_PRI_AUX_UL_HL Switch" value="0" />
- <ctl name="SLIMBUS_0_RX Port Mixer SLIM_7_TX" value="0" />
- <!-- HFP end -->
- <!-- echo reference -->
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
- <ctl name="AUDIO_REF_EC_UL10 MUX" value="None" />
- <!-- usb headset -->
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia13" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia14" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="0" />
- <ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
- <!-- usb headset end -->
- <!-- fm -->
- <ctl name="SLIMBUS_8 LOOPBACK Volume" value="0" />
- <ctl name="SLIMBUS_0_RX Port Mixer SLIM_8_TX" value="0" />
- <ctl name="SLIMBUS_DL_HL Switch" value="0" />
- <ctl name="SLIMBUS_6_RX Port Mixer SLIM_8_TX" value="0" />
- <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
- <ctl name="MultiMedia1 Mixer SLIM_8_TX" value="0" />
- <ctl name="MultiMedia2 Mixer SLIM_8_TX" value="0" />
- <!-- fm end -->
-
- <!-- Multimode Voice1 -->
- <ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_1_TX_MMode1" value="0" />
- <!-- Multimode Voice1 BTSCO -->
- <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_7_TX_MMode1" value="0" />
- <!-- Multimode Voice1 USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="0" />
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="0" />
- <!-- Multimode Voice1 Display-Port -->
- <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="0" />
- <!-- Miltimode Voice1 end-->
-
- <!-- Multimode Voice2 -->
- <ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="0" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_1_TX_MMode2" value="0" />
- <!-- Multimode Voice2 BTSCO -->
- <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_7_TX_MMode2" value="0" />
- <!-- Multimode Voice2 USB headset -->
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2" value="0" />
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="0" />
- <!-- Multimode Voice2 Display-Port -->
- <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="0" />
- <!-- Multimode Voice2 end-->
-
- <!-- Voice external ec. reference -->
- <ctl name="VOC_EXT_EC MUX" value="NONE" />
- <ctl name="AIF3_CAP Mixer SLIM TX1" value="0" />
- <ctl name="AIF3_CAP Mixer SLIM TX2" value="0" />
- <!-- Voice external ec. reference end -->
-
- <!-- RT Proxy Cal -->
- <ctl name="RT_PROXY_1_RX SetCalMode" value="CAL_MODE_NONE" />
- <ctl name="RT_PROXY_1_TX SetCalMode" value="CAL_MODE_NONE" />
- <!-- RT Proxy Cal end -->
-
- <!-- Incall Recording -->
- <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="0" />
- <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="0" />
- <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="0" />
- <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="0" />
- <!-- Incall Recording End -->
-
- <!-- Incall Music -->
- <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />
- <ctl name="Incall_Music Audio Mixer MultiMedia9" value="0" />
- <!-- Incall Music End -->
-
- <!-- compress-voip-call start -->
- <ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" />
- <ctl name="SLIM_6_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" />
- <ctl name="SLIM_7_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer SLIM_7_TX_Voip" value="0" />
- <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="0" />
- <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="0" />
- <!-- compress-voip-call end-->
-
- <!-- Audio BTSCO -->
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia6" value="0" />
- <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
- <!-- audio record compress-->
- <ctl name="MultiMedia8 Mixer SLIM_0_TX" value="0" />
- <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />
- <ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="0" />
- <!-- audio record compress end-->
-
- <!-- split a2dp -->
- <ctl name="BT SampleRate" value="KHZ_8" />
- <ctl name="AFE Input Channels" value="Zero" />
- <ctl name="SLIM7_RX ADM Channels" value="Zero" />
- <!-- split a2dp end-->
-
- <!-- ADSP testfwk -->
- <ctl name="SLIMBUS_DL_HL Switch" value="0" />
- <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
- <!-- ADSP testfwk end-->
-
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
-
- <!-- Codec controls -->
- <!-- WSA controls -->
- <ctl name="SpkrLeft COMP Switch" value="0" />
- <ctl name="SpkrRight COMP Switch" value="0" />
- <ctl name="SpkrLeft BOOST Switch" value="0" />
- <ctl name="SpkrRight BOOST Switch" value="0" />
- <ctl name="SpkrLeft VISENSE Switch" value="0" />
- <ctl name="SpkrRight VISENSE Switch" value="0" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="0" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="0" />
- <ctl name="SpkrLeft WSA PA Gain" value="G_0_DB" />
-
- <!-- Volume controls -->
- <ctl name="LINEOUT1 Volume" value="13" />
- <ctl name="LINEOUT2 Volume" value="13" />
- <ctl name="HPHL Volume" value="20" />
- <ctl name="HPHR Volume" value="20" />
- <ctl name="EAR PA Gain" value="G_6_DB" />
- <ctl name="EAR SPKR PA Gain" value="G_DEFAULT" />
-
- <ctl name="RX0 Digital Volume" value="84" />
- <ctl name="RX1 Digital Volume" value="84" />
- <ctl name="RX2 Digital Volume" value="84" />
- <ctl name="RX3 Digital Volume" value="84" />
- <ctl name="RX4 Digital Volume" value="84" />
- <ctl name="RX5 Digital Volume" value="84" />
- <ctl name="RX6 Digital Volume" value="84" />
- <ctl name="RX7 Digital Volume" value="84" />
- <ctl name="ADC1 Volume" value="12" />
- <ctl name="ADC2 Volume" value="12" />
- <ctl name="ADC3 Volume" value="12" />
- <ctl name="ADC4 Volume" value="12" />
- <ctl name="DEC0 Volume" value="84" />
- <ctl name="DEC1 Volume" value="84" />
- <ctl name="DEC2 Volume" value="84" />
- <ctl name="DEC3 Volume" value="84" />
- <ctl name="DEC4 Volume" value="84" />
- <ctl name="DEC5 Volume" value="84" />
- <ctl name="DEC6 Volume" value="84" />
- <ctl name="DEC7 Volume" value="84" />
- <ctl name="DEC8 Volume" value="84" />
-
- <!-- Compander controls -->
- <ctl name="COMP1 Switch" value="1" />
- <ctl name="COMP2 Switch" value="1" />
- <ctl name="COMP7 Switch" value="0" />
- <ctl name="COMP8 Switch" value="0" />
-
- <!-- ADC, DMIC and AMIC controls -->
- <ctl name="ADC MUX0" value="AMIC" />
- <ctl name="ADC MUX1" value="AMIC" />
- <ctl name="ADC MUX2" value="AMIC" />
- <ctl name="ADC MUX3" value="AMIC" />
- <ctl name="ADC MUX4" value="AMIC" />
- <ctl name="ADC MUX5" value="AMIC" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="ADC MUX8" value="AMIC" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="ADC MUX11" value="AMIC" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="ADC MUX13" value="AMIC" />
- <ctl name="DMIC MUX0" value="ZERO" />
- <ctl name="DMIC MUX1" value="ZERO" />
- <ctl name="DMIC MUX2" value="ZERO" />
- <ctl name="DMIC MUX3" value="ZERO" />
- <ctl name="DMIC MUX4" value="ZERO" />
- <ctl name="DMIC MUX5" value="ZERO" />
- <ctl name="DMIC MUX6" value="ZERO" />
- <ctl name="DMIC MUX7" value="ZERO" />
- <ctl name="DMIC MUX8" value="ZERO" />
- <ctl name="DMIC MUX10" value="ZERO" />
- <ctl name="DMIC MUX11" value="ZERO" />
- <ctl name="DMIC MUX12" value="ZERO" />
- <ctl name="DMIC MUX13" value="ZERO" />
- <ctl name="AMIC MUX0" value="ZERO" />
- <ctl name="AMIC MUX1" value="ZERO" />
- <ctl name="AMIC MUX2" value="ZERO" />
- <ctl name="AMIC MUX3" value="ZERO" />
- <ctl name="AMIC MUX4" value="ZERO" />
- <ctl name="AMIC MUX5" value="ZERO" />
- <ctl name="AMIC MUX6" value="ZERO" />
- <ctl name="AMIC MUX7" value="ZERO" />
- <ctl name="AMIC MUX8" value="ZERO" />
- <ctl name="AMIC MUX10" value="ZERO" />
- <ctl name="AMIC MUX11" value="ZERO" />
- <ctl name="AMIC MUX12" value="ZERO" />
- <ctl name="AMIC MUX13" value="ZERO" />
-
- <ctl name="AMIC4_5 SEL" value="AMIC4" />
- <!-- CDC_IF and SLIM controls -->
- <ctl name="SLIM RX0 MUX" value="ZERO" />
- <ctl name="SLIM RX1 MUX" value="ZERO" />
- <ctl name="SLIM RX2 MUX" value="ZERO" />
- <ctl name="SLIM RX3 MUX" value="ZERO" />
- <ctl name="SLIM RX4 MUX" value="ZERO" />
- <ctl name="SLIM RX5 MUX" value="ZERO" />
- <ctl name="SLIM RX6 MUX" value="ZERO" />
- <ctl name="SLIM RX7 MUX" value="ZERO" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
- <ctl name="CDC_IF RX2 MUX" value="SLIM RX2" />
- <ctl name="CDC_IF RX3 MUX" value="SLIM RX3" />
- <ctl name="CDC_IF RX4 MUX" value="SLIM RX4" />
- <ctl name="CDC_IF RX5 MUX" value="SLIM RX5" />
- <ctl name="CDC_IF RX6 MUX" value="SLIM RX6" />
- <ctl name="CDC_IF RX7 MUX" value="SLIM RX7" />
- <ctl name="CDC_IF TX0 MUX" value="ZERO" />
- <ctl name="CDC_IF TX1 MUX" value="ZERO" />
- <ctl name="CDC_IF TX2 MUX" value="ZERO" />
- <ctl name="CDC_IF TX3 MUX" value="ZERO" />
- <ctl name="CDC_IF TX4 MUX" value="ZERO" />
- <ctl name="CDC_IF TX5 MUX" value="ZERO" />
- <ctl name="CDC_IF TX6 MUX" value="ZERO" />
- <ctl name="CDC_IF TX7 MUX" value="ZERO" />
- <ctl name="CDC_IF TX8 MUX" value="ZERO" />
- <ctl name="CDC_IF TX9 MUX" value="ZERO" />
- <ctl name="CDC_IF TX10 MUX" value="ZERO" />
- <ctl name="CDC_IF TX13 MUX" value="ZERO" />
-
- <!-- Interpolator chain controls -->
- <ctl name="RX INT0_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT0_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT0_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT1_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT2_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP1" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP2" value="ZERO" />
- <ctl name="RX INT0_2 MUX" value="ZERO" />
- <ctl name="RX INT1_2 MUX" value="ZERO" />
- <ctl name="RX INT2_2 MUX" value="ZERO" />
- <ctl name="RX INT7_2 MUX" value="ZERO" />
- <ctl name="RX INT8_2 MUX" value="ZERO" />
- <ctl name="RX INT1_1 NATIVE MUX" value="OFF" />
- <ctl name="RX INT2_1 NATIVE MUX" value="OFF" />
- <ctl name="RX INT1_2 NATIVE MUX" value="OFF" />
- <ctl name="RX INT2_2 NATIVE MUX" value="OFF" />
- <ctl name="ASRC0 MUX" value="ZERO" />
- <ctl name="ASRC1 MUX" value="ZERO" />
- <ctl name="RX INT1 SEC MIX HPHL Switch" value="0" />
- <ctl name="RX INT2 SEC MIX HPHR Switch" value="0" />
- <ctl name="DSD_L IF MUX" value="ZERO" />
- <ctl name="DSD_R IF MUX" value="ZERO" />
- <ctl name="RX INT1 MIX3 DSD HPHL Switch" value="0" />
- <ctl name="RX INT2 MIX3 DSD HPHR Switch" value="0" />
- <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
-
- <!-- Headphone Default mode - uLP -->
- <ctl name="RX HPH Mode" value="CLS_H_ULP" />
- <ctl name="ASRC0 Output Mode" value="INT" />
- <ctl name="ASRC1 Output Mode" value="INT" />
-
- <!-- IIR/voice anc -->
- <ctl name="IIR0 Band1" id ="0" value="268435456" />
- <ctl name="IIR0 Band1" id ="1" value="0" />
- <ctl name="IIR0 Band1" id ="2" value="0" />
- <ctl name="IIR0 Band1" id ="3" value="0" />
- <ctl name="IIR0 Band1" id ="4" value="0" />
- <ctl name="IIR0 Band2" id ="0" value="268435456" />
- <ctl name="IIR0 Band2" id ="1" value="0" />
- <ctl name="IIR0 Band2" id ="2" value="0" />
- <ctl name="IIR0 Band2" id ="3" value="0" />
- <ctl name="IIR0 Band2" id ="4" value="0" />
- <ctl name="IIR0 Band3" id ="0" value="268435456" />
- <ctl name="IIR0 Band3" id ="1" value="0" />
- <ctl name="IIR0 Band3" id ="2" value="0" />
- <ctl name="IIR0 Band3" id ="3" value="0" />
- <ctl name="IIR0 Band3" id ="4" value="0" />
- <ctl name="IIR0 Band4" id ="0" value="268435456" />
- <ctl name="IIR0 Band4" id ="1" value="0" />
- <ctl name="IIR0 Band4" id ="2" value="0" />
- <ctl name="IIR0 Band4" id ="3" value="0" />
- <ctl name="IIR0 Band4" id ="4" value="0" />
- <ctl name="IIR0 Band5" id ="0" value="268435456" />
- <ctl name="IIR0 Band5" id ="1" value="0" />
- <ctl name="IIR0 Band5" id ="2" value="0" />
- <ctl name="IIR0 Band5" id ="3" value="0" />
- <ctl name="IIR0 Band5" id ="4" value="0" />
- <ctl name="IIR0 Enable Band1" value="0" />
- <ctl name="IIR0 Enable Band2" value="0" />
- <ctl name="IIR0 Enable Band3" value="0" />
- <ctl name="IIR0 Enable Band4" value="0" />
- <ctl name="IIR0 Enable Band5" value="0" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="IIR0 INP0 MUX" value="ZERO" />
- <ctl name="IIR0 INP1 MUX" value="ZERO" />
- <ctl name="IIR0 INP2 MUX" value="ZERO" />
- <ctl name="IIR1 INP0 MUX" value="ZERO" />
- <ctl name="IIR1 INP1 MUX" value="ZERO" />
- <ctl name="IIR1 INP2 MUX" value="ZERO" />
-
- <!-- anc related -->
- <ctl name="ANC Slot" value="0" />
- <ctl name="ANC Function" value="OFF" />
- <ctl name="ANC0 FB MUX" value="ZERO" />
- <ctl name="ANC1 FB MUX" value="ZERO" />
- <ctl name="ANC OUT EAR Enable Switch" value="0" />
- <ctl name="ANC OUT EAR SPKR Enable Switch" value="0" />
- <ctl name="ANC SPKR PA Enable Switch" value="0" />
- <ctl name="ANC OUT HPHL Enable Switch" value="0" />
- <ctl name="ANC OUT HPHR Enable Switch" value="0" />
-
- <!-- Codec controls end -->
-
- <!-- mixer control to disable lowlatency qos voting -->
- <ctl name="MultiMedia5_RX QOS Vote" value="Disable" />
- <!-- mixer control to disable lowlatency qos voting end -->
-
- <!-- defaults for mmap record -->
- <ctl name="MultiMedia16 Mixer SLIM_0_TX" value="0" />
- <ctl name="MultiMedia16 Mixer SLIM_7_TX" value="0" />
- <ctl name="MultiMedia16 Mixer SLIM_8_TX" value="0" />
- <ctl name="MultiMedia16 Mixer USB_AUDIO_TX" value="0" />
-
- <!-- These are audio route (FE to BE) specific mixer settings -->
- <path name="gsm-mode">
- <ctl name="GSM mode Enable" value="ON" />
- </path>
-
- <path name="echo-reference">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_RX" />
- </path>
-
- <path name="echo-reference handset">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_RX" />
- </path>
-
- <path name="echo-reference headphones">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
- </path>
-
- <path name="echo-reference headset">
- <path name="echo-reference headphones" />
- </path>
-
- <path name="echo-reference headphones-for-voip">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
- </path>
-
- <path name="echo-reference headphones-three-poles-high-imp">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
- </path>
-
- <path name="echo-reference headphones-three-poles">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
- </path>
-
- <path name="echo-reference display-port">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT" />
- </path>
-
- <path name="echo-reference tfa-amplifier">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_RX" />
- </path>
-
- <path name="echo-reference headphones-44.1">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
- </path>
-
- <path name="echo-reference usb-headphones">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="USB_AUDIO_RX" />
- </path>
-
- <path name="echo-reference-voip">
- <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_RX" />
- </path>
-
- <path name="echo-reference-voip handset">
- <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_RX" />
- </path>
-
- <path name="echo-reference-voip headphones">
- <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_6_RX" />
- </path>
-
- <path name="echo-reference-voip headphones-for-voip">
- <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_6_RX" />
- </path>
-
- <path name="echo-reference-voip headphones-three-poles-high-imp">
- <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_6_RX" />
- </path>
-
- <path name="echo-reference-voip headphones-three-poles">
- <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_6_RX" />
- </path>
-
- <path name="echo-reference-voip headset">
- <path name="echo-reference-voip headphones" />
- </path>
-
- <path name="echo-reference-voip display-port">
- <ctl name="AUDIO_REF_EC_UL10 MUX" value="DISPLAY_PORT" />
- </path>
-
- <path name="echo-reference-voip tfa-amplifier">
- <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_RX" />
- </path>
-
- <path name="echo-reference-voip headphones-44.1">
- <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_6_RX" />
- </path>
-
- <path name="echo-reference-voip usb-headphones">
- <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX" />
- </path>
-
- <path name="deep-buffer-playback">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback speaker">
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-protected">
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-safe">
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-display-port">
- <path name="deep-buffer-playback display-port" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="deep-buffer-playback bt-sco" />
- </path>
-
- <path name="deep-buffer-playback afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-usb-headphones">
- <path name="deep-buffer-playback usb-headphones" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-safe-and-usb-headphones">
- <path name="deep-buffer-playback usb-headphones" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="deep-buffer-playback headset">
- <path name="deep-buffer-playback headphones" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-headphones">
- <path name="deep-buffer-playback headphones" />
- <path name="deep-buffer-playback" />
- <ctl name="RX1 Mix Digital Volume" value="67" />
- <ctl name="RX2 Mix Digital Volume" value="67" />
- </path>
-
- <path name="deep-buffer-playback speaker-safe-and-headphones">
- <path name="deep-buffer-playback headphones" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-bt-sco">
- <path name="deep-buffer-playback bt-sco" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-safe-and-bt-sco">
- <path name="deep-buffer-playback bt-sco" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-bt-sco-wb">
- <path name="deep-buffer-playback bt-sco-wb" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-safe-and-bt-sco-wb">
- <path name="deep-buffer-playback bt-sco-wb" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="low-latency-playback">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback speaker">
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-protected">
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-safe">
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="low-latency-playback bt-sco" />
- </path>
-
- <path name="low-latency-playback speaker-and-display-port">
- <path name="low-latency-playback display-port" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback speaker-and-usb-headphones">
- <path name="low-latency-playback usb-headphones" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-safe-and-usb-headphones">
- <path name="low-latency-playback usb-headphones" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="low-latency-playback headset">
- <path name="low-latency-playback headphones" />
- </path>
-
- <path name="low-latency-playback speaker-and-headphones">
- <path name="low-latency-playback headphones" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-safe-and-headphones">
- <path name="low-latency-playback headphones" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback resume">
- <ctl name="MultiMedia5_RX QOS Vote" value="Enable" />
- </path>
-
- <path name="low-latency-playback speaker-and-bt-sco">
- <path name="low-latency-playback bt-sco" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-safe-and-bt-sco">
- <path name="low-latency-playback bt-sco" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-and-bt-sco-wb">
- <path name="low-latency-playback bt-sco-wb" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-safe-and-bt-sco-wb">
- <path name="low-latency-playback bt-sco-wb" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="audio-ull-playback">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback speaker">
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback speaker-protected">
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback speaker-safe">
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback headset">
- <path name="audio-ull-playback headphones" />
- </path>
-
- <path name="audio-ull-playback speaker-and-headphones">
- <path name="audio-ull-playback" />
- <path name="audio-ull-playback headphones" />
- </path>
-
- <path name="audio-ull-playback speaker-safe-and-headphones">
- <path name="audio-ull-playback" />
- <path name="audio-ull-playback headphones" />
- </path>
-
- <path name="audio-ull-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-ull-playback bt-sco" />
- </path>
-
- <path name="audio-ull-playback speaker-and-display-port">
- <path name="audio-ull-playback display-port" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="audio-ull-playback speaker-and-bt-sco">
- <path name="audio-ull-playback bt-sco" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback speaker-safe-and-bt-sco">
- <path name="audio-ull-playback bt-sco" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback speaker-and-bt-sco-wb">
- <path name="audio-ull-playback bt-sco-wb" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback speaker-safe-and-bt-sco-wb">
- <path name="audio-ull-playback bt-sco-wb" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="multi-channel-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
- </path>
-
- <path name="multi-channel-playback afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
- </path>
-
- <path name="compress-offload-playback">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback speaker">
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-protected">
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-safe">
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="silence-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia9" value="1" />
- </path>
-
- <path name="compress-offload-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback bt-sco" />
- </path>
-
- <path name="compress-offload-playback speaker-and-display-port">
- <path name="compress-offload-playback display-port" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback speaker-and-usb-headphones">
- <path name="compress-offload-playback usb-headphones" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-safe-and-usb-headphones">
- <path name="compress-offload-playback usb-headphones" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback headset">
- <path name="compress-offload-playback headphones" />
- </path>
-
- <path name="compress-offload-playback headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback speaker-and-headphones">
- <path name="compress-offload-playback headphones" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-safe-and-headphones">
- <path name="compress-offload-playback headphones" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-and-bt-sco">
- <path name="compress-offload-playback bt-sco" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-safe-and-bt-sco">
- <path name="compress-offload-playback bt-sco" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-and-bt-sco-wb">
- <path name="compress-offload-playback bt-sco-wb" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-safe-and-bt-sco-wb">
- <path name="compress-offload-playback bt-sco-wb" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback2">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 speaker">
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback2 bt-sco" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-display-port">
- <path name="compress-offload-playback2 display-port" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-usb-headphones">
- <path name="compress-offload-playback2 usb-headphones" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-safe-and-usb-headphones">
- <path name="compress-offload-playback2 usb-headphones" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 headset">
- <path name="compress-offload-playback2 headphones" />
- </path>
-
- <path name="compress-offload-playback2 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-headphones">
- <path name="compress-offload-playback2 headphones" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-safe-and-headphones">
- <path name="compress-offload-playback2 headphones" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-bt-sco">
- <path name="compress-offload-playback2 bt-sco" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-safe-and-bt-sco">
- <path name="compress-offload-playback2 bt-sco" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback2 bt-sco-wb" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-safe-and-bt-sco-wb">
- <path name="compress-offload-playback2 bt-sco-wb" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback3">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback3 bt-sco" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-display-port">
- <path name="compress-offload-playback3 display-port" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback3 afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-usb-headphones">
- <path name="compress-offload-playback3 usb-headphones" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback3 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 headset">
- <path name="compress-offload-playback3 headphones" />
- </path>
-
- <path name="compress-offload-playback3 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-headphones">
- <path name="compress-offload-playback3 headphones" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-bt-sco">
- <path name="compress-offload-playback3 bt-sco" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback3 bt-sco-wb" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback4">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback4 bt-sco" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-display-port">
- <path name="compress-offload-playback4 display-port" />
- <path name="compress-offload-playback4" />
- </path>
-
-
- <path name="compress-offload-playback4 afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-usb-headphones">
- <path name="compress-offload-playback4 usb-headphones" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback4 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 headset">
- <path name="compress-offload-playback4 headphones" />
- </path>
-
- <path name="compress-offload-playback4 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-headphones">
- <path name="compress-offload-playback4 headphones" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-bt-sco">
- <path name="compress-offload-playback4 bt-sco" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback4 bt-sco-wb" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback5">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback5 bt-sco" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-display-port">
- <path name="compress-offload-playback5 display-port" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback5 afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-usb-headphones">
- <path name="compress-offload-playback5 usb-headphones" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback5 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 headset">
- <path name="compress-offload-playback5 headphones" />
- </path>
-
- <path name="compress-offload-playback5 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-headphones">
- <path name="compress-offload-playback5 headphones" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-bt-sco">
- <path name="compress-offload-playback5 bt-sco" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback5 bt-sco-wb" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback6">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback6 bt-sco" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-display-port">
- <path name="compress-offload-playback6 display-port" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback6 afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-usb-headphones">
- <path name="compress-offload-playback6 usb-headphones" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback6 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 headset">
- <path name="compress-offload-playback6 headphones" />
- </path>
-
- <path name="compress-offload-playback6 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-headphones">
- <path name="compress-offload-playback6 headphones" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-bt-sco">
- <path name="compress-offload-playback6 bt-sco" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback6 bt-sco-wb" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback7">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback7 bt-sco" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-display-port">
- <path name="compress-offload-playback7 display-port" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback7 afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-usb-headphones">
- <path name="compress-offload-playback7 usb-headphones" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback7 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 headset">
- <path name="compress-offload-playback7 headphones" />
- </path>
-
- <path name="compress-offload-playback7 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-headphones">
- <path name="compress-offload-playback7 headphones" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-bt-sco">
- <path name="compress-offload-playback7 bt-sco" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback7 bt-sco-wb" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback8">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback8 bt-sco" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-display-port">
- <path name="compress-offload-playback8 display-port" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback8 afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-usb-headphones">
- <path name="compress-offload-playback8 usb-headphones" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback8 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 headset">
- <path name="compress-offload-playback8 headphones" />
- </path>
-
- <path name="compress-offload-playback8 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-headphones">
- <path name="compress-offload-playback8 headphones" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-bt-sco">
- <path name="compress-offload-playback8 bt-sco" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback8 bt-sco-wb" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback9">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-offload-playback9 bt-sco" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-display-port">
- <path name="compress-offload-playback9 display-port" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="compress-offload-playback9 afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-usb-headphones">
- <path name="compress-offload-playback9 usb-headphones" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="compress-offload-playback9 headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 headset">
- <path name="compress-offload-playback9 headphones" />
- </path>
-
- <path name="compress-offload-playback9 headphones-44.1">
- <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 headphones-dsd">
- <ctl name="SLIMBUS_2_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-headphones">
- <path name="compress-offload-playback9 headphones" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-bt-sco">
- <path name="compress-offload-playback9 bt-sco" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-bt-sco-wb">
- <path name="compress-offload-playback9 bt-sco-wb" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="audio-record">
- <ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="audio-record handset-mic">
- <ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="audio-record headset-mic">
- <ctl name="MultiMedia1 Mixer SLIM_1_TX" value="1" />
- </path>
-
- <path name="audio-record usb-headset-mic">
- <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="audio-record unprocesses-usb-headset-mic">
- <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="audio-record bt-sco">
- <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="audio-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-record bt-sco" />
- </path>
-
- <path name="audio-record capture-fm">
- <ctl name="MultiMedia1 Mixer SLIM_8_TX" value="1" />
- </path>
-
- <path name="audio-record-compress">
- <ctl name="MultiMedia8 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="audio-record-compress headset-mic">
- <ctl name="MultiMedia8 Mixer SLIM_1_TX" value="1" />
- </path>
-
- <path name="audio-record-compress bt-sco">
- <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="audio-record-compress bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-record-compress bt-sco" />
- </path>
-
- <path name="audio-record-compress usb-headset-mic">
- <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="audio-record-compress unprocesses-usb-headset-mic">
- <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="audio-record-compress2">
- <ctl name="MultiMedia17 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="audio-record-compress2 headset-mic">
- <ctl name="MultiMedia17 Mixer SLIM_1_TX" value="1" />
- </path>
-
- <path name="audio-record-compress2 usb-headset-mic">
- <ctl name="MultiMedia17 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="audio-record-compress2 bt-sco">
- <ctl name="MultiMedia17 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="audio-record-compress2 bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-record-compress2 bt-sco" />
- </path>
-
- <path name="low-latency-record">
- <ctl name="MultiMedia8 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="low-latency-record headset-mic">
- <ctl name="MultiMedia8 Mixer SLIM_1_TX" value="1" />
- </path>
-
- <path name="low-latency-record bt-sco">
- <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="low-latency-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="low-latency-record bt-sco" />
- </path>
-
- <path name="low-latency-record usb-headset-mic">
- <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="low-latency-record unprocesses-usb-headset-mic">
- <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="low-latency-record capture-fm">
- <ctl name="MultiMedia8 Mixer SLIM_8_TX" value="1" />
- </path>
-
- <path name="fm-virtual-record capture-fm">
- <ctl name="MultiMedia2 Mixer SLIM_8_TX" value="1" />
- </path>
-
- <path name="play-fm">
- <ctl name="SLIMBUS_8 LOOPBACK Volume" value="1" />
- <ctl name="SLIMBUS_0_RX Port Mixer SLIM_8_TX" value="1" />
- <ctl name="SLIMBUS_DL_HL Switch" value="1" />
- </path>
-
- <path name="play-fm speaker">
- <ctl name="SLIMBUS_8 LOOPBACK Volume" value="1" />
- <ctl name="QUAT_MI2S_RX Port Mixer SLIM_8_TX" value="1" />
- <ctl name="QUAT_MI2S_RX_DL_HL Switch" value="1" />
- </path>
-
- <path name="play-fm headphones">
- <ctl name="SLIMBUS_8 LOOPBACK Volume" value="1" />
- <ctl name="SLIMBUS_6_RX Port Mixer SLIM_8_TX" value="1" />
- <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
- </path>
-
- <path name="play-fm headset">
- <path name="play-fm headphones" />
- </path>
-
- <path name="play-fm headphones-fm">
- <ctl name="SLIMBUS_8 LOOPBACK Volume" value="1" />
- <ctl name="SLIMBUS_6_RX Port Mixer SLIM_8_TX" value="1" />
- <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
- </path>
-
- <path name="play-fm headphones-three-poles">
- <ctl name="SLIMBUS_8 LOOPBACK Volume" value="1" />
- <ctl name="SLIMBUS_6_RX Port Mixer SLIM_8_TX" value="1" />
- <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
- </path>
-
- <path name="incall-rec-uplink">
- <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />
- </path>
-
- <path name="incall-rec-uplink bt-sco">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink bt-sco-wb">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink usb-headset-mic">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink unprocesses-usb-headset-mic">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink headset-mic">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink afe-proxy">
- <path name="incall-rec-uplink" />
- </path>
-
- <path name="incall-rec-uplink-compress">
- <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />
- </path>
-
- <path name="incall-rec-uplink-compress headset-mic">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-uplink-compress bt-sco">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-uplink-compress bt-sco-wb">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-uplink-compress usb-headset-mic">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-uplink-compress unprocesses-usb-headset-mic">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-uplink-compress afe-proxy">
- <path name="incall-rec-uplink-compress" />
- </path>
-
- <path name="incall-rec-downlink">
- <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="1" />
- </path>
-
- <path name="incall-rec-downlink headset-mic">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink bt-sco">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink bt-sco-wb">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink usb-headset-mic">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink unprocesses-usb-headset-mic">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink afe-proxy">
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-downlink-compress">
- <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="1" />
- </path>
-
- <path name="incall-rec-downlink-compress headset-mic">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-downlink-compress bt-sco">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-downlink-compress bt-sco-wb">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-downlink-compress usb-headset-mic">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-downlink-compress unprocesses-usb-headset-mic">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-downlink-compress afe-proxy">
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink">
- <path name="incall-rec-uplink" />
- <path name="incall-rec-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink bt-sco">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink bt-sco-wb">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink usb-headset-mic">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink unprocesses-usb-headset-mic">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink headset-mic">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink afe-proxy">
- <path name="incall-rec-uplink-and-downlink" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress">
- <path name="incall-rec-uplink-compress" />
- <path name="incall-rec-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress headset-mic">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress bt-sco">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress bt-sco-wb">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress usb-headset-mic">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress unprocesses-usb-headset-mic">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="incall-rec-uplink-and-downlink-compress afe-proxy">
- <path name="incall-rec-uplink-and-downlink-compress" />
- </path>
-
- <path name="hfp-sco">
- </path>
-
- <path name="hfp-sco headphones">
- </path>
-
- <path name="hfp-sco headset">
- <path name="hfp-sco headphones" />
- </path>
-
- <path name="hfp-sco-wb">
- <path name="hfp-sco" />
- </path>
-
- <path name="hfp-sco-wb headphones">
- <path name="hfp-sco headphones" />
- </path>
-
- <path name="hfp-sco-wb headset">
- <path name="hfp-sco headphones" />
- </path>
-
- <path name="compress-voip-call">
- <ctl name="QUAT_MI2S_RX_Voice Mixer Voip" value="0" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call speaker">
- <path name="compress-voip-call" />
- </path>
-
- <path name="compress-voip-call bt-a2dp">
- <ctl name="SLIM_7_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call headphones">
- <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call headset">
- <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_1_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call bt-sco">
- <ctl name="SLIM_7_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_7_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="compress-voip-call bt-sco" />
- </path>
-
- <path name="compress-voip-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call usb-headphones">
- <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
- </path>
-
- <path name="compress-voip-call usb-headset">
- <ctl name="USB_AUDIO_RX_Voice Mixer Voip" value="1" />
- <ctl name="Voip_Tx Mixer USB_AUDIO_TX_Voip" value="1" />
- </path>
-
- <path name="voicemmode1-call">
- <ctl name="QUAT_MI2S_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call speaker">
- <path name="voicemmode1-call" />
- </path>
-
- <path name="voicemmode1-call headphones">
- <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call headset">
- <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_1_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call bt-sco">
- <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_7_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="voicemmode1-call bt-sco" />
- </path>
-
- <path name="voicemmode1-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call usb-headphones">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call usb-headset">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call display-port-and-usb-headset-mic">
- <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode1-call display-port">
- <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="1" />
- <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
- </path>
-
- <path name="voicemmode2-call">
- <ctl name="QUAT_MI2S_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call speaker">
- <path name="voicemmode2-call" />
- </path>
-
- <path name="voicemmode2-call headphones">
- <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call headset">
- <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_1_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call bt-sco">
- <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_7_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="voicemmode2-call bt-sco" />
- </path>
-
- <path name="voicemmode2-call afe-proxy">
- <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call usb-headphones">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call usb-headset">
- <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call display-port-and-usb-headset-mic">
- <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
- </path>
-
- <path name="voicemmode2-call display-port">
- <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
- </path>
-
- <!-- VoIP Rx settings -->
- <path name="audio-playback-voip">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip speaker">
- <path name="audio-playback-voip" />
- </path>
-
- <path name="audio-playback-voip headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip headset">
- <path name="audio-playback-voip headphones" />
- </path>
-
- <path name="audio-playback-voip bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-playback-voip bt-sco" />
- </path>
-
- <path name="audio-playback-voip bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="audio-playback-voip speaker-and-display-port">
- <path name="audio-playback-voip display-port" />
- <path name="audio-playback-voip" />
- </path>
-
- <!-- VoIP Tx settings -->
- <path name="audio-record-voip">
- <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="audio-record-voip handset-mic">
- <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="audio-record-voip speaker-mic">
- <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="audio-record-voip headset-mic">
- <ctl name="MultiMedia10 Mixer SLIM_1_TX" value="1" />
- </path>
-
- <path name="audio-record-voip usb-headset-mic">
- <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="audio-record-voip unprocesses-usb-headset-mic">
- <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="audio-record-voip bt-sco">
- <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="audio-record-voip bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="audio-record-voip bt-sco" />
- </path>
- <path name="spkr-rx-calib">
- <ctl name="SLIMBUS_DL_HL Switch" value="1" />
- </path>
-
- <path name="spkr-vi-record">
- <ctl name="QUAT_MI2S_RX_VI_FB_MUX" value="QUAT_MI2S_TX" />
- </path>
-
- <!-- These are actual sound device specific mixer settings -->
- <path name="amic1">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="AMIC MUX6" value="ADC1" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
- </path>
-
- <path name="amic2">
- <ctl name="AIF3_CAP Mixer SLIM TX1" value="1"/>
- <ctl name="SLIM_1_TX Channels" value="One" />
- <ctl name="CDC_IF TX1 MUX" value="DEC1" />
- <ctl name="ADC MUX1" value="AMIC" />
- <ctl name="AMIC MUX1" value="ADC2" />
- <ctl name="IIR0 INP0 MUX" value="DEC1" />
- </path>
-
- <path name="amic3">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="ADC3 Volume" value="12" />
- <ctl name="AMIC MUX6" value="ADC3" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
- </path>
-
- <path name="amic4">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="AMIC MUX6" value="ADC4" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
- </path>
-
-
- <!-- For Tavil, DMIC numbered from 0 to 5 -->
- <path name="dmic1">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
- </path>
-
- <path name="dmic2">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC1" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
- </path>
-
- <path name="dmic3">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
- </path>
-
- <path name="dmic4">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC3" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
- </path>
-
- <path name="dmic5">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC4" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
- </path>
-
- <path name="dmic6">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC5" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
- </path>
-
- <path name="speaker">
- <ctl name="TFA_Selector Speaker" value="1" />
- <ctl name="TFA_Selector Receiver" value="1" />
- <ctl name="DK Profile" value="speaker" />
- </path>
-
- <path name="speaker-mono">
- <ctl name="TFA_Selector Speaker" value="1" />
- <ctl name="DK Profile" value="speaker" />
- </path>
-
- <path name="speaker-mono-2">
- <ctl name="TFA_Selector Speaker" value="1" />
- <ctl name="DK Profile" value="speaker" />
- </path>
-
- <path name="speaker-for-ringtone">
- <path name="speaker" />
- </path>
-
- <path name="speaker-qrd">
- <path name="speaker-mono-2" />
- </path>
-
- <path name="speaker-hdk">
- <path name="speaker-mono" />
- </path>
-
- <path name="speaker-fluid">
- <path name="speaker-mono" />
- </path>
-
- <path name="speaker-liquid">
- <path name="speaker" />
- </path>
-
- <path name="speaker-safe">
- <path name="speaker-mono"/>
- </path>
-
- <path name="sidetone-iir">
- <ctl name="IIR0 Enable Band1" value="1" />
- <ctl name="IIR0 Enable Band2" value="1" />
- <ctl name="IIR0 Enable Band3" value="1" />
- <ctl name="IIR0 Enable Band4" value="1" />
- <ctl name="IIR0 Enable Band5" value="1" />
- </path>
-
- <path name="sidetone-headphones">
- <path name="sidetone-iir" />
- <ctl name="IIR0 INP0 Volume" value="0" />
- <ctl name="RX INT1 MIX2 INP" value="SRC0" />
- <ctl name="RX INT2 MIX2 INP" value="SRC0" />
- </path>
-
- <path name="sidetone-handset">
- <path name="sidetone-iir" />
- <ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="RX INT7 MIX2 INP" value="SRC0" />
- </path>
-
- <path name="afe-sidetone">
- <ctl name="Voice Sidetone Enable" value="1" />
- </path>
-
- <path name="speaker-mic">
- <path name="amic3" />
- </path>
-
- <path name="speaker-mic-for-voip">
- <path name="amic3" />
- </path>
-
- <path name="speaker-mic-liquid">
- <path name="amic3" />
- </path>
-
- <path name="mic-3">
- <path name="amic4" />
- </path>
-
- <path name="speaker-mic-sbc">
- </path>
-
- <path name="speaker-mic-qrd">
- <path name="amic1" />
- </path>
-
- <path name="speaker-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
- <path name="speaker" />
- <ctl name="VI_FEED_TX Channels" value="Two" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
- <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="SLIM4_TX" />
- </path>
-
- <path name="speaker-protected-qrd">
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
- <path name="speaker-qrd" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
- </path>
-
- <path name="voice-speaker-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
- <path name="speaker-mono" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
- </path>
-
- <path name="voice-speaker-protected-qrd">
- <path name="speaker-protected-qrd" />
- </path>
-
- <path name="voice-speaker-stereo-protected">
- <path name="speaker-protected" />
- </path>
-
- <path name="voice-speaker-2-protected">
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
- <path name="speaker-mono-2" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
- </path>
-
- <path name="vi-feedback">
- </path>
-
- <path name="vi-feedback-mono-1">
- </path>
-
- <path name="vi-feedback-mono-2">
- </path>
-
- <path name="handset">
- <ctl name="TFA_Selector Receiver" value="1" />
- <ctl name="TFA_Selector Speaker" value="0" />
- <ctl name="DK Profile" value="receiver" />
- </path>
-
- <path name="handset-qrd">
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
- <ctl name="EAR PA Gain" value="G_6_DB" />
- </path>
-
- <path name="handset-mic">
- <path name="amic1" />
- <ctl name="ADC1 Volume" value="12" />
- </path>
-
- <path name="handset-mic-qrd">
- <path name="dmic3" />
- <ctl name="DEC7 Volume" value="84" />
- </path>
-
- <path name="voice-handset-mic-qrd">
- <path name="handset-mic-qrd" />
- </path>
-
- <path name="handset-mic-db">
- </path>
-
- <path name="handset-mic-cdp">
- <path name="amic1" />
- </path>
-
- <path name="handset-mic-sbc">
- </path>
-
- <path name="three-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="CDC_IF TX5 MUX" value="DEC5" />
- <ctl name="ADC MUX5" value="DMIC" />
- <ctl name="DMIC MUX5" value="DMIC2" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC0" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
- </path>
-
- <path name="three-mic-qrd">
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="CDC_IF TX5 MUX" value="DEC5" />
- <ctl name="ADC MUX5" value="DMIC" />
- <ctl name="DMIC MUX5" value="DMIC0" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
- <ctl name="DEC5 Volume" value="84" />
- <ctl name="DEC6 Volume" value="84" />
- <ctl name="DEC8 Volume" value="84" />
- </path>
-
- <path name="anc-handset">
- <ctl name="ANC Function" value="ON" />
- <ctl name="ANC Slot" value="6" />
- <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
- <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="ANC OUT EAR SPKR Enable Switch" value="1" />
- <ctl name="ANC SPKR PA Enable Switch" value="1" />
- <ctl name="SpkrLeft WSA PA Gain" value="G_6_DB" />
- </path>
-
- <path name="headphones">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- <ctl name="RX INT2_2 MUX" value="RX3" />
- <ctl name="RX1 Mix Digital Volume" value="84" />
- <ctl name="RX2 Mix Digital Volume" value="84" />
- <ctl name="RX HPH Mode" value="CLS_H_HIFI" />
- </path>
-
- <path name="headphones-ce">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- <ctl name="RX INT2_2 MUX" value="RX3" />
- <ctl name="RX1 Mix Digital Volume" value="80" />
- <ctl name="RX2 Mix Digital Volume" value="80" />
- <ctl name="RX HPH Mode" value="CLS_H_HIFI" />
- </path>
-
- <path name="headphones-three-poles">
- <path name="headphones" />
- </path>
-
- <path name="headphones-three-poles-fm">
- <path name="headphones-three-poles" />
- <ctl name="RX1 Mix Digital Volume" value="73" />
- <ctl name="RX2 Mix Digital Volume" value="73" />
- </path>
-
- <path name="headphones-three-poles-ce">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- <ctl name="RX INT2_2 MUX" value="RX3" />
- <ctl name="RX1 Mix Digital Volume" value="80" />
- <ctl name="RX2 Mix Digital Volume" value="80" />
- <ctl name="RX HPH Mode" value="CLS_H_HIFI" />
- </path>
-
- <path name="headphones-44.1">
- <ctl name="SLIM RX4 MUX" value="AIF3_PB" />
- <ctl name="SLIM RX5 MUX" value="AIF3_PB" />
- <ctl name="SLIM_5_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX4" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX5" />
- <ctl name="RX INT1_1 NATIVE MUX" value="ON" />
- <ctl name="RX INT2_1 NATIVE MUX" value="ON" />
- </path>
-
- <path name="headphones-mono">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="One" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- <ctl name="RX1 Mix Digital Volume" value="84" />
- </path>
-
- <path name="headphones-mono-ce">
- <path name="headphones-mono" />
- <ctl name="RX1 Mix Digital Volume" value="76" />
- </path>
-
- <path name="asrc-mode">
- <ctl name="ASRC0 Output Mode" value="FRAC" />
- <ctl name="ASRC1 Output Mode" value="FRAC" />
- <ctl name="RX INT1_2 NATIVE MUX" value="ON" />
- <ctl name="RX INT2_2 NATIVE MUX" value="ON" />
- <ctl name="ASRC0 MUX" value="ASRC_IN_HPHL" />
- <ctl name="RX INT1 SEC MIX HPHL Switch" value="1" />
- <ctl name="ASRC1 MUX" value="ASRC_IN_HPHR" />
- <ctl name="RX INT2 SEC MIX HPHR Switch" value="1" />
- </path>
-
- <path name="headphones-dsd">
- <ctl name="SLIM RX6 MUX" value="AIF2_PB" />
- <ctl name="SLIM RX7 MUX" value="AIF2_PB" />
- <ctl name="SLIM_2_RX Channels" value="Two" />
- <ctl name="DSD_L IF MUX" value="RX6" />
- <ctl name="DSD_R IF MUX" value="RX7" />
- <ctl name="RX INT1 MIX3 DSD HPHL Switch" value="1" />
- <ctl name="RX INT2 MIX3 DSD HPHR Switch" value="1" />
- <ctl name="SLIM_2_RX Format" value="DSD_DOP" />
- <ctl name="RX HPH Mode" value="CLS_H_HIFI" />
- </path>
-
- <path name="headphones-high-imp">
- <path name="headphones" />
- </path>
-
- <path name="headphones-three-poles-high-imp">
- <path name="headphones-high-imp" />
- </path>
-
- <path name="hph-highquality-mode">
- <ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
- </path>
-
- <path name="hph-lowpower-mode">
- <ctl name="RX HPH Mode" value="CLS_H_ULP" />
- </path>
-
- <path name="true-native-mode">
- </path>
-
- <path name="line">
- <path name="headphones" />
- </path>
-
- <path name="headset-mic">
- <path name="amic2" />
- <ctl name="DEC1 Volume" value="84" />
- <ctl name="ADC2 Volume" value="12" />
- </path>
-
- <path name="headset-mic-liquid">
- <path name="amic2" />
- </path>
-
- <path name="voice-handset">
- <path name="handset" />
- </path>
-
- <path name="voice-handset-voip">
- <path name="handset" />
- </path>
-
- <path name="voice-handset-tmus">
- <path name="handset" />
- </path>
-
- <path name="voice-handset-qrd">
- <path name="handset-qrd" />
- </path>
-
- <path name="voice-handset-tmus-qrd">
- <path name="handset-qrd" />
- </path>
-
- <path name="voice-handset-hdk">
- <path name="handset-qrd" />
- </path>
-
- <path name="voice-handset-tmus-hdk">
- <path name="handset-qrd" />
- </path>
-
- <path name="voice-speaker">
- <path name="speaker-mono" />
- </path>
-
- <path name="voice-speaker-stereo">
- <path name="speaker" />
- </path>
-
- <path name="voice-speaker-qrd">
- <path name="speaker-mono-2" />
- </path>
-
- <path name="voice-speaker-hdk">
- <path name="speaker-mono" />
- </path>
-
- <path name="voice-speaker-2">
- <path name="speaker-mono-2" />
- </path>
-
- <path name="voice-speaker-fluid">
- <path name="speaker-fluid" />
- </path>
-
- <path name="voice-speaker-mic">
- <path name="speaker-mic" />
- </path>
-
- <path name="voice-speaker-bmic">
- <path name="speaker-mic" />
- </path>
-
- <path name="speaker-bmic-for-voip">
- <path name="speaker-mic" />
- </path>
-
- <path name="voice-speaker-mic-qrd">
- <path name="speaker-mic-qrd" />
- </path>
-
- <path name="voice-headphones">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- <ctl name="RX INT2_2 MUX" value="RX3" />
- <ctl name="RX1 Mix Digital Volume" value="80" />
- <ctl name="RX2 Mix Digital Volume" value="80" />
- <ctl name="RX HPH Mode" value="CLS_H_LP" />
- </path>
-
- <path name="headphones-for-voip">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- <ctl name="RX INT2_2 MUX" value="RX3" />
- <ctl name="RX1 Mix Digital Volume" value="70" />
- <ctl name="RX2 Mix Digital Volume" value="70" />
- <ctl name="RX HPH Mode" value="CLS_H_LP" />
- </path>
-
- <path name="voice-headset">
- <path name="headphones" />
- </path>
-
- <path name="voice-line">
- <path name="voice-headphones" />
- </path>
-
- <path name="voice-headset-mic">
- <path name="headset-mic" />
- </path>
-
- <path name="headphones-mic-for-voip">
- <path name="headset-mic" />
- </path>
-
- <path name="voice-headset-mic-qrd">
- <path name="amic2" />
- <ctl name="DEC0 Volume" value="84" />
- </path>
-
- <path name="speaker-and-headphones">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- <ctl name="RX INT2_2 MUX" value="RX3" />
- <ctl name="RX1 Mix Digital Volume" value="67" />
- <ctl name="RX2 Mix Digital Volume" value="67" />
- <ctl name="RX HPH Mode" value="CLS_H_HIFI" />
- <path name="speaker" />
- </path>
-
- <path name="speaker-safe-and-headphones">
- <path name="headphones" />
- <path name="speaker-safe" />
- </path>
-
- <path name="speaker-and-headphones-for-ringtone">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- <ctl name="RX INT2_2 MUX" value="RX3" />
- <ctl name="RX1 Mix Digital Volume" value="67" />
- <ctl name="RX2 Mix Digital Volume" value="67" />
- <ctl name="RX HPH Mode" value="CLS_H_HIFI" />
- <path name="speaker-for-ringtone" />
- </path>
-
- <path name="speaker-and-line">
- <path name="speaker-and-headphones" />
- </path>
-
- <path name="speaker-and-headphones-liquid">
- <path name="headphones" />
- <path name="speaker" />
- </path>
-
- <path name="speaker-and-line-liquid">
- <path name="speaker-and-headphones-liquid" />
- </path>
-
- <path name="usb-headphones">
- </path>
-
- <path name="usb-headset">
- </path>
-
- <path name="afe-proxy">
- </path>
-
- <path name="anc-headphones">
- <ctl name="COMP1 Switch" value="0" />
- <ctl name="COMP2 Switch" value="0" />
- <ctl name="ANC Function" value="ON" />
- <ctl name="ANC Slot" value="0" />
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="Two" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="AMIC MUX10" value="ADC3" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="AMIC MUX12" value="ADC4" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
- <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
- <ctl name="ADC3 Volume" value="8" />
- <ctl name="ADC4 Volume" value="8" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
- <ctl name="RX1 Digital Volume" value="81" />
- <ctl name="RX2 Digital Volume" value="81" />
- <ctl name="ANC OUT HPHL Enable Switch" value="1" />
- <ctl name="ANC OUT HPHR Enable Switch" value="1" />
- </path>
-
- <path name="speaker-and-anc-headphones">
- <path name="anc-headphones" />
- <path name="speaker" />
- </path>
-
- <path name="anc-fb-headphones">
- <path name="anc-headphones" />
- <ctl name="ANC Slot" value="1" />
- </path>
-
- <path name="speaker-and-anc-fb-headphones">
- <path name="anc-fb-headphones" />
- <path name="speaker" />
- </path>
-
- <path name="voice-anc-headphones">
- <path name="anc-headphones" />
- </path>
-
- <path name="voice-anc-fb-headphones">
- <path name="anc-fb-headphones" />
- </path>
-
- <path name="speaker-and-anc-headphones-liquid">
- <path name="anc-headphones" />
- </path>
-
- <path name="display-port">
- </path>
-
- <path name="speaker-and-usb-headphones">
- <path name="speaker" />
- <path name="usb-headphones" />
- </path>
-
- <path name="speaker-safe-and-usb-headphones">
- <path name="speaker-safe" />
- <path name="usb-headphones" />
- </path>
-
- <path name="speaker-and-display-port">
- <path name="speaker" />
- <path name="display-port" />
- </path>
-
- <path name="voice-rec-mic">
- <path name="handset-mic" />
- </path>
-
- <path name="camcorder-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="AMIC MUX7" value="ADC3" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="AMIC" />
- <ctl name="AMIC MUX8" value="ADC1" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="ADC1 Volume" value="8" />
- <ctl name="ADC3 Volume" value="8" />
- </path>
-
- <path name="camcorder-mic-inverse">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="AMIC MUX7" value="ADC1" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="AMIC" />
- <ctl name="AMIC MUX8" value="ADC3" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="ADC1 Volume" value="8" />
- <ctl name="ADC3 Volume" value="8" />
- </path>
-
- <path name="camcorder-mic-focus">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="AMIC MUX7" value="ADC3" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="AMIC" />
- <ctl name="AMIC MUX8" value="ADC1" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="ADC1 Volume" value="8" />
- <ctl name="ADC3 Volume" value="8" />
- </path>
-
- <path name="camcorder-mic-focus-inverse">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="AMIC MUX7" value="ADC1" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="AMIC" />
- <ctl name="AMIC MUX8" value="ADC3" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="ADC1 Volume" value="8" />
- <ctl name="ADC3 Volume" value="8" />
- </path>
-
- <path name="bt-sco-headset">
- </path>
-
- <path name="bt-sco-mic">
- </path>
-
- <path name="bt-sco-headset-wb">
- </path>
-
- <path name="bt-sco-mic-wb">
- </path>
-
- <path name="bt-sco-headset-PLT-M55">
- </path>
-
- <path name="bt-sco-mic-PLT-M55">
- </path>
-
- <path name="bt-sco-headset-wb-PLT-M55">
- </path>
-
- <path name="bt-sco-mic-wb-PLT-M55">
- </path>
-
- <path name="bt-sco-headset-PLT-M70">
- </path>
-
- <path name="bt-sco-mic-PLT-M70">
- </path>
-
- <path name="bt-sco-headset-wb-PLT-M70">
- </path>
-
- <path name="bt-sco-mic-wb-PLT-M70">
- </path>
-
- <path name="bt-sco-headset-PLT-M165">
- </path>
-
- <path name="bt-sco-mic-PLT-M165">
- </path>
-
- <path name="bt-sco-headset-wb-PLT-M165">
- </path>
-
- <path name="bt-sco-mic-wb-PLT-M165">
- </path>
-
- <path name="bt-sco-headset-Mi">
- </path>
-
- <path name="bt-sco-mic-Mi">
- </path>
-
- <path name="bt-sco-headset-wb-Mi">
- </path>
-
- <path name="bt-sco-mic-wb-Mi">
- </path>
-
- <path name="bt-sco-headset-Jabra-Mini">
- </path>
-
- <path name="bt-sco-mic-Jabra-Mini">
- </path>
-
- <path name="bt-sco-headset-wb-Jabra-Mini">
- </path>
-
- <path name="bt-sco-mic-wb-Jabra-Mini">
- </path>
-
- <path name="bt-sco-headset-ERA-by-Jawbone">
- </path>
-
- <path name="bt-sco-mic-ERA-by-Jawbone">
- </path>
-
- <path name="bt-sco-headset-wb-ERA-by-Jawbone">
- </path>
-
- <path name="bt-sco-mic-wb-ERA-by-Jawbone">
- </path>
-
- <path name="bt-sco-headset-QCY-QY7">
- </path>
-
- <path name="bt-sco-mic-QCY-QY7">
- </path>
-
- <path name="bt-sco-headset-wb-QCY-QY7">
- </path>
-
- <path name="bt-sco-mic-wb-QCY-QY7">
- </path>
-
- <path name="bt-sco-headset-JETech-H0782">
- </path>
-
- <path name="bt-sco-mic-JETech-H0782">
- </path>
-
- <path name="bt-sco-headset-wb-JETech-H0782">
- </path>
-
- <path name="bt-sco-mic-wb-JETech-H0782">
- </path>
-
- <path name="bt-sco-headset-GOOKEE-B8">
- </path>
-
- <path name="bt-sco-mic-GOOKEE-B8">
- </path>
-
- <path name="bt-sco-headset-wb-GOOKEE-B8">
- </path>
-
- <path name="bt-sco-mic-wb-GOOKEE-B8">
- </path>
-
- <path name="bt-sco-headset-Spirent-Nomad">
- </path>
-
- <path name="bt-sco-mic-Spirent-Nomad">
- </path>
-
- <path name="bt-sco-headset-wb-Spirent-Nomad">
- </path>
-
- <path name="bt-sco-mic-wb-Spirent-Nomad">
- </path>
-
- <path name="bt-sco-headset-PLT-Legend">
- </path>
-
- <path name="bt-sco-mic-PLT-Legend">
- </path>
-
- <path name="bt-sco-headset-wb-PLT-Legend">
- </path>
-
- <path name="bt-sco-mic-wb-PLT-Legend">
- </path>
-
- <path name="bt-sco-headset-One-More-EB100">
- </path>
-
- <path name="bt-sco-mic-One-More-EB100">
- </path>
-
- <path name="bt-sco-headset-wb-One-More-EB100">
- </path>
-
- <path name="bt-sco-mic-wb-One-More-EB100">
- </path>
-
- <path name="bt-sco-headset-Inna-Style">
- </path>
-
- <path name="bt-sco-mic-Inna-Style">
- </path>
-
- <path name="bt-sco-headset-wb-Inna-Style">
- </path>
-
- <path name="bt-sco-mic-wb-Inna-Style">
- </path>
-
- <path name="bt-sco-headset-Aukey-EP-B13">
- </path>
-
- <path name="bt-sco-mic-Aukey-EP-B13">
- </path>
-
- <path name="bt-sco-headset-wb-Aukey-EP-B13">
- </path>
-
- <path name="bt-sco-mic-wb-Aukey-EP-B13">
- </path>
-
- <path name="bt-sco-headset-Vasa-Bla">
- </path>
-
- <path name="bt-sco-mic-Vasa-Bla">
- </path>
-
- <path name="bt-sco-headset-wb-Vasa-Bla">
- </path>
-
- <path name="bt-sco-mic-wb-Vasa-Bla">
- </path>
-
- <path name="bt-sco-headset-Aibo-BT800">
- </path>
-
- <path name="bt-sco-mic-Aibo-BT800">
- </path>
-
- <path name="bt-sco-headset-wb-Aibo-BT800">
- </path>
-
- <path name="bt-sco-mic-wb-Aibo-BT800">
- </path>
-
- <path name="bt-sco-headset-Jogger-Pro">
- </path>
-
- <path name="bt-sco-mic-Jogger-Pro">
- </path>
-
- <path name="bt-sco-headset-wb-Jogger-Pro">
- </path>
-
- <path name="bt-sco-mic-wb-Jogger-Pro">
- </path>
-
- <path name="bt-sco-headset-BlueAnt-Pump-Mini">
- </path>
-
- <path name="bt-sco-mic-BlueAnt-Pump-Mini">
- </path>
-
- <path name="bt-sco-headset-wb-BlueAnt-Pump-Mini">
- </path>
-
- <path name="bt-sco-mic-wb-BlueAnt-Pump-Mini">
- </path>
-
- <path name="bt-sco-headset-TaoTronics-TT-BH06">
- </path>
-
- <path name="bt-sco-mic-TaoTronics-TT-BH06">
- </path>
-
- <path name="bt-sco-headset-wb-TaoTronics-TT-BH06">
- </path>
-
- <path name="bt-sco-mic-wb-TaoTronics-TT-BH06">
- </path>
-
- <path name="bt-sco-headset-SENNHEISER-HD-4P40">
- </path>
-
- <path name="bt-sco-mic-SENNHEISER-HD-4P40">
- </path>
-
- <path name="bt-sco-headset-wb-SENNHEISER-HD-4P40">
- </path>
-
- <path name="bt-sco-mic-wb-SENNHEISER-HD-4P40">
- </path>
-
- <path name="bt-sco-headset-Mi-Basic">
- </path>
-
- <path name="bt-sco-mic-Mi-Basic">
- </path>
-
- <path name="bt-sco-headset-wb-Mi-Basic">
- </path>
-
- <path name="bt-sco-mic-wb-Mi-Basic">
- </path>
-
- <path name="usb-headset-mic">
- </path>
-
- <path name="unprocesses-usb-headset-mic">
- </path>
-
- <path name="capture-fm">
- </path>
-
- <path name="aanc-path">
- <ctl name="ADC MUX10" value="DMIC" />
- <ctl name="DMIC MUX10" value="DMIC5" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_EAR_SPKR" />
- </path>
-
- <path name="aanc-handset-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="AANC_SLIM_0_RX MUX" value="SLIMBUS_0_TX" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
- <ctl name="CDC_IF TX9 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
- </path>
-
- <path name="aanc-handset-mic-qrd">
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="AANC_SLIM_0_RX MUX" value="SLIMBUS_0_TX" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
- <ctl name="CDC_IF TX9 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="IIR0 INP0 MUX" value="DEC6" />
- <ctl name="DEC6 Volume" value="84" />
- <ctl name="DEC8 Volume" value="84" />
- <ctl name="DEC7 Volume" value="84" />
- </path>
-
- <!-- VOIP CALL BEGIN-->
- <path name="handset-for-voip">
- <path name="handset" />
- </path>
-
- <path name="speaker-for-voip">
- <path name="speaker-mono-2" />
- </path>
- <!-- VOIP CALL END-->
-
- <!-- Dual MIC devices -->
- <path name="handset-dmic-endfire">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="AMIC MUX7" value="ADC1" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="AMIC" />
- <ctl name="AMIC MUX8" value="ADC3" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- </path>
-
- <path name="speaker-dmic-endfire">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="AMIC MUX7" value="ADC3" />
- <ctl name="ADC3 Volume" value="8" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="AMIC" />
- <ctl name="AMIC MUX8" value="ADC1" />
- <ctl name="ADC1 Volume" value="5" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- </path>
-
- <path name="handset-dmic-endfire-qrd">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC5" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="DEC7 Volume" value="84" />
- <ctl name="DEC8 Volume" value="84" />
- </path>
-
- <path name="speaker-dmic-endfire-qrd">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC2" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="DEC7 Volume" value="84" />
- <ctl name="DEC8 Volume" value="84" />
- </path>
-
- <path name="dmic-endfire">
- <path name="handset-dmic-endfire" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
- </path>
-
- <path name="dmic-ef-voip">
- <path name="handset-dmic-endfire" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
- </path>
-
- <path name="dmic-endfire-liquid">
- <path name="handset-dmic-endfire" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
- </path>
-
- <path name="dmic-endfire-qrd">
- <path name="handset-dmic-endfire-qrd" />
- </path>
-
- <path name="handset-stereo-dmic-ef">
- <path name="handset-dmic-endfire" />
- </path>
-
- <path name="speaker-stereo-dmic-ef">
- <path name="speaker-dmic-endfire" />
- </path>
-
- <path name="speaker-dmic-for-voip">
- <path name="speaker-dmic-endfire" />
- </path>
-
- <path name="voice-dmic-ef-tmus">
- <path name="dmic-endfire" />
- </path>
-
- <path name="voice-dmic-ef">
- <path name="dmic-endfire" />
- </path>
-
- <path name="voice-speaker-dmic-ef">
- <path name="speaker-dmic-endfire" />
- </path>
-
- <path name="voice-rec-dmic-ef">
- <path name="dmic-endfire" />
- </path>
-
- <path name="voice-rec-dmic-ef-fluence">
- <path name="dmic-endfire" />
- </path>
-
- <path name="handset-stereo-dmic-ef-liquid">
- <path name="handset-dmic-endfire" />
- </path>
-
- <path name="speaker-stereo-dmic-ef-liquid">
- <path name="speaker-dmic-endfire" />
- </path>
-
- <path name="voice-dmic-ef-liquid-liquid">
- <path name="dmic-endfire-liquid" />
- </path>
-
- <path name="voice-speaker-dmic-ef-liquid">
- <path name="dmic-endfire-liquid" />
- </path>
-
- <path name="voice-rec-dmic-ef-liquid">
- <path name="dmic-endfire-liquid" />
- </path>
-
- <path name="voice-rec-dmic-ef-fluence-liquid">
- <path name="dmic-endfire-liquid" />
- </path>
-
- <path name="handset-stereo-dmic-ef-qrd">
- <path name="handset-dmic-endfire-qrd" />
- </path>
-
- <path name="speaker-stereo-dmic-ef-qrd">
- <path name="speaker-dmic-endfire-qrd" />
- </path>
-
- <path name="voice-dmic-ef-qrd">
- <path name="dmic-endfire-qrd" />
- </path>
-
- <path name="voice-speaker-dmic-ef-qrd">
- <path name="speaker-dmic-endfire-qrd" />
- </path>
-
- <path name="speaker-dmic-broadside">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC2" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC0" />
- </path>
-
- <path name="speaker-dmic-broadside-qrd">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC0" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC2" />
- <ctl name="DEC7 Volume" value="84" />
- <ctl name="DEC8 Volume" value="84" />
- </path>
-
- <path name="dmic-broadside">
- <path name="speaker-dmic-broadside" />
- <ctl name="IIR0 INP0 MUX" value="DEC7" />
- </path>
-
- <path name="voice-speaker-dmic-broadside">
- <path name="dmic-broadside" />
- </path>
-
- <path name="voice-speaker-dmic-broadside-qrd">
- <path name="speaker-dmic-broadside-qrd" />
- </path>
-
- <!-- Tri MIC devices -->
- <path name="speaker-tmic">
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="CDC_IF TX5 MUX" value="DEC5" />
- <ctl name="ADC MUX5" value="AMIC" />
- <ctl name="AMIC MUX5" value="ADC3" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="AMIC MUX6" value="ADC4" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="AMIC MUX7" value="ADC1" />
- </path>
-
- <path name="speaker-tmic-qrd">
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Three" />
- <ctl name="CDC_IF TX5 MUX" value="DEC5" />
- <ctl name="ADC MUX5" value="DMIC" />
- <ctl name="DMIC MUX5" value="DMIC0" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC5" />
- <ctl name="DEC5 Volume" value="84" />
- <ctl name="DEC6 Volume" value="84" />
- <ctl name="DEC7 Volume" value="84" />
- </path>
-
- <path name="voice-speaker-tmic">
- <path name="speaker-tmic" />
- </path>
-
- <path name="speaker-tmic-for-voip">
- <path name="voice-speaker-tmic" />
- </path>
-
- <path name="voice-speaker-tmic-qrd">
- <path name="speaker-tmic-qrd" />
- </path>
-
- <!-- Quad MIC devices -->
- <path name="speaker-qmic">
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Four" />
- <ctl name="CDC_IF TX5 MUX" value="DEC5" />
- <ctl name="ADC MUX5" value="DMIC" />
- <ctl name="DMIC MUX5" value="DMIC2" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC0" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC5" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC4" />
- </path>
-
- <path name="speaker-qmic-qrd">
- <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Four" />
- <ctl name="CDC_IF TX5 MUX" value="DEC5" />
- <ctl name="ADC MUX5" value="DMIC" />
- <ctl name="DMIC MUX5" value="DMIC0" />
- <ctl name="CDC_IF TX6 MUX" value="DEC6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC2" />
- <ctl name="CDC_IF TX7 MUX" value="DEC7" />
- <ctl name="ADC MUX7" value="DMIC" />
- <ctl name="DMIC MUX7" value="DMIC5" />
- <ctl name="CDC_IF TX8 MUX" value="DEC8" />
- <ctl name="ADC MUX8" value="DMIC" />
- <ctl name="DMIC MUX8" value="DMIC3" />
- <ctl name="DEC5 Volume" value="84" />
- <ctl name="DEC6 Volume" value="84" />
- <ctl name="DEC7 Volume" value="84" />
- <ctl name="DEC8 Volume" value="84" />
- </path>
-
- <path name="speaker-qmic-liquid">
- </path>
-
- <path name="voice-speaker-qmic">
- <path name="speaker-qmic" />
- </path>
-
- <path name="speaker-qmic-for-voip">
- <path name="speaker-qmic" />
- </path>
-
- <path name="quad-mic">
- <path name="speaker-qmic" />
- </path>
-
- <path name="voice-speaker-qmic-liquid">
- <path name="speaker-qmic-liquid" />
- </path>
-
- <path name="quad-mic-liquid">
- <path name="speaker-qmic-liquid" />
- </path>
-
- <path name="quad-mic-qrd">
- <path name="speaker-qmic-qrd" />
- </path>
-
- <path name="voice-speaker-qmic-qrd">
- <path name="speaker-qmic-qrd" />
- </path>
-
- <!-- TTY devices -->
-
- <path name="tty-headphones">
- <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
- <ctl name="SLIM_6_RX Channels" value="One" />
- <ctl name="RX INT1_2 MUX" value="RX2" />
- </path>
-
- <path name="voice-tty-full-headphones">
- <ctl name="TTY Mode" value="FULL" />
- <path name="tty-headphones" />
- </path>
-
- <path name="voice-tty-full-headset">
- <ctl name="TTY Mode" value="FULL" />
- <path name="tty-headphones" />
- </path>
-
- <path name="voice-tty-vco-headphones">
- <ctl name="TTY Mode" value="VCO" />
- <path name="tty-headphones" />
- </path>
-
- <path name="voice-tty-vco-headset">
- <ctl name="TTY Mode" value="VCO" />
- <path name="tty-headphones" />
- </path>
-
- <path name="voice-tty-hco-handset">
- <ctl name="TTY Mode" value="HCO" />
- <path name="handset" />
- </path>
-
- <path name="voice-tty-hco-handset-qrd">
- <ctl name="TTY Mode" value="HCO" />
- <path name="handset-qrd" />
- </path>
-
- <path name="voice-tty-hco-handset-hdk">
- <ctl name="TTY Mode" value="HCO" />
- <path name="handset-qrd" />
- </path>
-
- <path name="voice-tty-full-headset-mic">
- <path name="amic2" />
- <ctl name="ADC2 Volume" value="0" />
- <ctl name="DEC1 Volume" value="84" />
- </path>
-
- <path name="voice-tty-hco-headset-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX0" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="CDC_IF TX0 MUX" value="DEC0" />
- <ctl name="ADC MUX0" value="AMIC" />
- <ctl name="AMIC MUX0" value="ADC2" />
- <ctl name="IIR0 INP0 MUX" value="DEC0" />
- </path>
-
- <path name="voice-tty-vco-handset-mic">
- <path name="amic1" />
- </path>
-
- <path name="unprocessed-handset-mic">
- <path name="handset-mic" />
- </path>
-
- <path name="unprocessed-mic">
- <path name="unprocessed-handset-mic" />
- </path>
-
- <path name="unprocessed-stereo-mic">
- <path name="voice-rec-dmic-ef" />
- </path>
-
- <path name="unprocessed-three-mic">
- <path name="three-mic" />
- </path>
-
- <path name="unprocessed-quad-mic">
- <path name="quad-mic" />
- </path>
-
- <path name="unprocessed-headset-mic">
- <path name="amic2" />
- </path>
-
- <!-- USB TTY start -->
-
- <!-- full: both end tty -->
- <path name="voice-tty-full-usb">
- <ctl name="TTY Mode" value="FULL" />
- <path name="usb-headphones" />
- </path>
-
- <path name="voice-tty-full-usb-mic">
- <path name="usb-headset-mic" />
- </path>
-
- <!-- vco, in: handset mic use existing, out: tty -->
- <path name="voice-tty-vco-usb">
- <ctl name="TTY Mode" value="VCO" />
- <path name="usb-headphones" />
- </path>
-
- <!-- hco, in: tty, out: speaker, use existing handset -->
- <path name="voice-tty-hco-usb-mic">
- <path name="voice-tty-full-usb-mic" />
- </path>
-
- <!-- USB TTY end -->
-
- <!-- Added for ADSP testfwk -->
- <path name="ADSP testfwk">
- <ctl name="SLIMBUS_DL_HL Switch" value="1" />
- </path>
-
- <path name="bt-a2dp">
- <ctl name="SLIM7_RX ADM Channels" value="Two" />
- </path>
-
- <path name="speaker-and-bt-a2dp">
- <path name="speaker" />
- <path name="bt-a2dp" />
- </path>
-
- <path name="speaker-safe-and-bt-a2dp">
- <path name="speaker-safe" />
- <path name="bt-a2dp" />
- </path>
-
- <path name="deep-buffer-playback bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="1" />
- </path>
-
- <path name="low-latency-playback bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="1" />
- </path>
-
- <path name="compress-offload-playback bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback2 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="1" />
- </path>
-
- <path name="compress-offload-playback3 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
- </path>
-
- <path name="compress-offload-playback4 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="1" />
- </path>
-
- <path name="compress-offload-playback5 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="1" />
- </path>
-
- <path name="compress-offload-playback6 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="1" />
- </path>
-
- <path name="compress-offload-playback7 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="1" />
- </path>
-
- <path name="compress-offload-playback8 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="1" />
- </path>
-
- <path name="compress-offload-playback9 bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="audio-ull-playback bt-a2dp">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />
- </path>
-
- <path name="deep-buffer-playback speaker-and-bt-a2dp">
- <path name="deep-buffer-playback bt-a2dp" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="deep-buffer-playback speaker-safe-and-bt-a2dp">
- <path name="deep-buffer-playback bt-a2dp" />
- <path name="deep-buffer-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-and-bt-a2dp">
- <path name="compress-offload-playback bt-a2dp" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="compress-offload-playback speaker-safe-and-bt-a2dp">
- <path name="compress-offload-playback bt-a2dp" />
- <path name="compress-offload-playback" />
- </path>
-
- <path name="low-latency-playback speaker-and-bt-a2dp">
- <path name="low-latency-playback bt-a2dp" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="low-latency-playback speaker-safe-and-bt-a2dp">
- <path name="low-latency-playback bt-a2dp" />
- <path name="low-latency-playback" />
- </path>
-
- <path name="compress-offload-playback2 speaker-and-bt-a2dp">
- <path name="compress-offload-playback2 bt-a2dp" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback2 speaker-safe-and-bt-a2dp">
- <path name="compress-offload-playback2 bt-a2dp" />
- <path name="compress-offload-playback2" />
- </path>
-
- <path name="compress-offload-playback3 speaker-and-bt-a2dp">
- <path name="compress-offload-playback3 bt-a2dp" />
- <path name="compress-offload-playback3" />
- </path>
-
- <path name="compress-offload-playback4 speaker-and-bt-a2dp">
- <path name="compress-offload-playback4 bt-a2dp" />
- <path name="compress-offload-playback4" />
- </path>
-
- <path name="compress-offload-playback5 speaker-and-bt-a2dp">
- <path name="compress-offload-playback5 bt-a2dp" />
- <path name="compress-offload-playback5" />
- </path>
-
- <path name="compress-offload-playback6 speaker-and-bt-a2dp">
- <path name="compress-offload-playback6 bt-a2dp" />
- <path name="compress-offload-playback6" />
- </path>
-
- <path name="compress-offload-playback7 speaker-and-bt-a2dp">
- <path name="compress-offload-playback7 bt-a2dp" />
- <path name="compress-offload-playback7" />
- </path>
-
- <path name="compress-offload-playback8 speaker-and-bt-a2dp">
- <path name="compress-offload-playback8 bt-a2dp" />
- <path name="compress-offload-playback8" />
- </path>
-
- <path name="compress-offload-playback9 speaker-and-bt-a2dp">
- <path name="compress-offload-playback9 bt-a2dp" />
- <path name="compress-offload-playback9" />
- </path>
-
- <path name="audio-ull-playback speaker-and-bt-a2dp">
- <path name="audio-ull-playback bt-a2dp" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="audio-ull-playback speaker-safe-and-bt-a2dp">
- <path name="audio-ull-playback bt-a2dp" />
- <path name="audio-ull-playback" />
- </path>
-
- <path name="mmap-playback">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback speaker">
- <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback headphones">
- <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback headset">
- <path name="mmap-playback headphones" />
- </path>
-
- <path name="mmap-playback speaker-and-headphones">
- <path name="mmap-playback" />
- <path name="mmap-playback headphones" />
- </path>
-
- <path name="mmap-playback speaker-safe-and-headphones">
- <path name="mmap-playback" />
- <path name="mmap-playback headphones" />
- </path>
-
- <path name="mmap-playback bt-sco">
- <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="mmap-playback bt-sco" />
- </path>
-
- <path name="mmap-playback afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback hdmi">
- <ctl name="HDMI Mixer MultiMedia16" value="1" />
- </path>
-
- <path name="mmap-playback speaker-and-hdmi">
- <path name="mmap-playback hdmi" />
- <path name="mmap-playback" />
- </path>
-
- <path name="mmap-playback speaker-and-display-port">
- <path name="mmap-playback display-port" />
- <path name="mmap-playback" />
- </path>
-
- <path name="mmap-playback speaker-and-usb-headphones">
- <path name="mmap-playback usb-headphones" />
- <path name="mmap-playback" />
- </path>
-
- <path name="mmap-playback speaker-safe-and-usb-headphones">
- <path name="mmap-playback usb-headphones" />
- <path name="mmap-playback" />
- </path>
-
- <path name="mmap-record">
- <ctl name="MultiMedia16 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="mmap-record bt-sco">
- <ctl name="MultiMedia16 Mixer SLIM_7_TX" value="1" />
- </path>
-
- <path name="mmap-record bt-sco-wb">
- <ctl name="BT SampleRate" value="KHZ_16" />
- <path name="mmap-record bt-sco" />
- </path>
-
- <path name="mmap-record capture-fm">
- <ctl name="MultiMedia16 Mixer SLIM_8_TX" value="1" />
- </path>
-
- <path name="mmap-record usb-headset-mic">
- <ctl name="MultiMedia16 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="mmap-record unprocesses-usb-headset-mic">
- <ctl name="MultiMedia16 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="hifi-playback display-port">
- <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
- </path>
-
- <path name="hifi-playback afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
- </path>
-
- <path name="hifi-playback usb-headset">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />
- </path>
-
- <path name="hifi-playback usb-headphones">
- <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />
- </path>
-
- <path name="hifi-record">
- <ctl name="MultiMedia2 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="hifi-record usb-headset-mic">
- <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="hifi-record unprocesses-usb-headset-mic">
- <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />
- </path>
-
- <path name="incall_music_uplink">
- <ctl name="Incall_Music Audio Mixer MultiMedia9" value="1" />
- </path>
-
- <path name="incall_music_uplink speaker">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink handset">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink handset-hac">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink display-port">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink bt-sco">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink bt-sco-wb">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-display-port">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink afe-proxy">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink usb-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink usb-headset">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-usb-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-safe-and-usb-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-safe-and-headphones">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-bt-sco">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-safe-and-bt-sco">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink voice-tty-hco-handset">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-and-bt-a2dp">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink speaker-safe-and-bt-a2dp">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink bt-a2dp">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink afe-proxy">
- <path name="incall_music_uplink" />
- </path>
-
- <path name="incall_music_uplink2">
- <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" />
- </path>
-
- <path name="incall_music_uplink2 speaker">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 handset">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 handset-hac">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 display-port">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 bt-sco">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 bt-sco-wb">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 speaker-and-display-port">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 afe-proxy">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 usb-headphones">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 usb-headset">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 speaker-and-usb-headphones">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 headphones">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 speaker-and-headphones">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 speaker-and-bt-sco">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 voice-tty-hco-handset">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 speaker-and-bt-a2dp">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 bt-a2dp">
- <path name="incall_music_uplink2" />
- </path>
-
- <path name="incall_music_uplink2 afe-proxy">
- <path name="incall_music_uplink2" />
- </path>
-</mixer>
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index d165ec1..b9c397a 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -21,7 +21,7 @@
#ifndef _BDROID_BUILDCFG_H
#define _BDROID_BUILDCFG_H
-#define BTM_DEF_LOCAL_NAME "ZenFone 6"
+#define BTM_DEF_LOCAL_NAME "ZenFone 8"
// Disables read remote device feature
#define MAX_ACL_CONNECTIONS 16
#define MAX_L2CAP_CHANNELS 16
diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp
index 963dc6b..3ffaaa5 100644
--- a/bootctrl/Android.bp
+++ b/bootctrl/Android.bp
@@ -15,7 +15,7 @@
//
cc_library {
- name: "bootctrl.msmnile",
+ name: "bootctrl.lahaina",
defaults: ["bootctrl_hal_defaults"],
- static_libs: ["libgptutils.asus_msmnile"],
+ static_libs: ["libgptutils.asus_lahaina"],
}
diff --git a/config.fs b/config.fs
index 457a8e8..d82d9aa 100644
--- a/config.fs
+++ b/config.fs
@@ -1,4 +1,4 @@
-[system/product/vendor_overlay/*/bin/*]
+[product/vendor_overlay/*/bin/*]
mode: 0755
user: AID_ROOT
group: AID_SHELL
diff --git a/configs/excluded-input-devices.xml b/configs/excluded-input-devices.xml
deleted file mode 100644
index 32aac2c..0000000
--- a/configs/excluded-input-devices.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2018 The Linux Foundation. All rights reserved. -->
-<!-- -->
-<!-- Redistribution and use in source and binary forms, with or without -->
-<!-- modification, are permitted provided that the following conditions are -->
-<!-- met: -->
-<!-- * Redistributions of source code must retain the above copyright -->
-<!-- notice, this list of conditions and the following disclaimer. -->
-<!-- * Redistributions in binary form must reproduce the above -->
-<!-- copyright notice, this list of conditions and the following -->
-<!-- disclaimer in the documentation and/or other materials provided -->
-<!-- with the distribution. -->
-<!-- * Neither the name of The Linux Foundation nor the names of its -->
-<!-- contributors may be used to endorse or promote products derived -->
-<!-- from this software without specific prior written permission. -->
-<!-- -->
-<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -->
-<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -->
-<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
-<!-- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
-<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
-<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -->
-<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -->
-<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -->
-<!-- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -->
-<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
-<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
-<devices>
- <device name="qti-haptics"/>
-</devices>
diff --git a/device.mk b/device.mk
index 605fef4..270e64a 100755
--- a/device.mk
+++ b/device.mk
@@ -19,7 +19,7 @@
# device-specific aspects (drivers) with a device-agnostic
# product configuration (apps).
#
-$(call inherit-product, vendor/asus/zenfone6/zenfone6-vendor.mk)
+$(call inherit-product, vendor/asus/zenfone8/zenfone8-vendor.mk)
# Overlays
DEVICE_PACKAGE_OVERLAYS += \
@@ -30,13 +30,7 @@
PRODUCT_TARGET_VNDK_VERSION := 30
# A/B
-AB_OTA_UPDATER := true
-
-AB_OTA_PARTITIONS += \
- boot \
- dtbo \
- system \
- vbmeta
+ENABLE_VIRTUAL_AB := true
AB_OTA_POSTINSTALL_CONFIG += \
RUN_POSTINSTALL_system=true \
@@ -47,18 +41,24 @@
PRODUCT_PACKAGES += \
omnipreopt_script
+# tell update_engine to not change dynamic partition table during updates
+# needed since our qti_dynamic_partitions does not include
+# vendor and odm and we also dont want to AB update them
+TARGET_ENFORCE_AB_OTA_PARTITION_LIST := true
+
# ANT+
PRODUCT_PACKAGES += \
AntHalService
# Api
-PRODUCT_SHIPPING_API_LEVEL := 28
+PRODUCT_SHIPPING_API_LEVEL := 30
# audio
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/audio/audio_policy_configuration.xml \
- $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/audio_policy_configuration.xml \
- $(LOCAL_PATH)/audio/audio_policy_volumes_ZS630KL.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/audio_policy_volumes_ZS630KL.xml
+ $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/audio/ZS590KS/audio_policy_configuration_ZS590KS.xml \
+ $(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/audio/ZS590KS/audio_policy_volumes_ZS590KS.xml \
+ $(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/audio_policy_volumes.xml
# Bluetooth
PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/commonsys/packages/apps/Bluetooth
@@ -72,8 +72,8 @@
# Boot control
PRODUCT_PACKAGES += \
- android.hardware.boot@1.0-impl.recovery \
- bootctrl.msmnile.recovery
+ android.hardware.boot@1.1-impl.recovery \
+ bootctrl.lahaina.recovery
PRODUCT_PACKAGES_DEBUG += \
bootctl
@@ -86,8 +86,7 @@
# DeviceParts
PRODUCT_PACKAGES += \
- DeviceParts \
- OmniDisplayManager
+ DeviceParts
# Display
PRODUCT_PACKAGES += \
@@ -97,9 +96,9 @@
PRODUCT_PACKAGES += \
libtinyalsa
-# Exclude vibrator from InputManager
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/excluded-input-devices.xml:system/etc/excluded-input-devices.xml
+# fastbootd
+PRODUCT_PACKAGES += \
+ fastbootd
# FM
PRODUCT_PACKAGES += \
@@ -122,9 +121,10 @@
# Input
PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/keylayout/fts_ts.idc:system/usr/idc/fts_ts.idc \
+ $(LOCAL_PATH)/keylayout/fts_ts.kcm:system/usr/keychars/fts_ts.kcm \
$(LOCAL_PATH)/keylayout/fts_ts.kl:system/usr/keylayout/fts_ts.kl \
- $(LOCAL_PATH)/keylayout/goodixfp.kl:system/usr/keylayout/goodixfp.kl \
- $(LOCAL_PATH)/keylayout/googlekey_input.kl:system/usr/keylayout/googlekey_input.kl
+ $(LOCAL_PATH)/keylayout/i-rocks_Bluetooth_Keyboard.kl:system/usr/keylayout/i-rocks_Bluetooth_Keyboard.kl
# Live Wallpapers
PRODUCT_PACKAGES += \
@@ -142,8 +142,10 @@
# Prebuilt
PRODUCT_COPY_FILES += \
- $(call find-copy-subdir-files,*,device/asus/zenfone6/prebuilt/system,system) \
- $(call find-copy-subdir-files,*,device/asus/zenfone6/prebuilt/recovery,recovery/root)
+ $(call find-copy-subdir-files,*,device/asus/zenfone8/prebuilt/product,product) \
+ $(call find-copy-subdir-files,*,device/asus/zenfone8/prebuilt/root,recovery/root) \
+ $(call find-copy-subdir-files,*,device/asus/zenfone8/prebuilt/system,system) \
+ $(call find-copy-subdir-files,*,device/asus/zenfone8/prebuilt/system_ext,system_ext)
PRODUCT_AAPT_CONFIG := normal
PRODUCT_AAPT_PREF_CONFIG := xxhdpi
@@ -159,6 +161,10 @@
PRODUCT_PACKAGES += \
vndk_package
+# Ramdisk
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/fstab.qcom:$(TARGET_COPY_OUT_RAMDISK)/fstab.qcom
+
# Remove unwanted packages
PRODUCT_PACKAGES += \
RemovePackages
@@ -194,6 +200,9 @@
PRODUCT_PACKAGES_DEBUG += \
update_engine_client
+PRODUCT_BUILD_SUPER_PARTITION := false
+PRODUCT_USE_DYNAMIC_PARTITIONS := true
+
# WiFi
PRODUCT_PACKAGES += \
TetheringOverlay \
diff --git a/extract-files.sh b/extract-files.sh
index ed29f36..bb3ea0b 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -18,7 +18,7 @@
set -e
-DEVICE=zenfone6
+DEVICE=zenfone8
VENDOR=asus
# Load extractutils and do some sanity checks
diff --git a/fstab.qcom b/fstab.qcom
new file mode 100644
index 0000000..7c990b9
--- /dev/null
+++ b/fstab.qcom
@@ -0,0 +1,58 @@
+# Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted (subject to the limitations in the
+# disclaimer below) provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# * Neither the name of The Linux Foundation nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Android fstab file.
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
+system /system ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
+system_ext /system_ext ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
+product /product ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
+vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount
+odm /odm ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount
+/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount
+/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1 wait
+/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,inlinecrypt,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,metadata_encryption=aes-256-xts:wrappedkey_v0,quota,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs
+/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
+/devices/platform/soc/8804000.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto
+/devices/platform/soc/1da4000.ufshc_card/host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto
+/devices/platform/soc/*.ssusb/*.dwc3/xhci-hcd.*.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto
+/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect
+/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect
+/dev/block/bootdevice/by-name/vm-bootsys /vendor/vm-system ext4 ro,nosuid,nodev,barrier=1 wait,slotselect
+/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect
+/dev/block/bootdevice/by-name/qmcs /mnt/vendor/qmcs vfat noatime,nosuid,nodev,context=u:object_r:vendor_qmcs_file:s0 wait,check,formattable
+
+/dev/block/bootdevice/by-name/asusfw /vendor/asusfw ext4 ro,nosuid,noatime,nodev,barrier=1,noauto_da_alloc wait,slotselect
+/dev/block/bootdevice/by-name/xrom /vendor/xrom ext4 ro,nosuid,noatime,nodev,barrier=1,noauto_da_alloc wait,slotselect
+
diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp
index 2d6d0c5..57c29d8 100644
--- a/gpt-utils/Android.bp
+++ b/gpt-utils/Android.bp
@@ -16,7 +16,7 @@
cc_library {
- name: "libgptutils.asus_msmnile",
+ name: "libgptutils.asus_lahaina",
vendor: true,
recovery_available: true,
shared_libs: [
diff --git a/keylayout/fts_ts.idc b/keylayout/fts_ts.idc
new file mode 100644
index 0000000..2e24611
--- /dev/null
+++ b/keylayout/fts_ts.idc
@@ -0,0 +1,3 @@
+device.internal = 1
+touch.deviceType = touchScreen
+touch.orientationAware = 1
diff --git a/keylayout/fts_ts.kcm b/keylayout/fts_ts.kcm
new file mode 100644
index 0000000..c0a3476
--- /dev/null
+++ b/keylayout/fts_ts.kcm
@@ -0,0 +1 @@
+type SPECIAL_FUNCTION
\ No newline at end of file
diff --git a/keylayout/fts_ts.kl b/keylayout/fts_ts.kl
index 2c22921..f2f336a 100644
--- a/keylayout/fts_ts.kl
+++ b/keylayout/fts_ts.kl
@@ -1,15 +1,22 @@
-#key 116 GESTURE_DOUBLE_CLICK WAKE VIRTUAL
+key 116 GESTURE_DOUBLE_CLICK WAKE VIRTUAL
key 103 GESTURE_SWIPE_UP WAKE VIRTUAL
key 158 BACK VIRTUAL
-#key 139 APP_SWITCH VIRTUAL
+key 139 APP_SWITCH VIRTUAL
key 102 HOME VIRTUAL
-key 258 GESTURE_UP_SWIPE WAKE VIRTUAL
-key 259 GESTURE_DOWN_SWIPE WAKE VIRTUAL
-key 260 GESTURE_LEFT_SWIPE WAKE VIRTUAL
-key 261 GESTURE_RIGHT_SWIPE WAKE VIRTUAL
key 17 GESTURE_W WAKE VIRTUAL
key 31 GESTURE_S WAKE VIRTUAL
key 18 GESTURE_E WAKE VIRTUAL
-key 46 GESTURE_C WAKE VIRTUAL
+key 50 GESTURE_M WAKE VIRTUAL
key 44 GESTURE_Z WAKE VIRTUAL
-key 47 GESTURE_V WAKE VIRTUAL
\ No newline at end of file
+key 47 GESTURE_V WAKE VIRTUAL
+
+# media action
+key 119 GESTURE_PAUSE WAKE VIRTUAL
+key 159 GESTURE_FORWARD WAKE VIRTUAL
+key 168 GESTURE_REWIND WAKE VIRTUAL
+
+#FOD action
+key 33 FINGERPRINT_EARLYWAKEUP
+key 22 FINGERPRINT_SCREEN_OFF_LEAVE
+key 38 FINGERPRINT_SCREEN_OFF_TAP_IN_IDENTIFY_AREA
+key 24 FINGERPRINT_PARTIAL_FINGER
\ No newline at end of file
diff --git a/keylayout/goodixfp.kl b/keylayout/goodixfp.kl
deleted file mode 100644
index b06d453..0000000
--- a/keylayout/goodixfp.kl
+++ /dev/null
@@ -1,4 +0,0 @@
-key 103 SYSTEM_NAVIGATION_UP
-key 108 SYSTEM_NAVIGATION_DOWN
-key 105 SYSTEM_NAVIGATION_LEFT
-key 106 SYSTEM_NAVIGATION_RIGHT
\ No newline at end of file
diff --git a/keylayout/googlekey_input.kl b/keylayout/googlekey_input.kl
deleted file mode 100644
index 122463e..0000000
--- a/keylayout/googlekey_input.kl
+++ /dev/null
@@ -1 +0,0 @@
-key 583 VOICE_ASSIST
diff --git a/keylayout/i-rocks_Bluetooth_Keyboard.kl b/keylayout/i-rocks_Bluetooth_Keyboard.kl
new file mode 100644
index 0000000..ae5b958
--- /dev/null
+++ b/keylayout/i-rocks_Bluetooth_Keyboard.kl
@@ -0,0 +1,441 @@
+# Copyright (C) 2010 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.
+
+#
+# Generic key layout file for full alphabetic US English PC style external keyboards.
+#
+# This file is intentionally very generic and is intended to support a broad rang of keyboards.
+# Do not edit the generic key layout to support a specific keyboard; instead, create
+# a new key layout file with the required keyboard configuration.
+#
+
+key 1 ESCAPE
+key 2 1
+key 3 2
+key 4 3
+key 5 4
+key 6 5
+key 7 6
+key 8 7
+key 9 8
+key 10 9
+key 11 0
+key 12 MINUS
+key 13 EQUALS
+key 14 DEL
+key 15 TAB
+key 16 Q
+key 17 W
+key 18 E
+key 19 R
+key 20 T
+key 21 Y
+key 22 U
+key 23 I
+key 24 O
+key 25 P
+key 26 LEFT_BRACKET
+key 27 RIGHT_BRACKET
+key 28 ENTER
+key 29 CTRL_LEFT
+key 30 A
+key 31 S
+key 32 D
+key 33 F
+key 34 G
+key 35 H
+key 36 J
+key 37 K
+key 38 L
+key 39 SEMICOLON
+key 40 APOSTROPHE
+key 41 GRAVE
+key 42 SHIFT_LEFT
+key 43 BACKSLASH
+key 44 Z
+key 45 X
+key 46 C
+key 47 V
+key 48 B
+key 49 N
+key 50 M
+key 51 COMMA
+key 52 PERIOD
+key 53 SLASH
+key 54 SHIFT_RIGHT
+key 55 NUMPAD_MULTIPLY
+key 56 ALT_LEFT
+key 57 SPACE
+key 58 CAPS_LOCK
+key 59 F1
+key 60 F2
+key 61 F3
+key 62 F4
+key 63 F5
+key 64 F6
+key 65 F7
+key 66 F8
+key 67 F9
+key 68 F10
+key 69 NUM_LOCK
+key 70 SCROLL_LOCK
+key 71 NUMPAD_7
+key 72 NUMPAD_8
+key 73 NUMPAD_9
+key 74 NUMPAD_SUBTRACT
+key 75 NUMPAD_4
+key 76 NUMPAD_5
+key 77 NUMPAD_6
+key 78 NUMPAD_ADD
+key 79 NUMPAD_1
+key 80 NUMPAD_2
+key 81 NUMPAD_3
+key 82 NUMPAD_0
+key 83 NUMPAD_DOT
+# key 84 (undefined)
+key 85 ZENKAKU_HANKAKU
+key 86 BACKSLASH
+key 87 F11
+key 88 F12
+key 89 RO
+# key 90 "KEY_KATAKANA"
+# key 91 "KEY_HIRAGANA"
+key 92 HENKAN
+key 93 KATAKANA_HIRAGANA
+key 94 MUHENKAN
+key 95 NUMPAD_COMMA
+key 96 NUMPAD_ENTER
+key 97 CTRL_RIGHT
+key 98 NUMPAD_DIVIDE
+key 99 SYSRQ
+key 100 ALT_RIGHT
+# key 101 "KEY_LINEFEED"
+key 102 MOVE_HOME
+key 103 DPAD_UP
+key 104 PAGE_UP
+key 105 DPAD_LEFT
+key 106 DPAD_RIGHT
+key 107 MOVE_END
+key 108 DPAD_DOWN
+key 109 PAGE_DOWN
+key 110 INSERT
+key 111 FORWARD_DEL
+# key 112 "KEY_MACRO"
+key 113 VOLUME_MUTE
+key 114 VOLUME_DOWN
+key 115 VOLUME_UP
+key 116 POWER
+key 117 NUMPAD_EQUALS
+# key 118 "KEY_KPPLUSMINUS"
+key 119 BREAK
+# key 120 (undefined)
+key 121 NUMPAD_COMMA
+key 122 KANA
+key 123 EISU
+key 124 YEN
+key 125 META_LEFT
+key 126 META_RIGHT
+key 127 MENU
+key 128 MEDIA_STOP
+# key 129 "KEY_AGAIN"
+# key 130 "KEY_PROPS"
+# key 131 "KEY_UNDO"
+# key 132 "KEY_FRONT"
+# key 133 "KEY_COPY"
+# key 134 "KEY_OPEN"
+# key 135 "KEY_PASTE"
+# key 136 "KEY_FIND"
+# key 137 "KEY_CUT"
+# key 138 "KEY_HELP"
+key 139 MENU
+key 140 CALCULATOR
+# key 141 "KEY_SETUP"
+key 142 SLEEP
+key 143 POWER
+# key 144 "KEY_FILE"
+# key 145 "KEY_SENDFILE"
+# key 146 "KEY_DELETEFILE"
+# key 147 "KEY_XFER"
+# key 148 "KEY_PROG1"
+# key 149 "KEY_PROG2"
+key 150 EXPLORER
+# key 151 "KEY_MSDOS"
+key 152 POWER
+# key 153 "KEY_DIRECTION"
+# key 154 "KEY_CYCLEWINDOWS"
+key 155 ENVELOPE
+key 156 BOOKMARK
+# key 157 "KEY_COMPUTER"
+key 158 BACK
+key 159 FORWARD
+key 160 MEDIA_CLOSE
+key 161 MEDIA_EJECT
+key 162 MEDIA_EJECT
+key 163 MEDIA_NEXT
+key 164 MEDIA_PLAY_PAUSE
+key 165 MEDIA_PREVIOUS
+key 166 MEDIA_STOP
+key 167 MEDIA_RECORD
+key 168 MEDIA_REWIND
+key 169 CALL
+# key 170 "KEY_ISO"
+key 171 MUSIC
+key 172 HOME
+# key 173 "KEY_REFRESH"
+# key 174 "KEY_EXIT"
+# key 175 "KEY_MOVE"
+# key 176 "KEY_EDIT"
+key 177 PAGE_UP
+key 178 PAGE_DOWN
+key 179 NUMPAD_LEFT_PAREN
+key 180 NUMPAD_RIGHT_PAREN
+# key 181 "KEY_NEW"
+# key 182 "KEY_REDO"
+# key 183 F13
+# key 184 F14
+# key 185 F15
+# key 186 F16
+# key 187 F17
+# key 188 F18
+# key 189 F19
+# key 190 F20
+# key 191 F21
+# key 192 F22
+# key 193 F23
+# key 194 F24
+# key 195 (undefined)
+# key 196 (undefined)
+# key 197 (undefined)
+# key 198 (undefined)
+# key 199 (undefined)
+key 200 MEDIA_PLAY
+key 201 MEDIA_PAUSE
+# key 202 "KEY_PROG3"
+# key 203 "KEY_PROG4"
+# key 204 (undefined)
+# key 205 "KEY_SUSPEND"
+# key 206 "KEY_CLOSE"
+key 207 MEDIA_PLAY
+key 208 MEDIA_FAST_FORWARD
+# key 209 "KEY_BASSBOOST"
+# key 210 "KEY_PRINT"
+# key 211 "KEY_HP"
+key 212 CAMERA
+key 213 MUSIC
+# key 214 "KEY_QUESTION"
+key 215 ENVELOPE
+# key 216 "KEY_CHAT"
+key 217 SEARCH
+# key 218 "KEY_CONNECT"
+# key 219 "KEY_FINANCE"
+# key 220 "KEY_SPORT"
+# key 221 "KEY_SHOP"
+# key 222 "KEY_ALTERASE"
+# key 223 "KEY_CANCEL"
+key 224 BRIGHTNESS_DOWN
+key 225 BRIGHTNESS_UP
+key 226 HEADSETHOOK
+
+key 256 BUTTON_1
+key 257 BUTTON_2
+key 258 BUTTON_3
+key 259 BUTTON_4
+key 260 BUTTON_5
+key 261 BUTTON_6
+key 262 BUTTON_7
+key 263 BUTTON_8
+key 264 BUTTON_9
+key 265 BUTTON_10
+key 266 BUTTON_11
+key 267 BUTTON_12
+key 268 BUTTON_13
+key 269 BUTTON_14
+key 270 BUTTON_15
+key 271 BUTTON_16
+
+key 288 BUTTON_1
+key 289 BUTTON_2
+key 290 BUTTON_3
+key 291 BUTTON_4
+key 292 BUTTON_5
+key 293 BUTTON_6
+key 294 BUTTON_7
+key 295 BUTTON_8
+key 296 BUTTON_9
+key 297 BUTTON_10
+key 298 BUTTON_11
+key 299 BUTTON_12
+key 300 BUTTON_13
+key 301 BUTTON_14
+key 302 BUTTON_15
+key 303 BUTTON_16
+
+
+key 304 BUTTON_A
+key 305 BUTTON_B
+key 306 BUTTON_C
+key 307 BUTTON_X
+key 308 BUTTON_Y
+key 309 BUTTON_Z
+key 310 BUTTON_L1
+key 311 BUTTON_R1
+key 312 BUTTON_L2
+key 313 BUTTON_R2
+key 314 BUTTON_SELECT
+key 315 BUTTON_START
+key 316 BUTTON_MODE
+key 317 BUTTON_THUMBL
+key 318 BUTTON_THUMBR
+
+
+# key 352 "KEY_OK"
+key 353 DPAD_CENTER
+# key 354 "KEY_GOTO"
+# key 355 "KEY_CLEAR"
+# key 356 "KEY_POWER2"
+# key 357 "KEY_OPTION"
+# key 358 "KEY_INFO"
+# key 359 "KEY_TIME"
+# key 360 "KEY_VENDOR"
+# key 361 "KEY_ARCHIVE"
+key 362 GUIDE
+# key 363 "KEY_CHANNEL"
+# key 364 "KEY_FAVORITES"
+# key 365 "KEY_EPG"
+key 366 DVR
+# key 367 "KEY_MHP"
+# key 368 "KEY_LANGUAGE"
+# key 369 "KEY_TITLE"
+# key 370 "KEY_SUBTITLE"
+# key 371 "KEY_ANGLE"
+# key 372 "KEY_ZOOM"
+# key 373 "KEY_MODE"
+# key 374 "KEY_KEYBOARD"
+# key 375 "KEY_SCREEN"
+# key 376 "KEY_PC"
+key 377 TV
+# key 378 "KEY_TV2"
+# key 379 "KEY_VCR"
+# key 380 "KEY_VCR2"
+# key 381 "KEY_SAT"
+# key 382 "KEY_SAT2"
+# key 383 "KEY_CD"
+# key 384 "KEY_TAPE"
+# key 385 "KEY_RADIO"
+# key 386 "KEY_TUNER"
+# key 387 "KEY_PLAYER"
+# key 388 "KEY_TEXT"
+# key 389 "KEY_DVD"
+# key 390 "KEY_AUX"
+# key 391 "KEY_MP3"
+# key 392 "KEY_AUDIO"
+# key 393 "KEY_VIDEO"
+# key 394 "KEY_DIRECTORY"
+# key 395 "KEY_LIST"
+# key 396 "KEY_MEMO"
+key 397 CALENDAR
+# key 398 "KEY_RED"
+# key 399 "KEY_GREEN"
+# key 400 "KEY_YELLOW"
+# key 401 "KEY_BLUE"
+key 402 CHANNEL_UP
+key 403 CHANNEL_DOWN
+# key 404 "KEY_FIRST"
+# key 405 "KEY_LAST"
+# key 406 "KEY_AB"
+# key 407 "KEY_NEXT"
+# key 408 "KEY_RESTART"
+# key 409 "KEY_SLOW"
+# key 410 "KEY_SHUFFLE"
+# key 411 "KEY_BREAK"
+# key 412 "KEY_PREVIOUS"
+# key 413 "KEY_DIGITS"
+# key 414 "KEY_TEEN"
+# key 415 "KEY_TWEN"
+
+key 429 CONTACTS
+
+# key 448 "KEY_DEL_EOL"
+# key 449 "KEY_DEL_EOS"
+# key 450 "KEY_INS_LINE"
+# key 451 "KEY_DEL_LINE"
+
+
+key 464 FUNCTION
+key 465 ESCAPE FUNCTION
+key 466 F1 FUNCTION
+key 467 F2 FUNCTION
+key 468 F3 FUNCTION
+key 469 F4 FUNCTION
+key 470 F5 FUNCTION
+key 471 F6 FUNCTION
+key 472 F7 FUNCTION
+key 473 F8 FUNCTION
+key 474 F9 FUNCTION
+key 475 F10 FUNCTION
+key 476 F11 FUNCTION
+key 477 F12 FUNCTION
+key 478 1 FUNCTION
+key 479 2 FUNCTION
+key 480 D FUNCTION
+key 481 E FUNCTION
+key 482 F FUNCTION
+key 483 S FUNCTION
+key 484 B FUNCTION
+
+
+# key 497 KEY_BRL_DOT1
+# key 498 KEY_BRL_DOT2
+# key 499 KEY_BRL_DOT3
+# key 500 KEY_BRL_DOT4
+# key 501 KEY_BRL_DOT5
+# key 502 KEY_BRL_DOT6
+# key 503 KEY_BRL_DOT7
+# key 504 KEY_BRL_DOT8
+
+key 580 APP_SWITCH
+key 582 VOICE_ASSIST
+
+# Keys defined by HID usages
+key usage 0x0c006F BRIGHTNESS_UP
+key usage 0x0c0070 BRIGHTNESS_DOWN
+
+# Joystick and game controller axes.
+# Axes that are not mapped will be assigned generic axis numbers by the input subsystem.
+axis 0x00 X
+axis 0x01 Y
+axis 0x02 Z
+axis 0x03 RX
+axis 0x04 RY
+axis 0x05 RZ
+axis 0x06 THROTTLE
+axis 0x07 RUDDER
+axis 0x08 WHEEL
+axis 0x09 GAS
+axis 0x0a BRAKE
+axis 0x10 HAT_X
+axis 0x11 HAT_Y
+
+# LEDs
+led 0x00 NUM_LOCK
+led 0x01 CAPS_LOCK
+led 0x02 SCROLL_LOCK
+led 0x03 COMPOSE
+led 0x04 KANA
+led 0x05 SLEEP
+led 0x06 SUSPEND
+led 0x07 MUTE
+led 0x08 MISC
+led 0x09 MAIL
+led 0x0a CHARGING
diff --git a/meta/config.json b/meta/config.json
index 4d5a7fc..1e956ce 100644
--- a/meta/config.json
+++ b/meta/config.json
@@ -1,8 +1,8 @@
{
- "model": "Zenfone 6 2019",
- "pageUrl":"https://dl.omnirom.org/zenfone6",
+ "model": "Zenfone 8",
+ "pageUrl":"https://dl.omnirom.org/zenfone8",
"make": "Asus",
"image": "meta/device_image.jpg",
"state": "official",
- "device": "zenfone6"
+ "device": "zenfone8"
}
\ No newline at end of file
diff --git a/omni.dependencies b/omni.dependencies
index 4caa653..7de5a83 100644
--- a/omni.dependencies
+++ b/omni.dependencies
@@ -7,8 +7,8 @@
},
{
"remote": "omnirom",
- "repository": "android_kernel_asus_sm8150",
- "target_path": "kernel/asus/sm8150",
+ "repository": "android_kernel_asus_sm8350",
+ "target_path": "kernel/asus/sm8350",
"revision": "android-11"
},
{
diff --git a/omni_zenfone6.mk b/omni_zenfone8.mk
similarity index 94%
rename from omni_zenfone6.mk
rename to omni_zenfone8.mk
index cec20dd..519337c 100644
--- a/omni_zenfone6.mk
+++ b/omni_zenfone8.mk
@@ -36,11 +36,11 @@
$(call inherit-product, vendor/omni/config/common.mk)
# Inherit from hardware-specific part of the product configuration
-$(call inherit-product, device/asus/zenfone6/device.mk)
+$(call inherit-product, device/asus/zenfone8/device.mk)
# Discard inherited values and use our own instead.
-PRODUCT_DEVICE := zenfone6
-PRODUCT_NAME := omni_zenfone6
+PRODUCT_DEVICE := zenfone8
+PRODUCT_NAME := omni_zenfone8
PRODUCT_BRAND := asus
PRODUCT_MODEL := ASUS_I01WD
PRODUCT_MANUFACTURER := asus
diff --git a/policy_hal/Android.mk b/policy_hal/Android.mk
index eda2cc8..1ccc01b 100644
--- a/policy_hal/Android.mk
+++ b/policy_hal/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),zenfone6))
+ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),zenfone8))
ifneq ($(USE_LEGACY_AUDIO_POLICY), 1)
ifeq ($(USE_CUSTOM_AUDIO_POLICY), 1)
LOCAL_PATH := $(call my-dir)
diff --git a/prebuilt/system/product/etc/permissions/privapp-permissions-google_edited.xml b/prebuilt/product/etc/permissions/privapp-permissions-google_edited.xml
similarity index 91%
rename from prebuilt/system/product/etc/permissions/privapp-permissions-google_edited.xml
rename to prebuilt/product/etc/permissions/privapp-permissions-google_edited.xml
index b50e23d..ad9bc68 100644
--- a/prebuilt/system/product/etc/permissions/privapp-permissions-google_edited.xml
+++ b/prebuilt/product/etc/permissions/privapp-permissions-google_edited.xml
@@ -21,13 +21,10 @@
<permission name="android.permission.CALL_PRIVILEGED"/>
<permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
<permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
- <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
<permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>
- <permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS"/>
<permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
<permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
<permission name="android.permission.DUMP"/>
- <permission name="android.permission.ENTER_CAR_MODE_PRIORITIZED"/>
<permission name="android.permission.LOCAL_MAC_ADDRESS"/>
<permission name="android.permission.LOCATION_HARDWARE"/>
<permission name="android.permission.MANAGE_USB"/>
@@ -36,6 +33,7 @@
<permission name="android.permission.MODIFY_PHONE_STATE"/>
<permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/>
<permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
+ <permission name="android.permission.READ_LOGS"/>
<permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
<permission name="android.permission.READ_WIFI_CREDENTIAL"/>
<permission name="android.permission.REAL_GET_TASKS"/>
@@ -45,6 +43,7 @@
<permission name="android.permission.START_TASKS_FROM_RECENTS"/>
<permission name="android.permission.UPDATE_DEVICE_STATS"/>
<permission name="android.permission.USER_ACTIVITY"/>
+ <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
</privapp-permissions>
</permissions>
diff --git a/prebuilt/product/etc/sysconfig/qti-hotword-whitelist.xml b/prebuilt/product/etc/sysconfig/qti-hotword-whitelist.xml
new file mode 100644
index 0000000..c470f2c
--- /dev/null
+++ b/prebuilt/product/etc/sysconfig/qti-hotword-whitelist.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This XML file declares which platform apps that need to access internal APIs.
+-->
+<config>
+ <hidden-api-whitelisted-app package="com.android.hotwordenrollment.okgoogle" />
+ <hidden-api-whitelisted-app package="com.android.hotwordenrollment.tgoogle" />
+ <hidden-api-whitelisted-app package="com.android.hotwordenrollment.xgoogle" />
+</config>
diff --git a/prebuilt/recovery/init.recovery.qcom.rc b/prebuilt/root/init.recovery.qcom.rc
old mode 100755
new mode 100644
similarity index 70%
rename from prebuilt/recovery/init.recovery.qcom.rc
rename to prebuilt/root/init.recovery.qcom.rc
index 8d9065f..c0fa50d
--- a/prebuilt/recovery/init.recovery.qcom.rc
+++ b/prebuilt/root/init.recovery.qcom.rc
@@ -27,21 +27,6 @@
on init
write /sys/class/backlight/panel0-backlight/brightness 200
- mkdir /config
- mount configfs none /config
- mkdir /config/usb_gadget/g1 0770 shell shell
- write /config/usb_gadget/g1/bcdUSB 0x0200
- write /config/usb_gadget/g1/idVendor 0x0b05
- write /config/usb_gadget/g1/idProduct 0x4dae
- mkdir /config/usb_gadget/g1/strings/0x409 0770 shell shell
-# write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
- write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.boot.recovery.sno}
- write /config/usb_gadget/g1/strings/0x409/manufacturer ${ro.product.manufacturer}
- write /config/usb_gadget/g1/strings/0x409/product ${ro.product.model}
- mkdir /config/usb_gadget/g1/functions/ffs.adb
- write /config/usb_gadget/g1/os_desc/use 1
- write /config/usb_gadget/g1/os_desc/b_vendor_code 0x1
- write /config/usb_gadget/g1/os_desc/qw_sign "MSFT100"
setprop sys.usb.configfs 1
on property:ro.boot.usbcontroller=*
diff --git a/prebuilt/system/etc/permissions/privapp-permissions-ASUS_I01WD.xml b/prebuilt/system/etc/permissions/privapp-permissions-SM8350.xml
similarity index 85%
rename from prebuilt/system/etc/permissions/privapp-permissions-ASUS_I01WD.xml
rename to prebuilt/system/etc/permissions/privapp-permissions-SM8350.xml
index 3ca8b4e..ae615ac 100644
--- a/prebuilt/system/etc/permissions/privapp-permissions-ASUS_I01WD.xml
+++ b/prebuilt/system/etc/permissions/privapp-permissions-SM8350.xml
@@ -15,4 +15,7 @@
<permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
<permission name="android.permission.WRITE_MEDIA_STORAGE"/>
</privapp-permissions>
+ <privapp-permissions package="com.asus.motorservice">
+ <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+ </privapp-permissions>
</permissions>
diff --git a/prebuilt/system/etc/permissions/qti_libpermissions.xml b/prebuilt/system/etc/permissions/qti_libpermissions.xml
new file mode 100644
index 0000000..4756f67
--- /dev/null
+++ b/prebuilt/system/etc/permissions/qti_libpermissions.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!---
+ Copyright (c) 2017 Qualcomm Technologies, Inc.
+ All Rights Reserved.
+ Confidential and Proprietary - Qualcomm Technologies, Inc.
+ -->
+<permissions>
+ <library name="android.hidl.manager@1.0-java"
+ file="/system/framework/android.hidl.manager-V1.0-java.jar"/>
+</permissions>
diff --git a/prebuilt/system/etc/public.libraries-qti.txt b/prebuilt/system/etc/public.libraries-qti.txt
new file mode 100644
index 0000000..a99fdca
--- /dev/null
+++ b/prebuilt/system/etc/public.libraries-qti.txt
@@ -0,0 +1,5 @@
+libvraudio_client.qti.so
+libqvrservice_client.qti.so
+libqvrcamera_client.qti.so
+libbinauralrenderer_wrapper.qti.so
+libhoaeffects.qti.so
diff --git a/prebuilt/system/system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml b/prebuilt/system/system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml
deleted file mode 100644
index a5d23a2..0000000
--- a/prebuilt/system/system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2018-2019 Qualcomm Technologies, Inc.
- All Rights Reserved.
- Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<permissions>
- <library name="vendor.qti.hardware.data.connection-V1.0-java"
- file="/system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar" />
-</permissions>
diff --git a/prebuilt/system/system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml b/prebuilt/system/system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml
deleted file mode 100644
index aad634a..0000000
--- a/prebuilt/system/system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2019 Qualcomm Technologies, Inc.
- All Rights Reserved.
- Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<permissions>
- <library name="vendor.qti.hardware.data.connection-V1.1-java"
- file="/system_ext/framework/vendor.qti.hardware.data.connection-V1.1-java.jar" />
-</permissions>
diff --git a/prebuilt/system_ext/etc/public.libraries-qti.txt b/prebuilt/system_ext/etc/public.libraries-qti.txt
new file mode 100644
index 0000000..a2e6cd9
--- /dev/null
+++ b/prebuilt/system_ext/etc/public.libraries-qti.txt
@@ -0,0 +1,5 @@
+libqvrservice_client.qti.so
+libqvrcamera_client.qti.so
+libupdateprof.qti.so
+libthermalclient.qti.so
+libsxrservice_client.qti.so
\ No newline at end of file
diff --git a/recovery.fstab b/recovery.fstab
index fe88b92..38a7b72 100644
--- a/recovery.fstab
+++ b/recovery.fstab
@@ -1,28 +1,38 @@
-# Android fstab file.
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+# Copyright (c) 2019, The Linux Foundation. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+# * Neither the name of The Linux Foundation nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#TODO: Add 'check' as fs_mgr_flags with data partition.
-# Currently we dont have e2fsck compiled. So fs check would failed.
-
-#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
-/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect,avb
-/dev/block/bootdevice/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable
-/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,nobarrier latemount,wait,check,fileencryption=ice,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M
-/devices/platform/soc/8804000.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto
-/devices/platform/soc/1da4000.ufshc_card/host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto
-/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect
-/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect
-/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1 wait
-/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect
-
-/dev/block/bootdevice/by-name/asusfw /mnt/vendor/asusfw ext4 rw,nosuid,noatime,nodev,barrier=1,noauto_da_alloc wait,slotselect
-/dev/block/bootdevice/by-name/xrom /xrom ext4 ro,nosuid,noatime,nodev,barrier=1,noauto_da_alloc wait,slotselect
-/dev/block/bootdevice/by-name/logdump /batinfo ext4 rw,nosuid,noatime,nodev,barrier=1,noauto_da_alloc wait
-# Need to have this entry in here even though the mount point itself is no longer needed.
-# The update_engine code looks for this entry in order to determine the boot device address
-# and fails if it does not find it.
-/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
-/devices/platform/soc/*.ssusb/*.dwc3/xhci-hcd.*.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto
-#/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults
-#/dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults
\ No newline at end of file
+#device mount point fstype [device2] [length=]
+system /system ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
+system_ext /system_ext ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
+product /product ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
+vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount
+odm /odm ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount
+/dev/block/bootdevice/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,wrappedkey,first_stage_mount
+/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,formattable,fileencryption=ice,wrappedkey,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs
+/dev/block/mmcblk0p1 /sdcard vfat nosuid,nodev wait
+/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults
+/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
diff --git a/rro_overlays/TetheringOverlay/AndroidManifest.xml b/rro_overlays/TetheringOverlay/AndroidManifest.xml
index 046fca9..3c60c75 100644
--- a/rro_overlays/TetheringOverlay/AndroidManifest.xml
+++ b/rro_overlays/TetheringOverlay/AndroidManifest.xml
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.networkstack.tethering.asus_msmnile"
+ package="com.android.networkstack.tethering.asus_lahaina"
android:versionCode="1"
android:versionName="1.0">
<application android:hasCode="false" />
diff --git a/rro_overlays/WifiOverlay/AndroidManifest.xml b/rro_overlays/WifiOverlay/AndroidManifest.xml
index d761581..73c59bf 100644
--- a/rro_overlays/WifiOverlay/AndroidManifest.xml
+++ b/rro_overlays/WifiOverlay/AndroidManifest.xml
@@ -15,7 +15,7 @@
-->
<!-- Pixel specific wifi overlays -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.wifi.resources.asus_msmnile"
+ package="com.android.wifi.resources.asus_lahaina"
android:versionCode="1"
android:versionName="1.0">
<application android:hasCode="false" />
diff --git a/sepolicy/SEPolicy.mk b/sepolicy/SEPolicy.mk
deleted file mode 100644
index 2839874..0000000
--- a/sepolicy/SEPolicy.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Board specific SELinux policy variable definitions
-SEPOLICY_PATH:= device/qcom/sepolicy
-BOARD_PLAT_PUBLIC_SEPOLICY_DIR := \
- $(BOARD_PLAT_PUBLIC_SEPOLICY_DIR) \
- $(SEPOLICY_PATH)/generic/public \
- $(SEPOLICY_PATH)/generic/public/attribute
-
-BOARD_PLAT_PRIVATE_SEPOLICY_DIR := \
- $(BOARD_PLAT_PRIVATE_SEPOLICY_DIR) \
- $(SEPOLICY_PATH)/generic/private
-
-BOARD_PLAT_PUBLIC_SEPOLICY_DIR := \
- $(BOARD_PLAT_PUBLIC_SEPOLICY_DIR) \
- $(SEPOLICY_PATH)/qva/public \
- $(SEPOLICY_PATH)/qva/public/attribute
-
-#once all the services are moved to Product /ODM above lines will be removed.
-# sepolicy rules for product images
-PRODUCT_PUBLIC_SEPOLICY_DIRS := \
- $(PRODUCT_PUBLIC_SEPOLICY_DIRS) \
- $(SEPOLICY_PATH)/generic/product/public \
- $(SEPOLICY_PATH)/qva/product/public
-
-PRODUCT_PRIVATE_SEPOLICY_DIRS := \
- $(PRODUCT_PRIVATE_SEPOLICY_DIRS) \
- $(SEPOLICY_PATH)/generic/product/private \
- $(SEPOLICY_PATH)/qva/product/private
diff --git a/sepolicy/private/app.te b/sepolicy/private/app.te
index 9f418bd..043cf83 100644
--- a/sepolicy/private/app.te
+++ b/sepolicy/private/app.te
@@ -1,2 +1,3 @@
# Allow appdomain to get vendor_camera_prop
get_prop(appdomain, vendor_camera_prop)
+get_prop(appdomain, vendor_persist_camera_prop)
diff --git a/sepolicy/private/dexoptanalyzer.te b/sepolicy/private/dexoptanalyzer.te
deleted file mode 100644
index 190125a..0000000
--- a/sepolicy/private/dexoptanalyzer.te
+++ /dev/null
@@ -1 +0,0 @@
-allow dexoptanalyzer system_file:file lock;
\ No newline at end of file
diff --git a/sepolicy/private/file.te b/sepolicy/private/file.te
index 8d0f7c5..fbc5907 100644
--- a/sepolicy/private/file.te
+++ b/sepolicy/private/file.te
@@ -5,8 +5,11 @@
type demoapp_file, file_type;
type firmware_file, fs_type, contextmount_type;
type persist_file, file_type;
-type xrom_file, file_type;
+
+# Files in userdata
+type vendor_qmipriod_data_file, file_type, data_file_type;
# Offscreen Gestures
type sysfs_gesture, sysfs_type, fs_type;
type proc_touchscreen, proc_type, sysfs_type, fs_type;
+type sysfs_touchscreen, sysfs_type, fs_type;
diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts
index 3fb48b4..36a8400 100644
--- a/sepolicy/private/file_contexts
+++ b/sepolicy/private/file_contexts
@@ -8,4 +8,5 @@
/persist(/.*)? u:object_r:persist_file:s0
/tombstones u:object_r:rootfs:s0
/dsp u:object_r:rootfs:s0
-/xrom(/.*)? u:object_r:xrom_file:s0
+
+/dev/block/platform/soc/1d84000\.ufshc/by-name/super u:object_r:super_block_device:s0
diff --git a/sepolicy/private/genfs_contexts b/sepolicy/private/genfs_contexts
index ac504cd..b134d37 100644
--- a/sepolicy/private/genfs_contexts
+++ b/sepolicy/private/genfs_contexts
@@ -1,5 +1,5 @@
genfscon sysfs /devices/platform/soc/soc:asustek_googlekey/googlekey_enable u:object_r:sysfs_gesture:s0
-genfscon proc /driver/dclick u:object_r:proc_touchscreen:s0
-genfscon proc /driver/gesture_type u:object_r:proc_touchscreen:s0
-genfscon proc /driver/glove u:object_r:proc_touchscreen:s0
-genfscon proc /driver/swipeup u:object_r:proc_touchscreen:s0
\ No newline at end of file
+genfscon proc /driver/dclick u:object_r:sysfs_touchscreen:s0
+genfscon proc /driver/swipeup u:object_r:sysfs_touchscreen:s0
+genfscon proc /driver/gesture_type u:object_r:sysfs_touchscreen:s0
+genfscon proc /driver/glove u:object_r:sysfs_touchscreen:s0
diff --git a/sepolicy/private/init.te b/sepolicy/private/init.te
index aed6f07..b33e466 100644
--- a/sepolicy/private/init.te
+++ b/sepolicy/private/init.te
@@ -1,5 +1,7 @@
# Allow init to chown/chmod on pseudo files in /sys
allow init sysfs_gesture:file { rw_file_perms setattr };
+allow init proc_touchscreen:file { rw_file_perms setattr };
+allow init sysfs_touchscreen:file { rw_file_perms setattr };
# Allow init to bind mount over vendor file
allow init { system_file vendor_file }:file mounton;
diff --git a/sepolicy/private/mediaprovider_app.te b/sepolicy/private/mediaprovider_app.te
deleted file mode 100644
index 1e38754..0000000
--- a/sepolicy/private/mediaprovider_app.te
+++ /dev/null
@@ -1 +0,0 @@
-allow mediaprovider_app mnt_media_rw_file:dir { getattr search };
\ No newline at end of file
diff --git a/sepolicy/private/platform_app.te b/sepolicy/private/platform_app.te
index ef2fbae..1be9896 100644
--- a/sepolicy/private/platform_app.te
+++ b/sepolicy/private/platform_app.te
@@ -1,4 +1,6 @@
-#allow platform_app asus_prop:file r_file_perms;
+allow platform_app asus_prop:file { getattr map open read };
#allow platform_app vendor_file:file { execute };
allow platform_app app_data_file:file { execute };
-allow platform_app rs_exec:file { execute execute_no_trans r_file_perms };
\ No newline at end of file
+allow platform_app vendor_asus_prop:file { getattr map open read };
+allow platform_app asus_dongle_prop:file { getattr map open read };
+allow platform_app privapp_data_file:file { execute };
diff --git a/sepolicy/private/priv_app.te b/sepolicy/private/priv_app.te
index 1a240a4..f67c38e 100644
--- a/sepolicy/private/priv_app.te
+++ b/sepolicy/private/priv_app.te
@@ -9,5 +9,4 @@
postinstall_mnt_dir
radio_data_file
system_app_data_file
- xrom_file
}:dir getattr;
diff --git a/sepolicy/private/property.te b/sepolicy/private/property.te
index 787663f..0c4f891 100644
--- a/sepolicy/private/property.te
+++ b/sepolicy/private/property.te
@@ -1,2 +1,4 @@
-#type asus_prop, property_type;
-type vendor_camera_prop, property_type;
\ No newline at end of file
+type asus_prop, property_type;
+type vendor_camera_prop, property_type;
+type vendor_asus_prop, property_type;
+type asus_dongle_prop, property_type;
diff --git a/sepolicy/private/property_contexts b/sepolicy/private/property_contexts
deleted file mode 100644
index 0fd9105..0000000
--- a/sepolicy/private/property_contexts
+++ /dev/null
@@ -1,12 +0,0 @@
-gf.debug.dump_talog_data u:object_r:exported_system_prop:s0 exact int
-
-gsm.sim1.present u:object_r:exported_system_prop:s0
-gsm.sim2.present u:object_r:exported_system_prop:s0
-
-ro.camera.res.fmq.size u:object_r:exported_system_prop:s0 exact int
-ro.camera.req.fmq.size u:object_r:exported_system_prop:s0 exact int
-ro.product.system.manufacturer u:object_r:exported_system_prop:s0 exact int
-
-persist.vendor.sys.cta.security u:object_r:system_prop:s0
-persist.vendor.sys.cta.os u:object_r:system_prop:s0
-
diff --git a/sepolicy/private/rs.te b/sepolicy/private/rs.te
deleted file mode 100644
index 2dffbab..0000000
--- a/sepolicy/private/rs.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow rs surfaceflinger:fd use;
-allow rs sdcardfs:file rw_file_perms;
\ No newline at end of file
diff --git a/sepolicy/private/system_app.te b/sepolicy/private/system_app.te
index 513a7aa..8b8d3d8 100644
--- a/sepolicy/private/system_app.te
+++ b/sepolicy/private/system_app.te
@@ -1,6 +1,7 @@
-#allow system_app system_suspend_control_service:service_manager { find };
-#allow system_app apex_service:service_manager { find };
allow system_app sysfs_gesture:file { rw_file_perms setattr };
allow system_app proc_touchscreen:file { rw_file_perms setattr };
-allow system_app proc_pagetypeinfo:file { read };
-allow system_app sysfs_zram:dir { search };
\ No newline at end of file
+allow system_app sysfs_touchscreen:file { rw_file_perms setattr };
+
+# allow system app to get vendor_camera_prop
+get_prop(system_app, vendor_camera_prop)
+get_prop(system_app, vendor_persist_camera_prop)
diff --git a/sepolicy/private/system_server.te b/sepolicy/private/system_server.te
index b6b8e25..d717426 100644
--- a/sepolicy/private/system_server.te
+++ b/sepolicy/private/system_server.te
@@ -1,5 +1,7 @@
allow system_server proc_touchscreen:file rw_file_perms;
+allow system_server sysfs_touchscreen:file rw_file_perms;
allow system_server sysfs_gesture:file rw_file_perms;
# allow system server to get vendor_camera_prop
-get_prop(system_server, vendor_camera_prop)
\ No newline at end of file
+get_prop(system_server, vendor_camera_prop)
+get_prop(system_server, vendor_persist_camera_prop)
diff --git a/sepolicy/private/vendor_init.te b/sepolicy/private/vendor_init.te
index 371cca2..1f79c9b 100644
--- a/sepolicy/private/vendor_init.te
+++ b/sepolicy/private/vendor_init.te
@@ -1,2 +1,5 @@
# Allow vendor_init to set vendor_camera_prop
-set_prop(vendor_init, vendor_camera_prop)
\ No newline at end of file
+set_prop(vendor_init, vendor_camera_prop)
+set_prop(vendor_init, vendor_persist_camera_prop)
+
+allow vendor_init exported_system_prop:property_service set;
\ No newline at end of file
diff --git a/sepolicy/private/vendor_qmipriod.te b/sepolicy/private/vendor_qmipriod.te
new file mode 100644
index 0000000..2463f3d
--- /dev/null
+++ b/sepolicy/private/vendor_qmipriod.te
@@ -0,0 +1,4 @@
+type vendor_qmipriod, domain;
+
+r_dir_file(vendor_qmipriod, vendor_qmipriod_data_file)
+allow vendor_qmipriod vendor_qmipriod_data_file:file w_file_perms;
diff --git a/sepolicy/product/private/file_contexts b/sepolicy/product/private/file_contexts
index 57a49b8..40eee33 100644
--- a/sepolicy/product/private/file_contexts
+++ b/sepolicy/product/private/file_contexts
@@ -1,3 +1,2 @@
# Vendor overlay
/(product|system/product)/vendor_overlay/[0-9]+/etc(/.*)? u:object_r:vendor_configs_file:s0
-/(product|system/product)/vendor_overlay/[0-9]+/lib(64)?/hw u:object_r:vendor_hal_file:s0
diff --git a/sepolicy/qva/private/app.te b/sepolicy/qva/private/app.te
deleted file mode 100644
index 31adc81..0000000
--- a/sepolicy/qva/private/app.te
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2017, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-get_prop(appdomain, vendor_persist_dpm_prop)
-
diff --git a/sepolicy/qva/private/audioserver.te b/sepolicy/qva/private/audioserver.te
deleted file mode 100644
index ca657ed..0000000
--- a/sepolicy/qva/private/audioserver.te
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2018, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-binder_call(audioserver,vendor_wfdservice);
-
-#allow access to ALSA MMAP FDs for AAudio API
-allow audioserver audio_service:service_manager find;
diff --git a/sepolicy/qva/private/bluetooth.te b/sepolicy/qva/private/bluetooth.te
deleted file mode 100644
index 29ad366..0000000
--- a/sepolicy/qva/private/bluetooth.te
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2020, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-unix_socket_connect(bluetooth, vendor_qvrd_controller, vendor_qvrd)
\ No newline at end of file
diff --git a/sepolicy/qva/private/bt_logger.te b/sepolicy/qva/private/bt_logger.te
deleted file mode 100644
index b7bb9b1..0000000
--- a/sepolicy/qva/private/bt_logger.te
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2017, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type vendor_bt_logger, domain;
-type vendor_bt_logger_exec, system_file_type, exec_type, file_type;
-typeattribute vendor_bt_logger bluetoothdomain;
-typeattribute vendor_bt_logger coredomain;
-
-init_daemon_domain(vendor_bt_logger)
-bluetooth_domain(vendor_bt_logger)
-
-get_prop(vendor_bt_logger, bluetooth_prop)
-allow bluetooth vendor_bt_logger:unix_stream_socket connectto;
-allow vendor_bt_logger bluetooth:unix_stream_socket connectto;
-
-allow vendor_bt_logger bluetooth_data_file:dir search;
-allow vendor_bt_logger bluetooth_logs_data_file:dir rw_dir_perms;
-allow vendor_bt_logger bluetooth_logs_data_file:file create_file_perms;
diff --git a/sepolicy/qva/private/cameraserver.te b/sepolicy/qva/private/cameraserver.te
deleted file mode 100644
index 0a288d8..0000000
--- a/sepolicy/qva/private/cameraserver.te
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2019, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-get_prop(cameraserver, vendor_persist_camera_prop)
-#access to cameraservice apis by faceauth
-hal_client_domain(cameraserver, hal_face)
diff --git a/sepolicy/qva/private/dataservice_app.te b/sepolicy/qva/private/dataservice_app.te
deleted file mode 100644
index ac26b3d..0000000
--- a/sepolicy/qva/private/dataservice_app.te
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2019, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-add_service(vendor_dataservice_app, vendor_dpmservice)
-allow vendor_dataservice_app system_app_data_file:dir create_dir_perms;
-allow vendor_dataservice_app vendor_dpmd_socket:sock_file write;
-allow vendor_dataservice_app vendor_dpmd_data_file:dir rw_dir_perms;
-allow vendor_dataservice_app vendor_dpmd_data_file:file create_file_perms;
-unix_socket_connect(vendor_dataservice_app,vendor_dpmd,vendor_dpmd);
-set_prop(vendor_dataservice_app, vendor_persist_dpm_prop)
diff --git a/sepolicy/qva/private/device.te b/sepolicy/qva/private/device.te
deleted file mode 100644
index f83f890..0000000
--- a/sepolicy/qva/private/device.te
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2015, 2017, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#Define smd7 device
-type vendor_smd7_device, dev_type;
diff --git a/sepolicy/qva/private/dpmd.te b/sepolicy/qva/private/dpmd.te
deleted file mode 100644
index 3df432f..0000000
--- a/sepolicy/qva/private/dpmd.te
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright (c) 2018, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-typeattribute vendor_dpmd coredomain;
-typeattribute vendor_dpmd mlstrustedsubject;
-type vendor_dpmd_exec, exec_type, system_file_type, file_type;
-
-init_daemon_domain(vendor_dpmd)
-
-net_domain(vendor_dpmd)
-
-allow vendor_dpmd {
- vendor_dpmd_exec
- system_file
-}:file x_file_perms;
-
-allow vendor_dpmd vendor_dpmd_data_file:file create_file_perms;
-allow vendor_dpmd vendor_dpmd_data_file:dir create_dir_perms;
-r_dir_file(vendor_dpmd,proc_net)
-
-allow vendor_dpmd self:capability {
- setuid
- net_raw
- net_admin
-};
-
-allow vendor_dpmd netutils_wrapper:process sigkill;
-allow vendor_dpmd self:capability2 wake_alarm;
-
-r_dir_file(vendor_dpmd, appdomain)
-
-wakelock_use(vendor_dpmd)
-allow vendor_dpmd shell_exec:file rx_file_perms;
-dontaudit vendor_dpmd self:capability sys_module;
-set_prop(vendor_dpmd, vendor_persist_dpm_prop)
-get_prop(vendor_dpmd, vendor_persist_dpm_prop)
-#allow vendor_dpmd to create socket
-allow vendor_dpmd self:socket create_socket_perms_no_ioctl;
-allow vendor_dpmd self:{ netlink_socket netlink_generic_socket } create_socket_perms_no_ioctl;
-vendor_dpmd_socket_perm(priv_app)
-vendor_dpmd_socket_perm(system_server)
-vendor_dpmd_socket_perm(system_app)
-vendor_dpmd_socket_perm(untrusted_app)
-vendor_dpmd_socket_perm(untrusted_app_25)
-vendor_dpmd_socket_perm(platform_app)
-#allow vendor_dpmd to write to /proc/net/sys
-allow vendor_dpmd proc_net:file write;
-#self kill rule to kill vendor_dpmd child process which executes iptable commands
-allow vendor_dpmd self:capability kill;
-set_prop(vendor_dpmd, ctl_dpmd_prop)
diff --git a/sepolicy/qva/private/dun-server.te b/sepolicy/qva/private/dun-server.te
deleted file mode 100644
index 981a5e7..0000000
--- a/sepolicy/qva/private/dun-server.te
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2017, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type vendor_dun-server_exec, system_file_type, exec_type, file_type;
-typeattribute vendor_dun-server bluetoothdomain;
-typeattribute vendor_dun-server coredomain;
-
-allow bluetooth vendor_dun-server:unix_stream_socket connectto;
-allow vendor_dun-server {
- serial_device
- vendor_smd7_device
-}:chr_file rw_file_perms;
-
-init_daemon_domain(vendor_dun-server)
-
-bluetooth_domain(vendor_dun-server)
diff --git a/sepolicy/qva/private/file.te b/sepolicy/qva/private/file.te
deleted file mode 100644
index fb8f9a6..0000000
--- a/sepolicy/qva/private/file.te
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2018,2020, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type vendor_dpmd_socket, file_type, coredomain_socket;
-type vendor_dpmd_data_file, file_type, data_file_type, core_data_file_type;
-type vendor_dpmwrapper_socket, file_type, coredomain_socket, mlstrustedobject;
-type vendor_qvrd_data_file, file_type, data_file_type, core_data_file_type;
-type vendor_qvrd_socket, file_type, mlstrustedobject, coredomain_socket;
-type vendor_qvrd_controller_socket, file_type, coredomain_socket;
-type vendor_qvrd_hvx_socket, file_type, coredomain_socket;
-type vendor_sys_sxrd_data_file, file_type, data_file_type, core_data_file_type;
-type vendor_sys_sxrd_socket, file_type, mlstrustedobject, coredomain_socket;
-type vendor_qcc_data_file, file_type, data_file_type, core_data_file_type;
-type vendor_qcc_app_socket, file_type, mlstrustedobject, coredomain_socket;
diff --git a/sepolicy/qva/private/file_contexts b/sepolicy/qva/private/file_contexts
deleted file mode 100644
index b9412f3..0000000
--- a/sepolicy/qva/private/file_contexts
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED"AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-####### device files ##############
-/dev/smd7 u:object_r:vendor_smd7_device:s0
-
-####### dev/socket files ##########
-/dev/socket/seempdw u:object_r:vendor_seempdw_socket:s0
-/dev/socket/dpmd u:object_r:vendor_dpmd_socket:s0
-/dev/socket/tcm u:object_r:vendor_dpmtcm_socket:s0
-/dev/socket/qvrservice u:object_r:vendor_qvrd_socket:s0
-/dev/socket/qvrservice_controller u:object_r:vendor_qvrd_controller_socket:s0
-/dev/socket/qvrservice_camera u:object_r:vendor_qvrd_socket:s0
-/dev/socket/qvrservice_hvx_camera u:object_r:vendor_qvrd_hvx_socket:s0
-/dev/socket/sxrservice u:object_r:vendor_sys_sxrd_socket:s0
-/dev/socket/qdma_app(/.*)? u:object_r:vendor_qcc_app_socket:s0
-
-####### system file ###############
-/system/bin/seempd u:object_r:vendor_seempd_exec:s0
-/(system_ext|system/system_ext)/bin/dpmd u:object_r:vendor_dpmd_exec:s0
-/(system_ext|system/system_ext)/bin/qvrservice u:object_r:vendor_qvrd_exec:s0
-/(system_ext|system/system_ext)/bin/sxrservice u:object_r:vendor_sys_sxrd_exec:s0
-/system/bin/vpsservice u:object_r:vendor_vpsservice_exec:s0
-
-####### system_ext file ###############
-/(system_ext|system/system_ext)/bin/dun-server u:object_r:vendor_dun-server_exec:s0
-/(system_ext|system/system_ext)/bin/bt_logger u:object_r:vendor_bt_logger_exec:s0
-/(system_ext|system/system_ext)/bin/perfservice u:object_r:vendor_perfservice_exec:s0
-/(system_ext|system/system_ext)/bin/qdtservice u:object_r:vendor_qdtservice_exec:s0
-/(system|system_ext|system/system_ext)/bin/wfdservice u:object_r:vendor_wfdservice_exec:s0
-/(system|system_ext|system/system_ext)/bin/sigma_miracasthalservice u:object_r:vendor_sigmahal_qti_exec:s0
-/(system_ext|system/system_ext)/bin/qccsyshalservice u:object_r:vendor_qccsyshal_qti_exec:s0
-/(system_ext|system/system_ext)/bin/mmi u:object_r:vendor_mmi_sys_exec:s0
-/(system_ext|system/system_ext)/bin/mmi_diag u:object_r:vendor_mmi_sys_exec:s0
-/(system_ext|system/system_ext)/bin/qspmsvc u:object_r:vendor_qspmsvc_exec:s0
-
-####### data files ################
-/data/dpm(/.*)? u:object_r:vendor_dpmd_data_file:s0
-/data/misc/qvr(/.*)? u:object_r:vendor_qvrd_data_file:s0
-/data/misc/sxr(/.*)? u:object_r:vendor_sys_sxrd_data_file:s0
-/data/nfc(/.*)? u:object_r:nfc_data_file:s0
-/data/misc/qdma(/.*)? u:object_r:vendor_qcc_data_file:s0
diff --git a/sepolicy/qva/private/fm_app.te b/sepolicy/qva/private/fm_app.te
deleted file mode 100644
index 265f229..0000000
--- a/sepolicy/qva/private/fm_app.te
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2020, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-typeattribute vendor_fm_app coredomain;
-app_domain(vendor_fm_app)
-
-hal_client_domain(vendor_fm_app, vendor_hal_fm);
-hal_client_domain(vendor_fm_app, vendor_hal_btconfigstore);
-hal_client_domain(vendor_fm_app, vendor_hal_qspmhal);
-
-binder_call(vendor_fm_app, gpuservice)
-allow vendor_fm_app radio_service:service_manager find;
-allow vendor_fm_app audioserver_service:service_manager find;
-allow vendor_fm_app mediaserver_service:service_manager find;
-allow vendor_fm_app app_api_service:service_manager find;
diff --git a/sepolicy/qva/private/hal_qccsyshalservice.te b/sepolicy/qva/private/hal_qccsyshalservice.te
deleted file mode 100644
index 2aaed35..0000000
--- a/sepolicy/qva/private/hal_qccsyshalservice.te
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (c) 2020 The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type vendor_qccsyshal_qti, domain, coredomain;
-type vendor_qccsyshal_qti_exec, system_file_type , exec_type, file_type;
-
-hal_server_domain(vendor_qccsyshal_qti, vendor_qccsyshal);
-
-#Add hwservice related rules
-hal_attribute_hwservice(vendor_qccsyshal, vendor_qccsyshal_hwservice);
-
-#Allow for transition from init domain to qccsyshal
-init_daemon_domain(vendor_qccsyshal_qti)
-
-#Allow the interaction with servicemanager
-binder_use(vendor_qccsyshal_qti)
-
-#Allow hwbinder call from hal client to server
-binder_call(vendor_qccsyshal_client, vendor_qccsyshal_server)
-binder_call(vendor_qccsyshal_server, vendor_qccsyshal_client)
-
-allow vendor_qccsyshal_client vendor_qccsyshal_hwservice:hwservice_manager find;
-
-# allow access to qdma dropbox (/data/misc/qdma)
-allow vendor_qccsyshal_qti vendor_qcc_data_file:dir create_dir_perms;
-allow vendor_qccsyshal_qti vendor_qcc_data_file:file create_file_perms;
-
-# allow access to vendor_qcc_app_socket
-unix_socket_connect(vendor_qccsyshal_qti, vendor_qcc_app, vendor_qcc_app)
-allow vendor_qccsyshal_qti vendor_qcc_app_socket:dir r_dir_perms;
-allow vendor_qccsyshal_qti vendor_qcc_app_socket:sock_file rw_file_perms;
-
-userdebug_or_eng(`
- allow vendor_qccsyshal_qti vendor_qcc_lmtp_app:unix_stream_socket connectto;
-')
diff --git a/sepolicy/qva/private/hwservice_contexts b/sepolicy/qva/private/hwservice_contexts
deleted file mode 100644
index 2a98049..0000000
--- a/sepolicy/qva/private/hwservice_contexts
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED"AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-vendor.qti.hardware.sigma_miracast::Isigma_miracast u:object_r:vendor_sigmahal_hwservice:s0
-vendor.qti.hardware.qccsyshal::IQccsyshal u:object_r:vendor_qccsyshal_hwservice:s0
diff --git a/sepolicy/qva/private/ioctl_defines b/sepolicy/qva/private/ioctl_defines
deleted file mode 100644
index 846eb5e..0000000
--- a/sepolicy/qva/private/ioctl_defines
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2017, The Linux Foundation. All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# socket ioctls defined in the kernel in include/uapi/linux/msm_ipc.h
-define(`IPC_ROUTER_IOCTL_GET_VERSION', `0x0000c300')
-define(`IPC_ROUTER_IOCTL_GET_MTU', `0x0000c301')
-define(`IPC_ROUTER_IOCTL_LOOKUP_SERVER', `0x0000c302')
-define(`IPC_ROUTER_IOCTL_GET_CURR_PKT_SIZE', `0x0000c303')
-define(`IPC_ROUTER_IOCTL_BIND_CONTROL_PORT', `0x0000c304')
-define(`IPC_ROUTER_IOCTL_CONFIG_SEC_RULES', `0x0000c305')
diff --git a/sepolicy/qva/private/ioctl_macros b/sepolicy/qva/private/ioctl_macros
deleted file mode 100644
index 84c899b..0000000
--- a/sepolicy/qva/private/ioctl_macros
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2017, The Linux Foundation. All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-define(`msm_sock_ipc_ioctls_system', `{
-IPC_ROUTER_IOCTL_GET_VERSION
-IPC_ROUTER_IOCTL_GET_MTU
-IPC_ROUTER_IOCTL_LOOKUP_SERVER
-IPC_ROUTER_IOCTL_GET_CURR_PKT_SIZE
-IPC_ROUTER_IOCTL_BIND_CONTROL_PORT
-IPC_ROUTER_IOCTL_CONFIG_SEC_RULES
-}')
\ No newline at end of file
diff --git a/sepolicy/qva/private/location_app.te b/sepolicy/qva/private/location_app.te
deleted file mode 100644
index c558b23..0000000
--- a/sepolicy/qva/private/location_app.te
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (c) 2019, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# generic/vendor_location_app.te - sepolicy rules for qti value added location apps
-# that will be part of system image. Eg: XT app.
-
-app_domain(vendor_location_app)
-binder_use(vendor_location_app)
-hal_client_domain(vendor_location_app, hal_gnss)
-
-net_domain(vendor_location_app)
-
-#Permissions for JDWP
-userdebug_or_eng(`
- allow vendor_location_app { adbd su }:unix_stream_socket connectto;
-')
-
-allow vendor_location_app app_api_service:service_manager find;
-
-allow vendor_location_app system_app_data_file:dir create_dir_perms;
-allow vendor_location_app system_app_data_file:file create_file_perms;
-
-allow vendor_location_app radio_service:service_manager find;
-
-unix_socket_connect(vendor_location_app, vendor_dpmtcm, vendor_dpmd);
-
-allow vendor_location_app cgroup:file rw_file_perms;
-
-unix_socket_send(vendor_location_app, vendor_seempdw, vendor_seempd);
diff --git a/sepolicy/qva/private/mediaextractor.te b/sepolicy/qva/private/mediaextractor.te
deleted file mode 100644
index ce01c84..0000000
--- a/sepolicy/qva/private/mediaextractor.te
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2019, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-get_prop(mediaextractor, vendor_mm_parser_prop);
-get_prop(mediaextractor, vendor_mm_osal_prop);
diff --git a/sepolicy/qva/private/mediaprovider.te b/sepolicy/qva/private/mediaprovider.te
deleted file mode 100644
index 4ff3dcd..0000000
--- a/sepolicy/qva/private/mediaprovider.te
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2018, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-allow mediaprovider vendor_dpmtcm_socket:sock_file w_file_perms;
-allow mediaprovider vendor_dpmd:unix_stream_socket connectto;
diff --git a/sepolicy/qva/private/mediaserver.te b/sepolicy/qva/private/mediaserver.te
deleted file mode 100644
index aa62ea9..0000000
--- a/sepolicy/qva/private/mediaserver.te
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2018, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-unix_socket_send(mediaserver, vendor_seempdw, vendor_seempd)
-
-get_prop(mediaserver, vendor_mm_video_prop)
-get_prop(mediaserver, vendor_sys_video_prop)
diff --git a/sepolicy/qva/private/mmi_sys.te b/sepolicy/qva/private/mmi_sys.te
deleted file mode 100644
index e0fc2fa..0000000
--- a/sepolicy/qva/private/mmi_sys.te
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2018, The Linux Foundation. All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-typeattribute vendor_mmi_sys coredomain;
-type vendor_mmi_sys_exec, system_file_type, exec_type, file_type;
-
-#init
-init_daemon_domain(vendor_mmi_sys)
-
-#Allow mmi to use IPC
-binder_call(vendor_mmi_sys,surfaceflinger)
-binder_use(vendor_mmi_sys)
-
-#mmi_sys
-allow vendor_mmi_sys ion_device:chr_file r_file_perms;
-allow vendor_mmi_sys surfaceflinger_service:service_manager find;
-hal_client_domain(vendor_mmi_sys, hal_graphics_allocator)
-allow vendor_mmi_sys vendor_mmi_sys_exec:file execute_no_trans;
-
-allow vendor_mmi_sys gpu_device:chr_file rw_file_perms;
-allow vendor_mmi_sys kmsg_device:chr_file w_file_perms;
diff --git a/sepolicy/qva/private/perfservice.te b/sepolicy/qva/private/perfservice.te
deleted file mode 100644
index cdb8182..0000000
--- a/sepolicy/qva/private/perfservice.te
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2018, The Linux Foundation. All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type vendor_perfservice_exec, exec_type, system_file_type, file_type;
-
-init_daemon_domain(vendor_perfservice)
-
-add_service(vendor_perfservice, vendor_perf_service);
-binder_use(vendor_perfservice);
-binder_call(vendor_perfservice, system_server);
-binder_service(vendor_perfservice);
diff --git a/sepolicy/qva/private/platform_app.te b/sepolicy/qva/private/platform_app.te
deleted file mode 100644
index 7857487..0000000
--- a/sepolicy/qva/private/platform_app.te
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2019, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#allow platform_app to read vendor_camera_prop
-get_prop(platform_app, vendor_persist_camera_prop)
-# Allow cneservice to be found
-allow platform_app vendor_cne_service:service_manager find;
-
-# Allow vendor_dpmservice to be found
-allow platform_app vendor_dpmservice:service_manager find;
-allow platform_app { vendor_dpmd_socket vendor_dpmtcm_socket }:sock_file w_file_perms;
-allow platform_app vendor_dpmd:unix_stream_socket connectto;
-userdebug_or_eng(`
- r_dir_file(platform_app, vendor_seemp_data_file)
- allow platform_app vendor_seemp_data_file: file w_file_perms;
-')
-allow platform_app vendor_color_service:service_manager find;
-# WigigSettings need to read persist.vendor.wigig.icon.disable
-get_prop(platform_app, vendor_wigig_core_prop)
-# SVA app and OEM voice activation app need to find soundtrigger_middleware_service
-allow platform_app soundtrigger_middleware_service:service_manager find;
-
-# allow platform_app access to Workload Classifier Property
-set_prop(platform_app, vendor_wlc_prop);
diff --git a/sepolicy/qva/private/priv_app.te b/sepolicy/qva/private/priv_app.te
deleted file mode 100644
index 2fef4c3..0000000
--- a/sepolicy/qva/private/priv_app.te
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2019, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-get_prop(priv_app, vendor_persist_camera_prop)
-allow priv_app vendor_dpmtcm_socket:sock_file w_file_perms;
-allow priv_app vendor_dpmd:unix_stream_socket connectto;
-# QVA app need to find soundtrigger_middleware_service
-allow priv_app soundtrigger_middleware_service:service_manager find;
diff --git a/sepolicy/qva/private/property.te b/sepolicy/qva/private/property.te
deleted file mode 100644
index 45068fa..0000000
--- a/sepolicy/qva/private/property.te
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2019 The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#mm-parser
-type vendor_mm_parser_prop, property_type, extended_core_property_type;
-#mm-osal
-type vendor_mm_osal_prop, property_type, extended_core_property_type;
-
-type vendor_mm_video_prop, property_type, extended_core_property_type;
-
-#WiFi Display
-type vendor_wfd_service_prop, property_type, extended_core_property_type;
-type vendor_wfd_sys_debug_prop, property_type, extended_core_property_type;
-# WIGIG
-type vendor_wigig_core_prop, property_type, extended_core_property_type;
-type vendor_fst_prop, property_type, extended_core_property_type;
-
-system_internal_prop(ctl_dpmd_prop)
diff --git a/sepolicy/qva/private/property_contexts b/sepolicy/qva/private/property_contexts
deleted file mode 100644
index bd4dded..0000000
--- a/sepolicy/qva/private/property_contexts
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright (c) 2017, 2019 The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-persist.vendor.dpm. u:object_r:vendor_persist_dpm_prop:s0
-persist.vendor.btstack u:object_r:bluetooth_prop:s0
-persist.vendor.bluetooth.emailaccountcount u:object_r:bluetooth_prop:s0
-persist.vendor.bt.a2dp u:object_r:bluetooth_prop:s0
-persist.vendor.bt_logger. u:object_r:bluetooth_prop:s0
-persist.vendor.service.bt. u:object_r:bluetooth_prop:s0
-ro.vendor.btstack. u:object_r:bluetooth_prop:s0
-vendor.pts. u:object_r:bluetooth_prop:s0
-vendor.bt.pts. u:object_r:bluetooth_prop:s0
-vendor.bluetooth. u:object_r:bluetooth_prop:s0
-persist.vendor.camera.privapp.list u:object_r:vendor_persist_camera_prop:s0
-
-#mm-parser
-vendor.mm.enable.qcom_parser u:object_r:vendor_mm_parser_prop:s0
-vendor.qcom_parser. u:object_r:vendor_mm_parser_prop:s0
-#mm-osal
-vendor.debug.mmosal.config u:object_r:vendor_mm_osal_prop:s0
-
-#perf
-vendor.perf.workloadclassifier.enable u:object_r:vendor_wlc_prop:s0
-persist.vendor.build.date.utc u:object_r:vendor_wlc_prop:s0
-
-#mm-video
-persist.vendor.debug.av.logs.lvl u:object_r:debug_prop:s0
-persist.vendor.debug.en.drpcrpt u:object_r:vendor_mm_video_prop:s0
-persist.vendor.media.hls. u:object_r:vendor_mm_video_prop:s0
-persist.vendor.sys.media.rtp-ports u:object_r:vendor_mm_video_prop:s0
-vendor.encoder.video.profile u:object_r:vendor_mm_video_prop:s0
-vendor.sys.media.target.version u:object_r:vendor_sys_video_prop:s0
-vendor.sys.video.disable.ubwc u:object_r:vendor_sys_video_prop:s0
-
-#Wifi Display
-vendor.wfdservice u:object_r:vendor_wfd_service_prop:s0
-persist.vendor.debug.wfd.wfdsvc u:object_r:vendor_wfd_sys_debug_prop:s0
-persist.vendor.debug.wfdcdbg u:object_r:vendor_wfd_sys_debug_prop:s0
-persist.vendor.debug.wfdcdbgv u:object_r:vendor_wfd_sys_debug_prop:s0
-persist.vendor.sys.debug.mux. u:object_r:vendor_wfd_sys_debug_prop:s0
-persist.vendor.sys.debug.rtp. u:object_r:vendor_wfd_sys_debug_prop:s0
-persist.vendor.sys.debug.wfd. u:object_r:vendor_wfd_sys_debug_prop:s0
-vendor.sys.debug.wfd. u:object_r:vendor_wfd_sys_debug_prop:s0
-
-# WIGIG
-persist.vendor.wigig. u:object_r:vendor_wigig_core_prop:s0
-persist.vendor.fst. u:object_r:vendor_fst_prop:s0
-persist.dpm.feature u:object_r:vendor_persist_dpm_prop:s0
-ctl.stop$dpmd u:object_r:ctl_dpmd_prop:s0
-
-# Beluga
-ro.vendor.beluga.p u:object_r:vendor_exported_system_prop:s0
-ro.vendor.beluga.c u:object_r:vendor_exported_system_prop:s0
-ro.vendor.beluga.s u:object_r:vendor_exported_system_prop:s0
-ro.vendor.beluga.t u:object_r:vendor_exported_system_prop:s0
diff --git a/sepolicy/qva/private/qcc_app.te b/sepolicy/qva/private/qcc_app.te
deleted file mode 100644
index a5e4547..0000000
--- a/sepolicy/qva/private/qcc_app.te
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (c) 2020 The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-app_domain(vendor_qcc_app)
-net_domain(vendor_qcc_app)
-binder_use(vendor_qcc_app)
-
-# allow invoking activity and access app content to vendor_qcc_app
-#allow vendor_qcc_app { activity_service content_service }:service_manager find;
-# allow display service to vendor_qcc_app
-#allow vendor_qcc_app { display_service }:service_manager find;
-# allow access to wifi and data network to vendor_qcc_app
-#allow vendor_qcc_app { connectivity_service network_management_service }:service_manager find;
-# allow access telephony service info to vendor_qcc_app
-#allow vendor_qcc_app { radio_service registry_service }:service_manager find;
-allow vendor_qcc_app radio_service:service_manager find;
-# allow acquire wakelock to vendor_qcc_app
-#allow vendor_qcc_app { power_service }:service_manager find;
-# allow to load native library
-#allow vendor_qcc_app { mount_service }:service_manager find;
-# for vendor_perf_service
-allow vendor_qcc_app app_api_service:service_manager find;
-
-# allow access to qdma dropbox (/data/misc/qdma)
-allow vendor_qcc_app vendor_qcc_data_file:dir create_dir_perms;
-allow vendor_qcc_app vendor_qcc_data_file:file create_file_perms;
-
-# allow access to socket
-unix_socket_connect(vendor_qcc_app, vendor_dpmtcm, vendor_dpmd)
-
-# allow access to mediadrmserver for qdmastats/wvstats
-allow vendor_qcc_app mediadrmserver_service:service_manager find;
-
-# allow vendor_qcc_app to access system_app_data_file
-# necessary for read and write /data/data subdirectory.
-allow vendor_qcc_app system_app_data_file:dir create_dir_perms;
-allow vendor_qcc_app system_app_data_file:file create_file_perms;
-
-# allow cgroup access
-allow vendor_qcc_app cgroup:file rw_file_perms;
-
-#allow mediametrics_service
-allow vendor_qcc_app mediametrics_service:service_manager find;
-
-# Allow read-write permissions to qdma sockets under vendor_qcc_app_socket.
-allow vendor_qcc_app vendor_qcc_app_socket:dir rw_dir_perms;
-allow vendor_qcc_app vendor_qcc_app_socket:sock_file create_file_perms;
diff --git a/sepolicy/qva/private/qcc_lmtp_app.te b/sepolicy/qva/private/qcc_lmtp_app.te
deleted file mode 100644
index 495284f..0000000
--- a/sepolicy/qva/private/qcc_lmtp_app.te
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type vendor_qcc_lmtp_app, domain, coredomain;
-userdebug_or_eng(`
- app_domain(vendor_qcc_lmtp_app)
- net_domain(vendor_qcc_lmtp_app)
- binder_use(vendor_qcc_lmtp_app)
-
- allow vendor_qcc_lmtp_app {activity_service}:service_manager find;
-
- allow vendor_qcc_lmtp_app location_service:service_manager find;
-
- # for vendor_perf_service
- allow vendor_qcc_lmtp_app vendor_perf_service:service_manager find;
-
- # allow access to socket
- unix_socket_connect(vendor_qcc_lmtp_app, vendor_dpmtcm, vendor_dpmd)
-
- # allow access to qcc dropbox
- allow vendor_qcc_lmtp_app vendor_qcc_data_file:dir create_dir_perms;
- allow vendor_qcc_lmtp_app vendor_qcc_data_file:file create_file_perms;
-
- # allow vendor_qcc_lmtp_app to access system_app_data_file
- # necessary for read and write /data/data subdirectory
- allow vendor_qcc_lmtp_app system_app_data_file:dir create_dir_perms;
- allow vendor_qcc_lmtp_app system_app_data_file:file create_file_perms;
-
- # Allow read-write permissions to qdma sockets under vendor_qcc_app_socket.
- unix_socket_connect(vendor_qcc_lmtp_app, vendor_qcc_app, vendor_qcc_app)
- allow vendor_qcc_lmtp_app vendor_qcc_app_socket:dir rw_dir_perms;
- allow vendor_qcc_lmtp_app vendor_qcc_app_socket:sock_file create_file_perms;
-')
diff --git a/sepolicy/qva/private/qcc_trd.te b/sepolicy/qva/private/qcc_trd.te
deleted file mode 100644
index ded25c9..0000000
--- a/sepolicy/qva/private/qcc_trd.te
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2020 The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-hal_client_domain(vendor_qcc_trd, vendor_qccsyshal);
diff --git a/sepolicy/qva/private/qcc_utils_app.te b/sepolicy/qva/private/qcc_utils_app.te
deleted file mode 100644
index 3253144..0000000
--- a/sepolicy/qva/private/qcc_utils_app.te
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-app_domain(vendor_qcc_utils_app)
-net_domain(vendor_qcc_utils_app)
-binder_use(vendor_qcc_utils_app)
-
-allow vendor_qcc_utils_app { app_api_service radio_service }:service_manager find;
-
-# allow access to qcc dropbox
-allow vendor_qcc_utils_app vendor_qcc_data_file:dir create_dir_perms;
-allow vendor_qcc_utils_app vendor_qcc_data_file:file create_file_perms;
-
-# allow vendor_qcc_utils_app to access system_app_data_file
-# necessary for read and write /data/data subdirectory
-allow vendor_qcc_utils_app system_app_data_file:dir create_dir_perms;
-allow vendor_qcc_utils_app system_app_data_file:file create_file_perms;
-
-# allow cgroup access
-allow vendor_qcc_utils_app cgroup:file rw_file_perms;
-
-# for aws iot mqtt
-allow vendor_qcc_utils_app self: udp_socket create_socket_perms_no_ioctl;
diff --git a/sepolicy/qva/private/qdtservice.te b/sepolicy/qva/private/qdtservice.te
deleted file mode 100644
index d80a845..0000000
--- a/sepolicy/qva/private/qdtservice.te
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2018, The Linux Foundation. All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type vendor_qdtservice_exec, exec_type, system_file_type, file_type;
-type vendor_qdtservice, domain, coredomain;
-
-init_daemon_domain(vendor_qdtservice)
-
-add_service(vendor_qdtservice, vendor_qdt_service);
-binder_use(vendor_qdtservice);
-binder_service(vendor_qdtservice);
-
-hal_client_domain(vendor_qdtservice, vendor_hal_perf)
diff --git a/sepolicy/qva/private/qspmsvc.te b/sepolicy/qva/private/qspmsvc.te
deleted file mode 100644
index ac71950..0000000
--- a/sepolicy/qva/private/qspmsvc.te
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-typeattribute vendor_qspmsvc coredomain;
-type vendor_qspmsvc_exec, exec_type, system_file_type, file_type;
-
-init_daemon_domain(vendor_qspmsvc)
-add_service(vendor_qspmsvc, vendor_qspmsvc_service);
-binder_use(vendor_qspmsvc);
-binder_call(vendor_qspmsvc, system_server);
-binder_service(vendor_qspmsvc);
-hal_client_domain(vendor_qspmsvc, hal_thermal)
diff --git a/sepolicy/qva/private/qvrd.te b/sepolicy/qva/private/qvrd.te
deleted file mode 100644
index a182614..0000000
--- a/sepolicy/qva/private/qvrd.te
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright (c) 2017,2020, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-typeattribute vendor_qvrd coredomain;
-typeattribute vendor_qvrd mlstrustedsubject;
-type vendor_qvrd_exec, system_file_type, exec_type, file_type;
-
-init_daemon_domain(vendor_qvrd)
-
-#
-# General
-#
-
-binder_call(vendor_qvrd, system_server);
-
-# Allow interracting with vendor_qvrd directory
-allow vendor_qvrd vendor_qvrd_data_file:dir create_dir_perms;
-allow vendor_qvrd vendor_qvrd_data_file:file create_file_perms;
-
-#allow binder use for checking permissions
-binder_use(vendor_qvrd)
-allow vendor_qvrd permission_service:service_manager find;
-
-#Allow hardware binder use
-hwbinder_use(vendor_qvrd)
-get_prop(vendor_qvrd, hwservicemanager_prop)
-
-# Allow access to our socket
-allow vendor_qvrd vendor_qvrd_socket:sock_file rw_file_perms;
-allow vendor_qvrd vendor_qvrd_controller_socket:sock_file rw_file_perms;
-
-#
-# Sensors
-#
-
-
-# Allow access to sensor1 API
-allow vendor_qvrd self:socket create_socket_perms_no_ioctl;
-
-#
-# Display
-#
-
-# Allow access to /dev/graphics/fb0 for configuring vsync interrupts
-allow vendor_qvrd graphics_device:dir r_dir_perms;
-allow vendor_qvrd graphics_device:chr_file rw_file_perms;
-
-#
-# Graphics
-#
-
-#Allow hal graphics mapper permissions
-hal_client_domain(vendor_qvrd, hal_graphics_composer);
-
-#Allow hal graphics allocator permissions
-hal_client_domain(vendor_qvrd, hal_graphics_allocator);
-
-#
-# Scheduler
-#
-
-allow vendor_qvrd self:capability { sys_nice };
-userdebug_or_eng(`
- allow vendor_qvrd su:process setsched;
-')
-allow vendor_qvrd appdomain:process setsched;
-
-# whitelisting ioctlcmd c302
-allowxperm vendor_qvrd self:socket ioctl msm_sock_ipc_ioctls_system;
-allow vendor_qvrd self:socket ioctl;
diff --git a/sepolicy/qva/private/radio.te b/sepolicy/qva/private/radio.te
deleted file mode 100644
index af5ec47..0000000
--- a/sepolicy/qva/private/radio.te
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2017, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-userdebug_or_eng(`
- unix_socket_send(radio,vendor_seempdw, vendor_seempd)
-')
diff --git a/sepolicy/qva/private/seapp_contexts b/sepolicy/qva/private/seapp_contexts
deleted file mode 100644
index f04368b..0000000
--- a/sepolicy/qva/private/seapp_contexts
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#Add new domain for qti value added Location apps
-user=_app seinfo=platform name=com.qualcomm.location.XT isPrivApp=true domain=vendor_location_app type=app_data_file
-user=_app seinfo=platform name=com.qualcomm.location isPrivApp=true domain=vendor_location_app type=app_data_file
-user=_app seinfo=platform name=com.qualcomm.wfd.service:wfd_service domain=vendor_wfd_app type=app_data_file levelfrom=all
-user=_app seinfo=platform name=com.qualcomm.wfd.client domain=vendor_wfd_app type=app_data_file levelfrom=all
-user=_app seinfo=platform name=com.qualcomm.qti.ssmeditor domain=vendor_qconfig_app type=app_data_file levelfrom=all
-
-#Add new domain for QCC
-user=system seinfo=platform name=com.qualcomm.qti.qdma isPrivApp=true domain=vendor_qcc_app type=system_app_data_file
-#Add new domain for QCCLMTP
-user=system seinfo=platform name=com.qualcomm.qti.qcclmtp isPrivApp=true domain=vendor_qcc_lmtp_app type=system_app_data_file
-#Add new domain for QCC-Utils
-user=system seinfo=platform name=com.qualcomm.qti.qdmautils isPrivApp=true domain=vendor_qcc_utils_app type=system_app_data_file
-# Add new domain for FM app
-user=_app seinfo=platform name=com.caf.fmradio domain=vendor_fm_app type=app_data_file levelFrom=all
-
-#Add new domain for secure camera service app
-user=_app seinfo=platform name=com.qualcomm.qti.seccamservice:remote domain=vendor_seccam_app type=app_data_file
diff --git a/sepolicy/qva/private/seccam_app.te b/sepolicy/qva/private/seccam_app.te
deleted file mode 100644
index 2881a71..0000000
--- a/sepolicy/qva/private/seccam_app.te
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2019, The Linux Foundation. All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type vendor_seccam_app, domain;
-app_domain(vendor_seccam_app)
-net_domain(vendor_seccam_app)
-
-hal_client_domain(vendor_seccam_app, vendor_hal_qteeconnector);
-
-allow vendor_seccam_app app_data_file:dir create_dir_perms;
-allow vendor_seccam_app app_data_file:file create_file_perms;
-allow vendor_seccam_app { activity_service app_api_service } :service_manager find;
-allow vendor_seccam_app self:qipcrtr_socket create_socket_perms_no_ioctl;
-typeattribute vendor_seccam_app hal_graphics_composer_client;
diff --git a/sepolicy/qva/private/seempd.te b/sepolicy/qva/private/seempd.te
deleted file mode 100644
index ece4248..0000000
--- a/sepolicy/qva/private/seempd.te
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) 2017, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-typeattribute vendor_seempd coredomain;
-typeattribute vendor_seempd mlstrustedsubject;
-type vendor_seempd_exec, exec_type, system_file_type, file_type;
-
-init_daemon_domain(vendor_seempd)
-
-binder_use(vendor_seempd)
-binder_call(vendor_seempd, system_server)
-binder_call(vendor_seempd, appdomain)
-
-allow vendor_seempd vendor_MinkBinderSvc:service_manager { find };
-
-add_service(vendor_seempd, vendor_seemp_service)
-
-allow vendor_seempd self:binder call;
-allow vendor_seempd ion_device:chr_file r_file_perms;
-
-#Allow search access in seemp_data_file
-allow vendor_seempd vendor_seemp_data_file:dir search;
diff --git a/sepolicy/qva/private/service.te b/sepolicy/qva/private/service.te
deleted file mode 100644
index 87dd607..0000000
--- a/sepolicy/qva/private/service.te
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2018, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type vendor_seemp_service, service_manager_type;
-type vendor_dpmservice, service_manager_type;
-type vendor_MinkBinderSvc, app_api_service, service_manager_type;
-type vendor_perf_service, app_api_service, service_manager_type;
-type vendor_qdt_service, app_api_service, service_manager_type;
-type vendor_izat_service, app_api_service, system_api_service, service_manager_type;
-type vendor_color_service, service_manager_type;
-type vendor_wfdservice_service, service_manager_type;
-type vendor_wigigp2p_service, app_api_service, system_server_service, service_manager_type;
-type vendor_wigig_service, app_api_service, system_server_service, service_manager_type;
-type vendor_vps_service, app_api_service, service_manager_type;
-type vendor_qspmsvc_service, app_api_service, service_manager_type;
-
diff --git a/sepolicy/qva/private/service_contexts b/sepolicy/qva/private/service_contexts
deleted file mode 100644
index afe0493..0000000
--- a/sepolicy/qva/private/service_contexts
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED"AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-dpmservice u:object_r:vendor_dpmservice:s0
-MinkBinderSvc u:object_r:vendor_MinkBinderSvc:s0
-vendor.perfservice u:object_r:vendor_perf_service:s0
-vendor.qdtservice u:object_r:vendor_qdt_service:s0
-sms-sec u:object_r:radio_service:s0
-extphone u:object_r:radio_service:s0
-qti.radio.extphone u:object_r:radio_service:s0
-com.qualcomm.location.izat.IzatService u:object_r:vendor_izat_service:s0
-qti.security.seempspa u:object_r:vendor_seemp_service:s0
-vendor.audio.vrservice u:object_r:audioserver_service:s0
-com.qti.snapdragon.sdk.display.IColorService u:object_r:vendor_color_service:s0
-wfdservice u:object_r:vendor_wfdservice_service:s0
-wigigp2p u:object_r:vendor_wigigp2p_service:s0
-wigig u:object_r:vendor_wigig_service:s0
-display.smomoservice u:object_r:surfaceflinger_service:s0
-vendor.vpsservice u:object_r:vendor_vps_service:s0
-vendor.qspmsvc u:object_r:vendor_qspmsvc_service:s0
-
diff --git a/sepolicy/qva/private/sigma-hal.te b/sepolicy/qva/private/sigma-hal.te
deleted file mode 100644
index dc64d3e..0000000
--- a/sepolicy/qva/private/sigma-hal.te
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 2019 The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type vendor_sigmahal_qti, domain, coredomain;
-type vendor_sigmahal_qti_exec, system_file_type , exec_type, file_type;
-
-hal_server_domain(vendor_sigmahal_qti,vendor_sigmahal);
-hal_attribute_hwservice(vendor_sigmahal, vendor_sigmahal_hwservice);
-
-#Allow for transition from init domain to vendor_sigmahal_qti
-init_daemon_domain(vendor_sigmahal_qti);
-
-#Allow the interaction with servicemanager
-binder_use(vendor_sigmahal_qti)
-
-#Allow the interaction with wfdservice
-binder_call(vendor_sigmahal_qti,vendor_wfdservice);
-
-#Allow access to vendor_wfdservice_service,audioserver_service,surfaceflinger_service to interact with vendor_sigmahal_qti
-allow vendor_sigmahal_qti {vendor_wfdservice_service audioserver_service surfaceflinger_service}:service_manager find;
-
-#Allow vendor_sigmahal_qti to interact with audio_server
-binder_call(vendor_sigmahal_qti,audioserver);
-
-#Allow vendor_sigmahal_qti to interact with surface flinger
-binder_call(vendor_sigmahal_qti,surfaceflinger);
diff --git a/sepolicy/qva/private/surfaceflinger.te b/sepolicy/qva/private/surfaceflinger.te
deleted file mode 100644
index 5cff9c7..0000000
--- a/sepolicy/qva/private/surfaceflinger.te
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2018, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-binder_call(surfaceflinger, vendor_wfdservice);
diff --git a/sepolicy/qva/private/sxrd.te b/sepolicy/qva/private/sxrd.te
deleted file mode 100644
index 988c2cb..0000000
--- a/sepolicy/qva/private/sxrd.te
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) 2020 The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-typeattribute vendor_sys_sxrd coredomain;
-typeattribute vendor_sys_sxrd mlstrustedsubject;
-type vendor_sys_sxrd_exec, system_file_type, exec_type, file_type;
-
-init_daemon_domain(vendor_sys_sxrd)
-
-# Allow access to our socket
-allow vendor_sys_sxrd vendor_sys_sxrd_socket:sock_file rw_file_perms;
-
-# Allow interracting with vendor_sxrd directory
-allow vendor_sys_sxrd vendor_sys_sxrd_data_file:dir create_dir_perms;
-allow vendor_sys_sxrd vendor_sys_sxrd_data_file:file create_file_perms;
-
-#video device
-allow vendor_sys_sxrd video_device:chr_file rw_file_perms;
-
-#Allow hal graphics allocator permissions
-hal_client_domain(vendor_sys_sxrd, hal_graphics_allocator);
-
-#access to usb device
-allow vendor_sys_sxrd usb_device:chr_file rw_file_perms;
-allow vendor_sys_sxrd usb_device:dir search;
-allow vendor_sys_sxrd device:dir search;
-
-#Allow access to PCM sound card
-allow vendor_sys_sxrd audio_device:chr_file rw_file_perms;
-allow vendor_sys_sxrd audio_device:dir r_dir_perms;
-
-#Allow access to Audio Flinger APIs
-binder_call(vendor_sys_sxrd, audioserver);
-allow vendor_sys_sxrd audioserver_service : service_manager find;
-
-# Add rule to access /proc/asound/pcm file
-r_dir_file(vendor_sys_sxrd, proc_asound);
diff --git a/sepolicy/qva/private/system_app.te b/sepolicy/qva/private/system_app.te
deleted file mode 100644
index 819e759..0000000
--- a/sepolicy/qva/private/system_app.te
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (c) 2015, 2017, 2019-2020, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# access to seemp folder
-allow system_app vendor_seemp_data_file:dir r_dir_perms;
-allow system_app vendor_seemp_data_file:{ file fifo_file } rw_file_perms;
-binder_call(system_app, vendor_seempd)
-
-allow system_app vendor_dpmtcm_socket:sock_file w_file_perms;
-allow system_app vendor_dpmd:unix_stream_socket connectto;
-allow system_app vendor_color_service:service_manager add;
-get_prop(system_app, bluetooth_prop);
-# allow system_app to interact with smcinvoke daemon
-#binder_call(system_app, smcinvoke_daemon)
-
-# allow system_app access to Workload Classifier Property
-set_prop(system_app, vendor_wlc_prop);
-
-# allow system_app access to wigig Property
-get_prop(system_app, vendor_wigig_core_prop);
-
-#allow system_app to access faceauth
-hal_client_domain(system_app, hal_face)
diff --git a/sepolicy/qva/private/system_server.te b/sepolicy/qva/private/system_server.te
deleted file mode 100644
index 9d026ea..0000000
--- a/sepolicy/qva/private/system_server.te
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (c) 2015,2017,2019 The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED"AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-add_service(system_server, vendor_izat_service)
-
-# Ant ipc
-hal_client_domain(system_server,hal_bluetooth);
-
-allow system_server vendor_seempdw_socket:sock_file write;
-
-binder_call(system_server, vendor_seempd)
-unix_socket_send(system_server, vendor_seempdw, vendor_seempd)
-
-unix_socket_connect(system_server, vendor_dpmd, vendor_dpmd);
-allow system_server { vendor_dpmd_socket vendor_dpmtcm_socket }:sock_file w_file_perms;
-
-allow system_server vendor_dpmd_data_file:dir create_dir_perms;
-allow system_server vendor_dpmd_data_file:file create_file_perms;
-
-#Allow system_server to add and find perf service
-#add_service(system_server, vendor_perf_service);
-allow system_server vendor_perf_service:service_manager find;
-
-#Allow system_server to add and find vps service
-allow system_server vendor_vps_service:service_manager find;
-
-binder_call(system_server,vendor_qvrd);
-
-#Allow for access to WFD specific debug properties
-binder_call(system_server, vendor_wfdservice);
-userdebug_or_eng(`
- get_prop(system_server, vendor_wfd_sys_debug_prop)
-')
-# Allow system server to access fst,wigig system properties
-set_prop(system_server, vendor_wigig_core_prop)
-set_prop(system_server, vendor_fst_prop)
-
-# Allow system server to access for dpm
-get_prop(system_server, vendor_persist_dpm_prop)
-
-#Allow system_server to add and find qspmsvc service
-allow system_server vendor_qspmsvc_service:service_manager find;
-
diff --git a/sepolicy/qva/private/te_macros b/sepolicy/qva/private/te_macros
deleted file mode 100644
index bf771b4..0000000
--- a/sepolicy/qva/private/te_macros
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2017, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#####################################
-# vendor_dpmd_socket_perm(clientdomain)
-# allow vendor_dpmd to use inet socket created by app.
-define(`vendor_dpmd_socket_perm', `
-allow vendor_dpmd $1:fd use;
-allow vendor_dpmd $1:tcp_socket rw_socket_perms;
-')
-#####################################
diff --git a/sepolicy/qva/private/untrusted_app.te b/sepolicy/qva/private/untrusted_app.te
deleted file mode 100644
index 24189d0..0000000
--- a/sepolicy/qva/private/untrusted_app.te
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2015, 2017, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-unix_socket_connect(untrusted_app,vendor_dpmtcm, vendor_dpmd);
-allow untrusted_app vendor_dpmtcm_socket:sock_file w_file_perms;
-allow untrusted_app vendor_dpmd:unix_stream_socket connectto;
-userdebug_or_eng(`
- r_dir_file(untrusted_app, vendor_seemp_data_file)
- allow untrusted_app vendor_seemp_data_file: file w_file_perms;
-')
-unix_socket_connect(untrusted_app, vendor_qvrd, vendor_qvrd);
-allow untrusted_app vendor_qvrd:fd use;
diff --git a/sepolicy/qva/private/untrusted_app_27.te b/sepolicy/qva/private/untrusted_app_27.te
deleted file mode 100644
index 35e48f8..0000000
--- a/sepolicy/qva/private/untrusted_app_27.te
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2018, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-unix_socket_connect(untrusted_app_27,vendor_dpmtcm, vendor_dpmd);
-allow untrusted_app_27 vendor_dpmtcm_socket:sock_file w_file_perms;
-allow untrusted_app_27 vendor_dpmd:unix_stream_socket connectto;
diff --git a/sepolicy/qva/private/untrusted_app_all.te b/sepolicy/qva/private/untrusted_app_all.te
deleted file mode 100644
index c639b1e..0000000
--- a/sepolicy/qva/private/untrusted_app_all.te
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2019, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-unix_socket_connect(untrusted_app_all, vendor_dpmtcm, vendor_dpmd)
-unix_socket_connect(untrusted_app_all, vendor_qvrd, vendor_qvrd)
-allow untrusted_app_all vendor_qvrd:fd use;
-unix_socket_connect(untrusted_app_all, vendor_sys_sxrd, vendor_sys_sxrd)
-allow untrusted_app_all vendor_sys_sxrd:fd use;
diff --git a/sepolicy/qva/private/vendor_qconfig_app.te b/sepolicy/qva/private/vendor_qconfig_app.te
deleted file mode 100644
index f455f0e..0000000
--- a/sepolicy/qva/private/vendor_qconfig_app.te
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2020, The Linux Foundation. All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type vendor_qconfig_app, domain;
-typeattribute vendor_qconfig_app coredomain;
-
-app_domain(vendor_qconfig_app)
-binder_use(vendor_qconfig_app)
-
-allow vendor_qconfig_app app_api_service:service_manager find;
-hal_client_domain(vendor_qconfig_app, vendor_hal_qconfig)
diff --git a/sepolicy/qva/private/vpsservice.te b/sepolicy/qva/private/vpsservice.te
deleted file mode 100644
index 22fd635..0000000
--- a/sepolicy/qva/private/vpsservice.te
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2019, The Linux Foundation. All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-typeattribute vendor_vpsservice coredomain;
-type vendor_vpsservice_exec, system_file_type, exec_type, file_type;
-
-init_daemon_domain(vendor_vpsservice)
-
-add_service(vendor_vpsservice, vendor_vps_service)
-binder_use(vendor_vpsservice);
-binder_call(vendor_vpsservice, system_server);
-binder_service(vendor_vpsservice);
-
-hal_client_domain(vendor_vpsservice, hal_graphics_composer)
-hal_client_domain(vendor_vpsservice, hal_graphics_allocator)
-allow vendor_vpsservice surfaceflinger:binder call;
-allow vendor_vpsservice surfaceflinger:fd use;
-allow vendor_vpsservice ion_device:chr_file { open read };
-allow vendor_vpsservice media_rw_data_file:dir create_dir_perms;
-allow vendor_vpsservice media_rw_data_file:file create_file_perms;
-allow vendor_vpsservice gpu_device:chr_file rw_file_perms;
diff --git a/sepolicy/qva/private/wfd_app.te b/sepolicy/qva/private/wfd_app.te
deleted file mode 100644
index 412b954..0000000
--- a/sepolicy/qva/private/wfd_app.te
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (c) 2020 The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-typeattribute vendor_wfd_app coredomain;
-
-app_domain(vendor_wfd_app)
-
-net_domain(vendor_wfd_app)
-
-set_prop(vendor_wfd_app, vendor_wfd_service_prop);
-userdebug_or_eng(`
- get_prop(vendor_wfd_app, vendor_wfd_sys_debug_prop);
-#Access to MM-OSAL debug prop for parser debugging on WFD sink
- get_prop(vendor_wfd_app, vendor_mm_osal_prop);
-#Allow access to logmask file in /data/
- allow vendor_wfd_app system_data_file:file r_file_perms;
-')
-binder_call(vendor_wfd_app, vendor_wfdservice)
-
-# allow access to read video SKU property for WFD sink
-get_prop(vendor_wfd_app, vendor_sys_video_prop)
-
-allow vendor_wfd_app {
- vendor_wfdservice_service
- audioserver_service
- mediaserver_service
- mediadrmserver_service
- app_api_service
- vendor_perf_service
- mediametrics_service
-}:service_manager find;
-
-# Access to /data/media for debug dump
-allow vendor_wfd_app media_rw_data_file:dir create_dir_perms;
-allow vendor_wfd_app media_rw_data_file:file create_file_perms;
diff --git a/sepolicy/qva/private/wfdservice.te b/sepolicy/qva/private/wfdservice.te
deleted file mode 100644
index 2e7c97d..0000000
--- a/sepolicy/qva/private/wfdservice.te
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright (c) 2017, 2019-2020 The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-typeattribute vendor_wfdservice coredomain;
-type vendor_wfdservice_exec, system_file_type , exec_type, file_type;
-
-#Allow for transition from init domain to vendor_wfdservice
-init_daemon_domain(vendor_wfdservice)
-
-#Inherit base socket permissions from netd domain
-net_domain(vendor_wfdservice)
-
-#Allow vendor_wfdservice to use Binder IPC
-binder_use(vendor_wfdservice)
-
-#Allow for interaction with Display HAL
-binder_call(vendor_wfdservice, surfaceflinger)
-
-#Allow apps to interact with vendor_wfdservice
-binder_call(vendor_wfdservice, vendor_wfd_app)
-
-#Allow access to Audio Flinger APIs
-binder_call(vendor_wfdservice, audioserver)
-
-#Allow access to Permission Controller in System Server
-binder_call(vendor_wfdservice, system_server)
-
-#Allow vendor_wfdservice to be registered with service manager
-add_service(vendor_wfdservice, vendor_wfdservice_service)
-
-userdebug_or_eng(`
- #Allow access to read mmosal_logmask file in /data partition
- allow vendor_wfdservice system_data_file:file r_file_perms;
-
- #Allow access to wfd debug properties
- get_prop(vendor_wfdservice, vendor_wfd_sys_debug_prop)
-')
-
-# Allow access to mediaserver, surfaceflinger and permissionmanager for interaction of vendor_wfdservice
-allow vendor_wfdservice {audioserver_service permission_service surfaceflinger_service}: service_manager find;
-
-hal_client_domain(vendor_wfdservice, hal_graphics_allocator);
-
-hal_client_domain(vendor_wfdservice, hal_graphics_composer);
-
-#Allow ion device access
-allow vendor_wfdservice ion_device:chr_file r_file_perms;
-
-#Allow source to access video UBWC property(for display config)
-get_prop(vendor_wfdservice, vendor_sys_video_prop)
-
-#Allow the interaction with vendor_sigmahal_qti
-binder_call(vendor_wfdservice, vendor_sigmahal_qti);
diff --git a/sepolicy/qva/private/wificond.te b/sepolicy/qva/private/wificond.te
deleted file mode 100644
index 63e7c03..0000000
--- a/sepolicy/qva/private/wificond.te
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2019, The Linux Foundation. All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#allow wificond to read FST properties
-get_prop(wificond, vendor_fst_prop);
diff --git a/sepolicy/qva/private/zygote.te b/sepolicy/qva/private/zygote.te
deleted file mode 100644
index 1912999..0000000
--- a/sepolicy/qva/private/zygote.te
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2018, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED"AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-unix_socket_send(zygote, vendor_seempdw, vendor_seempd)
-
-get_prop(zygote, vendor_persist_dpm_prop)
-get_prop(zygote, vendor_sys_video_prop)
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index aea3363..8e12f24 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -20,7 +20,7 @@
set -e
# Required!
-DEVICE=zenfone6
+DEVICE=zenfone8
VENDOR=asus
INITIAL_COPYRIGHT_YEAR=2019
@@ -42,7 +42,7 @@
setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT"
# Copyright headers and guards
-write_headers "zenfone6"
+write_headers "zenfone8"
# The standard blobs
write_makefiles "$MY_DIR"/proprietary-files.txt
diff --git a/system.prop b/system.prop
index 9fd2221..33afb57 100644
--- a/system.prop
+++ b/system.prop
@@ -1,7 +1,4 @@
-# Audio
-ro.config.media_vol_steps=25
-ro.config.vc_call_vol_steps=7
-
+rild.libpath=/vendor/lib64/libril-qc-hal-qmi.so
#rild.libargs=-d /dev/smd0
persist.rild.nitz_plmn=
persist.rild.nitz_long_ons_0=
@@ -14,7 +11,8 @@
persist.rild.nitz_short_ons_3=
ril.subscription.types=RUIM,RUIM
DEVICE_PROVISIONED=1
-# Set network mode to (T/L/G/W/1X/EVDO, T/L/G/W/1X/EVDO) for 7+7 mode device on DSDS mode
+# Set network mode to (NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA, NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA) for 8+8 mode device on DSDS mode
+#ro.telephony.default_network=33,33
dalvik.vm.heapsize=36m
dev.pm.dyn_samplingrate=1
@@ -22,6 +20,7 @@
#ro.hdmi.enable=true
#persist.speaker.prot.enable=false
qcom.hw.aac.encoder=true
+
#
# system props for the cne module
#
@@ -35,17 +34,14 @@
media.stagefright.enable-fma2dp=true
media.stagefright.enable-scan=true
media.stagefright.thumbnail.prefer_hw_codecs=true
-media.settings.xml=/vendor/etc/media_profiles_vendor.xml
mmp.enable.3g2=true
media.aac_51_output_enabled=true
-mm.enable.smoothstreaming=true
+media.settings.xml=/vendor/etc/media_profiles_vendor.xml
#16777215 is decimal sum of supported codecs in AAL
-#codecs:(PARSER_)AAC AC3 AMR_NB AMR_WB ASF AVI DTS FLV 3GP 3G2 MP2PS MP2TS MP3 OGG QCP WAV FLAC AIFF APE DSD MHAS
-vendor.mm.enable.qcom_parser=12582911
+#codecs:(PARSER_)AAC AC3 AMR_NB AMR_WB ASF AVI DTS FLV 3GP 3G2 MKV MP2PS MP2TS MP3 OGG QCP WAV FLAC AIFF APE DSD MOV MHAS
+vendor.mm.enable.qcom_parser=12582910
persist.mm.enable.prefetch=true
-#Netflix custom property
-ro.netflix.bsp_rev=Q855-16947-1
#
# system props for the data modules
@@ -57,14 +53,6 @@
persist.timed.enable=true
#
-# system prop for opengles version
-#
-# 196608 is decimal for 0x30000 to report version 3
-# 196609 is decimal for 0x30001 to report version 3.1
-# 196610 is decimal for 0x30002 to report version 3.2
-ro.opengles.version=196610
-
-#
# System props for telephony
# System prop to turn on CdmaLTEPhone always
telephony.lteOnCdmaDevice=1
@@ -80,6 +68,10 @@
persist.vendor.btstack.enable.twsplus=true
persist.vendor.btstack.enable.twsplussho=true
+# ASUS BSP Bluetooth: disable SWB
+persist.vendor.qcom.bluetooth.enable.swb=false
+persist.vendor.qcom.bluetooth.enable.swbpm=false
+
#system prop for RmNet Data
persist.rmnet.data.enable=true
persist.data.wda.enable=true
@@ -157,7 +149,7 @@
persist.vendor.sensors.enable.mag_filter=true
#Partition source order for Product/Build properties pickup.
-#ro.product.property_source_order=odm,vendor,product,product_services,system
+#ro.product.property_source_order=odm,vendor,product,system_ext,system
#Property to enable Codec2 for audio and OMX for Video
debug.stagefright.ccodec=1
@@ -165,85 +157,91 @@
#Property to set native recorder's maximum base layer fps
ro.media.recorder-max-base-layer-fps = 60
-#Touch Property
-persist.vendor.systemui.skiptouch=false
-
-# [ASUS BSP] add for vibration intensity
-ro.asus.vibration_intensity=1
-
-# [ASUS BSP] Deka
-ro.asus.camera.preview_beauty=0:1;1:1;2:1;3:1;4:1;5:1
-ro.asus.camera.cam0.video_fps=HD@60,FHD@60,4K@60
-ro.asus.camera.cam1.video_fps=HD@60,FHD@60,4K@60
-ro.asus.camera.cam2.video_fps=HD@60,FHD@60,4K@30
-ro.asus.camera.cam3.video_fps=HD@60,FHD@60,4K@30
-ro.asus.camera.dual_bokeh=0:0;1:0;2:0;3:0;4:1;5:1
-ro.asus.camera.lens_type=0:standard;1:standard;2:wide-angle;3:wide-angle;4:virtual;5:virtual
-ro.asus.camera.use_frame_processor=0
-ro.asus.camera.ai_scene_mode=0:1;1:1;2:1;3:1
-ro.asus.camera.undistortion.preview=0:0;1:0;2:1;3:1
-ro.asus.camera.undistortion.video=0:0;1:0;2:0;3:0
-persist.camera.capture.hdrplus.dump=0
-ro.asus.camera.cam0.preview_fps_range=8,45
-ro.asus.camera.cam1.preview_fps_range=8,45
-ro.asus.camera.capture.override_max_digital_zoom=0:8;1:8
-
-# [ASUS BSP] Wayne
-ro.asus.camera.cam0.stream_list=1P/2Y/1J
-ro.asus.camera.cam1.stream_list=1P/2Y/1J
-ro.asus.camera.cam0.exposure_time_range=312500,32000000000
-ro.asus.camera.cam1.exposure_time_range=312500,32000000000
-ro.asus.camera.cam2.exposure_time_range=100000,16000000000
-ro.asus.camera.cam3.exposure_time_range=100000,16000000000
-# [ASUS BSP] Mike
-ro.asus.camera.cam0.eis.sup_list=4K@60,4K@30,FHD@60,FHD@30,HD@30,TV@30
-ro.asus.camera.cam1.eis.sup_list=4K@60,4K@30,FHD@60,FHD@30,HD@30,TV@30
-ro.asus.camera.cam2.eis.sup_list=4K@60,4K@30,FHD@60,FHD@30,HD@30,TV@30
-ro.asus.camera.cam3.eis.sup_list=4K@60,4K@30,FHD@60,FHD@30,HD@30,TV@30
-# [ASUS BSP] Mike
-
-# [ASUS BSP] Mike
-ro.asus.camera.fovc=0:1;1:1;2:0;3:0
-# [ASUS BSP] Mike
-# [ASUS BSP] Byron for camera night mode use
-ro.asus.camera.night=0:1;1:1;2:1;3:1
-# [ASUS BSP] Byron for camera night mode use
-
-# [ASUS BSP] for camera long exposure
-vendor.camera.expTimeMax=0
-# [ASUS BSP] for camera long exposure
-
-# Only enable WCG and HDR in Asus system image
-ro.asus.wcg=1
-ro.asus.hdr=1
-
-vendor.camera.asus.system=1
-# [ASUS BSP] for Poweroff Alarm Support
-ro.asus.poweroffalarm_support=1
-
-# ASUS BSP: for Q vibrator HAL 50% 75% vmax
-ro.asus.scale_very_low_max_amp=1
-ro.asus.scale_low_max_amp=128
-
-# Disable UXE
-vendor.iop.enable_uxe=0
-
-# [ASUS BSP] Debug
-ro.logd.kernel=1
-persist.vendor.asus.logcat.filenum=20
-persist.logd.size=1048576
-ro.vendor.asus.logcat=1
-persist.vendor.asus.startlog=0
-# [ASUS BSP] Debug
-
#Battery Property
ro.charger.enable_suspend = 1
-#Enable Qualcomm mdp rotator
-vendor.display.enable_rotator_ui = 1
+# ASUS_BSP +++
+persist.vendor.asus.logcat.filenum=20
+# property for csclogtool
+logtool.package=com.asus.csclogtool
+logtool.class=com.asus.csclogtool.LogService
+ro.asus.rog=1
+# ASUS_BSP ---
+# jack for default log flag
+
+persist.vendor.asus.startlog=0
+persist.vendor.sys.downloadmode.enable=0
+# ASUS_BSP ---
+
+# ASUS_BSP "Enable IOT logging"+++
+persist.vendor.service.bt.iotinfo.report.enable=true
+# ASUS_BSP "Enable IOT logging"---
+
+# ASUS_BSP AustinT "FP wakeup property"+++
+persist.vendor.asus.fp.wakeup_support=true
+persist.vendor.asus.fp.wakeup=false
+# ASUS_BSP AustinT "FP wakeup property"---
+
+# ASUS_BSP AustinC Dirac +++
+ro.vendor.dirac.acs.controller=gef
+ro.vendor.dirac.acs.storeSettings=1
+ro.vendor.dirac.acs.ignore_error=0
+ro.vendor.dirac.gef.int.did=0xF,0x313,0x2C4
+ro.vendor.dirac.gef.ext.did=0xA,0x2D,0x14,0x2C7,0x2C9,0x1F7
+ro.vendor.dirac.gef.int.tid=0x10012D00
+ro.vendor.dirac.gef.int.mid=0x10012DE0
+ro.vendor.dirac.gef.ext.mid=0x10012DE1
+ro.vendor.dirac.gef.system_sound=1
+ro.vendor.dirac.gef.ins.tid=0x10012D02
+ro.vendor.dirac.gef.ins.mid=0x10012DE2
+ro.vendor.dirac.gef.ins.did=0xF,0x313,0x2C4
+ro.vendor.dirac.gef.ins.appt=0x00011131
+ro.vendor.dirac.config=16
+ro.vendor.dirac.acs.rotation=true
+# ASUS_BSP AustinC Dirac ---
+
+# ASUS_BSP AustinC +++
+log.tag.APM_AudioPolicyManager=V
+# ASUS_BSP AustinC ---
+
+vendor.asus.accy_gen=5
+#ASUS_BSP : Anakin use ACCY generation 5
+
+ro.vendor.build.asus.sku=WW
+vendor.camera.expTimeMax=0
+vendor.camera.cam5.crop_region=2:0,0,4032,3024;3:728,546,3304,2478
+vendor.camera.preview_beauty=4:1;1:1;2:1;3:1;5:1
+vendor.camera.preview_portrait=4:0;1:1;2:0;3:0
+vendor.camera.cam3.video_fps=HD@60,FHD@60,4K@60,8K@30
+vendor.camera.cam1.video_fps=HD@30,FHD@60,4K@30
+vendor.camera.cam2.video_fps=HD@30,FHD@60,4K@60
+vendor.camera.cam5.video_fps=HD@30,FHD@60,4K@60,8K@30
+vendor.camera.dual_bokeh=4:1;1:0;2:0;3:0;5:0
+vendor.camera.lens_type=1:std;2:wid;3:std;4:vir;5:sat
+vendor.camera.use_frame_processor=0
+vendor.camera.ai_scene_mode=4:0;1:1;2:1;3:1;5:1
+vendor.camera.undistortion.preview=4:0;1:0;2:1;3:0;5:1
+vendor.camera.undistortion.video=4:0;1:0;2:0;3:0;5:0
+vendor.camera.capture.override_max_digital_zoom=3:8
+vendor.camera.cam1.stream_list=1P/2Y/1J
+vendor.camera.cam2.stream_list=1P/2Y/1J
+vendor.camera.cam3.stream_list=1P/2Y/1J
+vendor.camera.cam3.exposure_time_range=100000,32000000000
+vendor.camera.cam1.exposure_time_range=100000,16000000000
+vendor.camera.cam2.exposure_time_range=100000,16000000000
+vendor.camera.cam3.eis.sup_list=HD@60,FHD@60,4K@60,8K@30
+vendor.camera.cam1.eis.sup_list=HD@30,FHD@60,4K@30
+vendor.camera.cam2.eis.sup_list=HD@30,FHD@60,4K@60
+vendor.camera.cam5.eis.sup_list=HD@30,FHD@60,4K@60,8K@30
+vendor.camera.fovc=0:0;1:1;2:1;3:1;4:0;5:0
+vendor.camera.night=2:1;3:1;5:1
+vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.systemui,android,com.netviv.photo.asusGimbal
+vendor.camera.atdtest=3:9;2:4;1:0
+vendor.camera.asus.system=1
+vendor.camera.eis_ois.sup_list=8K@24,4K@60,4K@30,FHD@60,FHD@30,HD@60,HD@30
+import /system/build_${ro.boot.country_code}.prop
# Extra Asus
-ro.build.asus.sku=WW
ro.vendor.qti.va_aosp.support=1
persist.google.assistant.enable=1
sys.vendor.qti.servicetracker.disable=true
diff --git a/vendor_framework_compatibility_matrix.xml b/vendor_framework_compatibility_matrix.xml
index f0a1489..f374873 100644
--- a/vendor_framework_compatibility_matrix.xml
+++ b/vendor_framework_compatibility_matrix.xml
@@ -24,7 +24,7 @@
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
-<compatibility-matrix version="1.0" type="framework">
+<compatibility-matrix version="2.0" type="framework">
<hal format="hidl" optional="true">
<name>android.hardware.automotive.evs</name>
<version>1.1</version>
@@ -51,6 +51,7 @@
<interface>
<name>IComponentStore</name>
<instance>default</instance>
+ <instance>ozoaudio</instance>
<instance>software</instance>
</interface>
</hal>
@@ -155,14 +156,6 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>vendor.asus.motor</name>
- <version>1.0</version>
- <interface>
- <name>IRotateCameraInterface</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
<name>vendor.display.color</name>
<version>1.0-5</version>
<interface>
@@ -194,26 +187,6 @@
<name>IGoodixFingerprintDaemon</name>
<instance>default</instance>
</interface>
- <interface>
- <name>IGoodixFingerprintDaemonExt</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
- <name>vendor.ims.glovemode</name>
- <version>1.0</version>
- <interface>
- <name>IGloveMode</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
- <name>vendor.ims.zenmotion</name>
- <version>1.0</version>
- <interface>
- <name>IZenMotion</name>
- <instance>default</instance>
- </interface>
</hal>
<hal format="hidl" optional="true">
<name>vendor.nxp.hardware.nfc</name>
@@ -285,14 +258,6 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>vendor.qti.hardware.audiohalext</name>
- <version>1.0</version>
- <interface>
- <name>IAudioHalExt</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
<name>vendor.qti.hardware.bluetooth_audio</name>
<version>2.0</version>
<interface>
@@ -411,6 +376,14 @@
</interface>
</hal>
<hal format="hidl" optional="true">
+ <name>vendor.qti.hardware.display.demura</name>
+ <version>1.0</version>
+ <interface>
+ <name>IDemuraFileFinder</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
<name>vendor.qti.hardware.display.mapper</name>
<version>2.0</version>
<version>3.0</version>
@@ -421,19 +394,11 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>vendor.qti.hardware.eid</name>
+ <name>vendor.qti.hardware.dsp</name>
<version>1.0</version>
<interface>
- <name>IEid</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
- <name>vendor.qti.hardware.embmssl</name>
- <version>1.0</version>
- <interface>
- <name>IEmbms</name>
- <instance>embmsslServer0</instance>
+ <name>IDspService</name>
+ <instance>dspservice</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
@@ -461,6 +426,14 @@
</interface>
</hal>
<hal format="hidl" optional="true">
+ <name>vendor.qti.hardware.ifaa</name>
+ <version>2.0</version>
+ <interface>
+ <name>IIFAADevice</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
<name>vendor.qti.hardware.improvetouch.blobmanager</name>
<version>1.0</version>
<interface>
@@ -493,19 +466,19 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>vendor.qti.hardware.perf</name>
- <version>2.0</version>
+ <name>vendor.qti.hardware.limits</name>
+ <version>1.0</version>
<interface>
- <name>IPerf</name>
+ <name>ILimits</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>vendor.qti.hardware.qccsyshal</name>
- <version>1.0</version>
+ <name>vendor.qti.hardware.perf</name>
+ <version>2.0-2</version>
<interface>
- <name>IQccsyshal</name>
- <instance>qccsyshal</instance>
+ <name>IPerf</name>
+ <instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
@@ -517,6 +490,14 @@
</interface>
</hal>
<hal format="hidl" optional="true">
+ <name>vendor.qti.hardware.qconfig</name>
+ <version>1.0</version>
+ <interface>
+ <name>IQConfig</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
<name>vendor.qti.hardware.qdutils_disp</name>
<version>1.0</version>
<interface>
@@ -572,7 +553,7 @@
</hal>
<hal format="hidl" optional="true">
<name>vendor.qti.hardware.radio.lpa</name>
- <version>1.0</version>
+ <version>1.0-1</version>
<interface>
<name>IUimLpa</name>
<instance>UimLpa0</instance>
@@ -626,6 +607,34 @@
</interface>
</hal>
<hal format="hidl" optional="true">
+ <name>vendor.qti.hardware.scve.objecttracker</name>
+ <version>1.0</version>
+ <interface>
+ <name>IObjectTracker</name>
+ <instance>objectTracker</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
+ <name>vendor.qti.hardware.scve.panorama</name>
+ <version>1.0</version>
+ <interface>
+ <name>IPanoramaStitching</name>
+ <instance>panoStitching</instance>
+ </interface>
+ <interface>
+ <name>IPanoramaTracking</name>
+ <instance>panoTracking</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
+ <name>vendor.qti.hardware.seccam</name>
+ <version>1.0</version>
+ <interface>
+ <name>ISecCam</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
<name>vendor.qti.hardware.secureprocessor.device</name>
<version>1.0</version>
<interface>
@@ -658,6 +667,14 @@
</interface>
</hal>
<hal format="hidl" optional="true">
+ <name>vendor.qti.hardware.soter</name>
+ <version>1.0</version>
+ <interface>
+ <name>ISoter</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
<name>vendor.qti.hardware.systemhelper</name>
<version>1.0</version>
<interface>
@@ -670,6 +687,20 @@
</interface>
</hal>
<hal format="hidl" optional="true">
+ <name>vendor.qti.hardware.trustedui</name>
+ <version>1.0</version>
+ <interface>
+ <name>ITrustedInput</name>
+ <instance>default</instance>
+ <instance>qtee-vm</instance>
+ </interface>
+ <interface>
+ <name>ITrustedUI</name>
+ <instance>default</instance>
+ <instance>qtee-vm</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
<name>vendor.qti.hardware.tui_comm</name>
<version>1.0</version>
<interface>
@@ -688,7 +719,7 @@
</hal>
<hal format="hidl" optional="true">
<name>vendor.qti.hardware.wifi.hostapd</name>
- <version>1.0-2</version>
+ <version>1.0-3</version>
<interface>
<name>IHostapdVendor</name>
<instance>default</instance>
@@ -697,7 +728,7 @@
</hal>
<hal format="hidl" optional="true">
<name>vendor.qti.hardware.wifi.supplicant</name>
- <version>2.0</version>
+ <version>2.0-3</version>
<interface>
<name>ISupplicantVendor</name>
<instance>default</instance>
@@ -780,22 +811,6 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>vendor.qti.memory.pasrmanager</name>
- <version>1.0</version>
- <interface>
- <name>IPasrManager</name>
- <instance>pasrhal</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
- <name>vendor.qti.power.pasrmanager</name>
- <version>1.0</version>
- <interface>
- <name>IPasrManager</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
<name>vendor.qti.qspmhal</name>
<version>1.0</version>
<interface>
@@ -804,14 +819,6 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>vendor.qti.spu</name>
- <version>1.0</version>
- <interface>
- <name>ISPUManager</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
<name>vendor.qti.voiceprint</name>
<version>1.0</version>
<interface>
