From 0aa378102c5a46fb1e62345e3b9e42a98f972d54 Mon Sep 17 00:00:00 2001 From: raghavt20 Date: Tue, 12 Jan 2021 18:52:43 +0100 Subject: [PATCH] sm6150-common: Transform davinci into common tree * The following things are left in devices, because they're device specific - voip compress properties - HVDCP properties - audio configs - power profile - rounded corner configuration - partition configuration - FOD - camera motor - NFC - board-info - fstab - ipa and graphics firmware - shipping and manifest target level Co-authored-by: Adithya R Co-authored-by: Arian Change-Id: I8bef29041f8f239361b999fc8ab1a43cc2ebb86b --- Android.mk | 2 +- AndroidProducts.mk | 23 - BoardConfig.mk => BoardConfigCommon.mk | 66 +- README.md | 26 +- board-info.txt | 1 - .../audio/audio_platform_info_intcodec.xml | 401 --- configs/audio/mixer_paths_idp.xml | 3119 ----------------- configs/audio/sound_trigger_mixer_paths.xml | 230 -- configs/hidl/manifest-nfc.xml | 12 - configs/hidl/manifest.xml | 22 +- configs/nfc/libnfc-nci.conf | 126 - configs/nfc/libnfc-nxp.conf | 427 --- extract-files.sh | 32 +- fod/Android.bp | 49 - fod/FingerprintInscreen.cpp | 202 -- fod/FingerprintInscreen.h | 73 - fod/FodExtension.cpp | 32 - fod/service.cpp | 50 - ...ingerprint.inscreen@1.0-service.davinci.rc | 10 - ...ngerprint.inscreen@1.0-service.davinci.xml | 11 - init/Android.bp | 25 - init/init_davinci.cpp | 115 - light/Android.bp | 6 +- ...rdware.light@2.0-service.xiaomi_sm6150.rc} | 2 +- ...dware.light@2.0-service.xiaomi_sm6150.xml} | 0 light/service.cpp | 2 +- lineage_davinci.mk | 33 - livedisplay/Android.bp | 6 +- livedisplay/service.cpp | 2 +- ....livedisplay@2.0-service.xiaomi_sm6150.rc} | 2 +- ...livedisplay@2.0-service.xiaomi_sm6150.xml} | 0 .../SystemUI/res-keyguard/values/dimens.xml | 20 - .../res/drawable-nodpi/fod_icon_pressed.png | Bin 7004 -> 0 bytes .../packages/SystemUI/res/values/config.xml | 3 - .../apps/Settings/res/values/config.xml | 24 - .../apps/Settings/res/values/dimens.xml | 16 - .../auth_biometric_fingerprint_view.xml | 119 - .../base/core/res/res/values/config.xml | 3 - .../base/core/res/res/xml/power_profile.xml | 99 - .../SystemUI/res/drawable/rounded.xml | 20 - .../packages/SystemUI/res/values/config.xml | 6 - .../packages/SystemUI/res/values/dimens.xml | 29 - proprietary-files.txt | 322 -- rootdir/etc/fstab.qcom | 51 - rootdir/etc/init.target.rc | 29 - rro_overlays/WifiOverlay/AndroidManifest.xml | 2 +- .../WifiOverlay/res/values/config.xml | 3 - sepolicy/public/attributes | 7 - sepolicy/vendor/cameraserver.te | 1 - sepolicy/vendor/file_contexts | 15 +- sepolicy/vendor/hal_lineage_fod_default.te | 10 - sepolicy/vendor/hal_motor_default.te | 26 - sepolicy/vendor/hal_touchfeature_default.te | 19 - sepolicy/vendor/hwservice_contexts | 2 - sepolicy/vendor/property_contexts | 3 - sepolicy/vendor/system_app.te | 7 - sepolicy/vendor/vendor_init.te | 1 + setup-makefiles.sh | 24 +- device.mk => sm6150.mk | 61 +- vendor.prop | 8 - 60 files changed, 78 insertions(+), 5959 deletions(-) delete mode 100644 AndroidProducts.mk rename BoardConfig.mk => BoardConfigCommon.mk (66%) delete mode 100644 board-info.txt delete mode 100644 configs/audio/audio_platform_info_intcodec.xml delete mode 100644 configs/audio/mixer_paths_idp.xml delete mode 100644 configs/audio/sound_trigger_mixer_paths.xml delete mode 100644 configs/hidl/manifest-nfc.xml delete mode 100644 configs/nfc/libnfc-nci.conf delete mode 100644 configs/nfc/libnfc-nxp.conf delete mode 100644 fod/Android.bp delete mode 100644 fod/FingerprintInscreen.cpp delete mode 100644 fod/FingerprintInscreen.h delete mode 100644 fod/FodExtension.cpp delete mode 100644 fod/service.cpp delete mode 100644 fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci.rc delete mode 100644 fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci.xml delete mode 100644 init/Android.bp delete mode 100644 init/init_davinci.cpp rename light/{android.hardware.light@2.0-service.davinci.rc => android.hardware.light@2.0-service.xiaomi_sm6150.rc} (95%) rename light/{android.hardware.light@2.0-service.davinci.xml => android.hardware.light@2.0-service.xiaomi_sm6150.xml} (100%) delete mode 100644 lineage_davinci.mk rename livedisplay/{vendor.lineage.livedisplay@2.0-service.davinci.rc => vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.rc} (88%) rename livedisplay/{vendor.lineage.livedisplay@2.0-service.davinci.xml => vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.xml} (100%) delete mode 100644 overlay-lineage/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml delete mode 100644 overlay-lineage/frameworks/base/packages/SystemUI/res/drawable-nodpi/fod_icon_pressed.png delete mode 100644 overlay-lineage/packages/apps/Settings/res/values/config.xml delete mode 100644 overlay-lineage/packages/apps/Settings/res/values/dimens.xml delete mode 100644 overlay-system/frameworks/base/packages/SystemUI/res/layout/auth_biometric_fingerprint_view.xml delete mode 100644 overlay/frameworks/base/core/res/res/xml/power_profile.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml delete mode 100644 rootdir/etc/fstab.qcom delete mode 100644 sepolicy/public/attributes delete mode 100644 sepolicy/vendor/cameraserver.te delete mode 100644 sepolicy/vendor/hal_lineage_fod_default.te delete mode 100644 sepolicy/vendor/hal_motor_default.te delete mode 100644 sepolicy/vendor/hal_touchfeature_default.te delete mode 100644 sepolicy/vendor/system_app.te create mode 100644 sepolicy/vendor/vendor_init.te rename device.mk => sm6150.mk (84%) diff --git a/Android.mk b/Android.mk index add91a0..6128b3e 100644 --- a/Android.mk +++ b/Android.mk @@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),davinci) +ifneq ($(filter davinci phoenix toco violet,$(TARGET_DEVICE)),) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/AndroidProducts.mk b/AndroidProducts.mk deleted file mode 100644 index e29465c..0000000 --- a/AndroidProducts.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2020 The LineageOS Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# 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. -# - -PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_davinci.mk - -COMMON_LUNCH_CHOICES := \ - lineage_davinci-user \ - lineage_davinci-userdebug \ - lineage_davinci-eng diff --git a/BoardConfig.mk b/BoardConfigCommon.mk similarity index 66% rename from BoardConfig.mk rename to BoardConfigCommon.mk index 3623e75..6fc67fa 100644 --- a/BoardConfig.mk +++ b/BoardConfigCommon.mk @@ -14,12 +14,12 @@ # limitations under the License. # -DEVICE_PATH := device/xiaomi/davinci +COMMON_PATH := device/xiaomi/sm6150-common BUILD_BROKEN_DUP_RULES := true # Inherit from proprietary files -include vendor/xiaomi/davinci/BoardConfigVendor.mk +include vendor/xiaomi/sm6150-common/BoardConfigVendor.mk # Architecture TARGET_ARCH := arm64 @@ -39,9 +39,6 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a76 # ANT+ BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl" -# Assert -TARGET_OTA_ASSERT_DEVICE := davinci,davinciin - # Audio AUDIO_FEATURE_ENABLED_EXT_AMPLIFIER := true AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true @@ -59,7 +56,7 @@ USE_CUSTOM_AUDIO_POLICY := 1 USE_XML_AUDIO_POLICY_CONF := 1 # Bluetooth -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth/include +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(COMMON_PATH)/bluetooth/include # Bootloader TARGET_BOOTLOADER_BOARD_NAME := sm6150 @@ -80,32 +77,20 @@ TARGET_USES_HWC2 := true TARGET_ENABLE_MEDIADRM_64 := true # Filesystem -TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/configs/config.fs +TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/configs/config.fs # FM BOARD_HAVE_QCOM_FM := true -# FOD -TARGET_SURFACEFLINGER_FOD_LIB := //$(DEVICE_PATH):libfod_extension.davinci -TARGET_USES_FOD_ZPOS := true - # GPS BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default LOC_HIDL_VERSION := 4.0 # HIDL -DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/hidl/manifest.xml -DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/configs/hidl/c2_manifest.xml -DEVICE_MATRIX_FILE := $(DEVICE_PATH)/configs/hidl/compatibility_matrix.xml -ODM_MANIFEST_FILES += $(DEVICE_PATH)/configs/hidl/manifest-qva.xml -ODM_MANIFEST_SKUS += davinci -ODM_MANIFEST_DAVINCI_FILES := \ - $(DEVICE_PATH)/configs/hidl/manifest-nfc.xml \ - $(DEVICE_PATH)/configs/hidl/manifest-qva.xml - -# Init -TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_davinci -TARGET_RECOVERY_DEVICE_MODULES := libinit_davinci +DEVICE_MANIFEST_FILE := $(COMMON_PATH)/configs/hidl/manifest.xml +DEVICE_MANIFEST_FILE += $(COMMON_PATH)/configs/hidl/c2_manifest.xml +DEVICE_MATRIX_FILE := $(COMMON_PATH)/configs/hidl/compatibility_matrix.xml +ODM_MANIFEST_FILES += $(COMMON_PATH)/configs/hidl/manifest-qva.xml # Kernel BOARD_KERNEL_BASE := 0x00000000 @@ -114,7 +99,6 @@ BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_SEPARATED_DTBO := true TARGET_KERNEL_CLANG_COMPILE := true -TARGET_KERNEL_CONFIG := davinci_defconfig TARGET_KERNEL_SOURCE := kernel/xiaomi/sm6150 BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 earlycon=msm_geni_serial,0xa88000 @@ -130,41 +114,22 @@ BOARD_MKBOOTIMG_ARGS := --header_version $(BOARD_BOOTIMG_HEADER_VERSION) TARGET_USES_ION := true TARGET_DISABLED_UBWC := true -# Partitions -BOARD_BOOTIMAGE_PARTITION_SIZE := 134217728 -BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 -BOARD_DTBOIMG_PARTITION_SIZE := 33554432 -BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864 -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3758096384 -BOARD_USERDATAIMAGE_PARTITION_SIZE := 55371083776 -BOARD_VENDORIMAGE_PARTITION_SIZE := 1610612736 -BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64) - -BOARD_BUILD_SYSTEM_ROOT_IMAGE := true -BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 - -TARGET_USERIMAGES_USE_EXT4 := true -TARGET_USERIMAGES_USE_F2FS := true -TARGET_COPY_OUT_VENDOR := vendor - # Platform TARGET_BOARD_PLATFORM := sm6150 # Power -TARGET_POWERHAL_MODE_EXT := $(DEVICE_PATH)/power/power-mode.cpp +TARGET_POWERHAL_MODE_EXT := $(COMMON_PATH)/power/power-mode.cpp # Properties -TARGET_ODM_PROP += $(DEVICE_PATH)/odm.prop -TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop -TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop +TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop +TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop +TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop # QCOM BOARD_USES_QCOM_HARDWARE := true # Recovery BOARD_INCLUDE_RECOVERY_DTBO := true -TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888" # RIL @@ -172,7 +137,7 @@ ENABLE_VENDOR_RIL_SERVICE := true # Releasetools TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_xiaomi -TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH) +TARGET_RELEASETOOLS_EXTENSIONS := $(COMMON_PATH) # Security patch level VENDOR_SECURITY_PATCH := 2020-10-01 @@ -181,9 +146,8 @@ VENDOR_SECURITY_PATCH := 2020-10-01 TARGET_SEPOLICY_DIR := msmsteppe include device/qcom/sepolicy_vndr/SEPolicy.mk -BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(DEVICE_PATH)/sepolicy/private -BOARD_PLAT_PUBLIC_SEPOLICY_DIR += $(DEVICE_PATH)/sepolicy/public -BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor +BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private +BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor # Verified Boot BOARD_AVB_ENABLE := true diff --git a/README.md b/README.md index 3099dff..0975610 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,4 @@ Copyright (C) 2020 The LineageOS Project +Copyright (C) 2020-2021 Paranoid Android. -Device configuration for Xiaomi Mi 9T/Redmi K20 -========================================= - -The Xiaomi Mi 9T/Redmi K20 (codenamed _"davinci"_) is a mid-range smartphone from Xiaomi. - -It was announced in June 2019. Release date was June 2019. - -## Device specifications - -Basic | Spec Sheet --------:|:------------------------- -CPU | Dual-core 2.2 GHz Kryo 470 Gold & Hexa-core 1.8 GHz Kryo 470 Silver -Chipset | Qualcomm SDM730 Snapdragon 730 -GPU | Adreno 618 -Memory | 6 GB RAM -Shipped Android Version | 9.0 -Storage | 64/128 GB (UFS 2.0) -Battery | Non-removable Li-Po 4000 mAh -Display | 1080 x 2340 pixels, 6.39 inches (~428 ppi pixel density) -Camera | Main 48 MP f/1.8, telephoto lens, ultrawide lens, dual-LED (dual tone) flash - -## Device picture - -![Xiaomi Mi 9T/Redmi K20](https://i01.appmifile.com/webfile/globalimg/products/pc/redmik20/index_slider_1.png "Xiaomi Mi 9T/Redmi K20 in carbon black") +# Common device tree for Xiaomi SM6150 based devices diff --git a/board-info.txt b/board-info.txt deleted file mode 100644 index 827958f..0000000 --- a/board-info.txt +++ /dev/null @@ -1 +0,0 @@ -require version-baseband=4.3.c5-00069,20.10.20 diff --git a/configs/audio/audio_platform_info_intcodec.xml b/configs/audio/audio_platform_info_intcodec.xml deleted file mode 100644 index 4238908..0000000 --- a/configs/audio/audio_platform_info_intcodec.xml +++ /dev/null @@ -1,401 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/audio/mixer_paths_idp.xml b/configs/audio/mixer_paths_idp.xml deleted file mode 100644 index 64841b0..0000000 --- a/configs/audio/mixer_paths_idp.xml +++ /dev/null @@ -1,3119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/audio/sound_trigger_mixer_paths.xml b/configs/audio/sound_trigger_mixer_paths.xml deleted file mode 100644 index a33fed3..0000000 --- a/configs/audio/sound_trigger_mixer_paths.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/hidl/manifest-nfc.xml b/configs/hidl/manifest-nfc.xml deleted file mode 100644 index 2fb7ccd..0000000 --- a/configs/hidl/manifest-nfc.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - android.hardware.nfc - hwbinder - 1.2 - - INfc - default - - @1.2::INfc/default - - diff --git a/configs/hidl/manifest.xml b/configs/hidl/manifest.xml index 9e034c5..fea153e 100644 --- a/configs/hidl/manifest.xml +++ b/configs/hidl/manifest.xml @@ -1,4 +1,4 @@ - + android.hardware.audio hwbinder @@ -522,24 +522,4 @@ @1.0::IXiaomiFingerprint/default - - vendor.xiaomi.hardware.motor - hwbinder - 1.0 - - IMotor - default - - @1.0::IMotor/default - - - vendor.xiaomi.hardware.touchfeature - hwbinder - 1.0 - - ITouchFeature - default - - @1.0::ITouchFeature/default - diff --git a/configs/nfc/libnfc-nci.conf b/configs/nfc/libnfc-nci.conf deleted file mode 100644 index 3af3081..0000000 --- a/configs/nfc/libnfc-nci.conf +++ /dev/null @@ -1,126 +0,0 @@ -########################## Start of libnfc-nci.conf ########################### -############################################################################### -# Application options -NFC_DEBUG_ENABLED=1 - -############################################################################### -# performance measurement -# Change this setting to control how often USERIAL log the performance (throughput) -# data on read/write/poll -# defailt is to log performance dara for every 100 read or write -#REPORT_PERFORMANCE_MEASURE=100 - -############################################################################### -# File used for NFA storage -NFA_STORAGE="/data/nfc" - -############################################################################### -# Configure the default NfcA/IsoDep techology and protocol route. Can be -# either a secure element (e.g. 0xF4) or the host (0x00) -#DEFAULT_ISODEP_ROUTE=0x00 - -############################################################################### -## Default poll duration (in ms) -## The defualt is 500ms if not set -NFA_DM_DISC_DURATION_POLL=500 - -############################################################################### -# Force UICC to only listen to the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F -UICC_LISTEN_TECH_MASK=0x07 - -############################################################################### -# Force HOST listen feature enable or disable. -# 0: Disable -# 1: Enable -HOST_LISTEN_ENABLE=0x01 - -############################################################################### -# When screen is turned off, specify the desired power state of the controller. -# 0: power-off-sleep state; DEFAULT -# 1: full-power state -# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used) -SCREEN_OFF_POWER_STATE=1 - -############################################################################### -# Force tag polling for the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | -# NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 | -# NFA_TECHNOLOGY_MASK_B_PRIME | NFA_TECHNOLOGY_MASK_KOVIO | -# NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE. -# -# Notable bits: -# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ -# NFA_TECHNOLOGY_MASK_B 0x02 /* NFC Technology B */ -# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ -# NFA_TECHNOLOGY_MASK_ISO15693 0x08 /* Proprietary Technology */ -# NFA_TECHNOLOGY_MASK_KOVIO 0x20 /* Proprietary Technology */ -# NFA_TECHNOLOGY_MASK_ACTIVE 0x40 /* NFC Technology active mode */ -POLLING_TECH_MASK=0x4F - -############################################################################### -# Force P2P to only listen for the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F | -# NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE -# -# Notable bits: -# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ -# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ -# NFA_TECHNOLOGY_MASK_A_ACTIVE 0x40 /* NFC Technology A active mode */ -# NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80 /* NFC Technology F active mode */ -P2P_LISTEN_TECH_MASK=0x45 - -############################################################################### -PRESERVE_STORAGE=0x01 - -############################################################################### -# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h. -# The value is set to 3 by default as it assumes we will discover 0xF2, -# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced -# so that the stack will not wait any longer than necessary. -# Maximum EE supported number -# NXP PN547C2 0x02 -# NXP PN65T 0x03 -# NXP PN548C2 0x02 -# NXP PN66T 0x03 -NFA_MAX_EE_SUPPORTED=0x03 - -############################################################################## -# Deactivate notification wait time out in seconds used in ETSI Reader mode -# 0 - Infinite wait -NFA_DM_DISC_NTF_TIMEOUT=100 - -############################################################################### -# AID_MATCHING constants -# AID_MATCHING_EXACT_ONLY 0x00 -# AID_MATCHING_EXACT_OR_PREFIX 0x01 -# AID_MATCHING_PREFIX_ONLY 0x02 -#AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03 -AID_MATCHING_MODE=0x03 - -############################################################################### -# Preferred Secure Element for Technology based routing -# eSE 0x01 -# UICC 0x02 -NXP_PRFD_TECH_SE=0x01 - -################################################################################ -#Set bit to 1 , black list is enabled -#Set bit to 0, to disable balcklist -NFA_AID_BLOCK_ROUTE=0x01 - -################################################################################ -# Maximum WTX requests entertained by MW -NXP_WM_MAX_WTX_COUNT=50 - -################################################################################ -#Set the default Felica T3T System Code : -#This settings will be used when application does not set this parameter -DEFAULT_SYS_CODE={FE:FF} - -######################################################################### -#Set NCI credit notification timeout value -NXP_NCI_CREDIT_NTF_TIMEOUT=2 diff --git a/configs/nfc/libnfc-nxp.conf b/configs/nfc/libnfc-nxp.conf deleted file mode 100644 index 2e78fad..0000000 --- a/configs/nfc/libnfc-nxp.conf +++ /dev/null @@ -1,427 +0,0 @@ -#################### This file is used by NXP NFC NCI HAL ##################### -############################################################################### -# Application options -# Logging Levels -# NXPLOG_DEFAULT_LOGLEVEL 0x01 -# ANDROID_LOG_DEBUG 0x03 -# ANDROID_LOG_WARN 0x02 -# ANDROID_LOG_ERROR 0x01 -# ANDROID_LOG_SILENT 0x00 -NXPLOG_EXTNS_LOGLEVEL=0x03 -NXPLOG_NCIHAL_LOGLEVEL=0x03 -NXPLOG_NCIX_LOGLEVEL=0x03 -NXPLOG_NCIR_LOGLEVEL=0x03 -NXPLOG_FWDNLD_LOGLEVEL=0x03 -NXPLOG_TML_LOGLEVEL=0x03 - -############################################################################### -# Nfc Device Node name -NXP_NFC_DEV_NODE="/dev/nq-nci" - -################################################################################# -#VEN Toggle Config -#Disable = 0x00 -#Enable = 0x01 -ENABLE_VEN_TOGGLE=0x00 - -############################################################################### -# Extension for Mifare reader enable -MIFARE_READER_ENABLE=0x01 - -############################################################################### -# File name for Firmware -NXP_FW_NAME="libsn100u_fw.so" - -############################################################################### -# System clock source selection configuration -#define CLK_SRC_XTAL 1 -#define CLK_SRC_PLL 2 -NXP_SYS_CLK_SRC_SEL=0x02 - -############################################################################### -# System clock frequency selection configuration -#define CLK_FREQ_13MHZ 1 -#define CLK_FREQ_19_2MHZ 2 -#define CLK_FREQ_24MHZ 3 -#define CLK_FREQ_26MHZ 4 -#define CLK_FREQ_38_4MHZ 5 -#define CLK_FREQ_52MHZ 6 -NXP_SYS_CLK_FREQ_SEL=0x02 - -############################################################################### -# The timeout value to be used for clock request acknowledgment -# min value = 0x01 to max = 0x06 -#NXP_SYS_CLOCK_TO_CFG=0x06 - -############################################################################### -# The delay to try to start PLL/XTAL when using sys clock 256/fc units = ~18.8 us -# min value = 0x01 to max = 0x1F -NXP_CLOCK_REQ_DELAY=0x1F - -############################################################################### -# NXP proprietary settings -NXP_ACT_PROP_EXTN={2F, 02, 00} - -############################################################################### -# NFC forum profile settings -NXP_NFC_PROFILE_EXTN={20, 02, 05, 01, A0, 44, 01, 00} - -############################################################################### -# NXP TVDD configurations settings -# Allow NFCC to configure External TVDD, two configurations (1 and 2) supported, -# out of them only one can be configured at a time. -#NXP_EXT_TVDD_CFG=0x02 - -############################################################################### -#config1:SLALM, 3.3V for both RM and CM -#NXP_EXT_TVDD_CFG_1={20, 02, 0F, 01, A0, 0E, 0B, 31, 01, 01, 31, 00, 00, 00, 01, 00, D0, 0C} - -############################################################################### -#config2: use DCDC in CE, use Tx_Pwr_Req, set CFG2 mode, SLALM, -#monitoring 5V from DCDC, 3.3V for both RM and CM, DCDCWaitTime=4.2ms -#NXP_EXT_TVDD_CFG_2={20, 02, 0F, 01, A0, 0E, 0B, 11, 01, C2, B2, 00, B2, 1E, 1F, 00, D0, 0C} - -############################################################################### -# Core configuration rf field filter settings to enable set to 01 to disable set -# to 00 last bit -#NXP_CORE_RF_FIELD={ 20, 02, 05, 01, A0, 62, 01, 00 } - -############################################################################### -# To enable i2c fragmentation set i2c fragmentation enable 0x01 to disable set -# to 0x00 -#NXP_I2C_FRAGMENTATION_ENABLED=0x00 - -############################################################################### -#set autonomous mode -# disable autonomous 0x00 -# enable autonomous 0x01 -NXP_AUTONOMOUS_ENABLE=0x00 - -############################################################################### -#Enable SWP full power mode when phone is power off -#NXP_SWP_FULL_PWR_ON=0x00 - -################################################################################ -#This is used to configure UICC2 at boot time. -# UICC2 0x03 -NXP_DEFAULT_UICC2_SELECT=0x03 - -############################################################################### -# CE when Screen state is locked -# This setting is for DEFAULT_AID_ROUTE, -# DEFAULT_DESFIRE_ROUTE and DEFAULT_MIFARE_CLT_ROUTE -# Disable 0x00 -# Enable 0x01 -NXP_CE_ROUTE_STRICT_DISABLE=0x01 - -############################################################################### -#Timeout in secs -NXP_SWP_RD_TAG_OP_TIMEOUT=0x01 - -############################################################################### -#Set the default AID route Location : -#This settings will be used when application does not set this parameter -# host 0x00 -# eSE 0x01 -# UICC 0x02 -# UICC2 0x03 -DEFAULT_AID_ROUTE=0x01 - -############################################################################### -#Set the Mifare Desfire route Location : -#This settings will be used when application does not set this parameter -# host 0x00 -# eSE 0x01 -# UICC 0x02 -# UICC2 0x03 -DEFAULT_ISODEP_ROUTE=0x01 - -############################################################################### -#Set the Mifare CLT route Location : -#This settings will be used when application does not set this parameter -# host 0x00 -# eSE 0x01 -# UICC 0x02 -# UICC2 0x03 -DEFAULT_MIFARE_CLT_ROUTE=0x01 - -############################################################################### -#Set the Felica CLT route Location : -#This settings will be used when application does not set this parameter -# eSE 0x01 -# UICC 0x02 -# UICC2 0x03 -DEFAULT_FELICA_CLT_ROUTE=0x01 - -############################################################################### -#Set the default AID Power state : -#This settings will be used when application does not set this parameter -# bit pos 0 = Switch On -# bit pos 1 = Switch Off -# bit pos 2 = Battery Off -# bit pos 3 = Screen off unlock -# bit pos 4 = Screen On lock -# bit pos 5 = Screen Off lock -DEFAULT_AID_PWR_STATE=0x3B - -############################################################################### -#Set the Mifare Desfire Power state : -#This settings will be used when application does not set this parameter -# bit pos 0 = Switch On -# bit pos 1 = Switch Off -# bit pos 2 = Battery Off -# bit pos 3 = Screen off unlock -# bit pos 4 = Screen On lock -# bit pos 5 = Screen Off lock -DEFAULT_DESFIRE_PWR_STATE=0x3B - -############################################################################### -#Set the Mifare CLT Power state : -#This settings will be used when application does not set this parameter -# bit pos 0 = Switch On -# bit pos 1 = Switch Off -# bit pos 2 = Battery Off -# bit pos 3 = Screen off unlock -# bit pos 4 = Screen On lock -# bit pos 5 = Screen Off lock -DEFAULT_MIFARE_CLT_PWR_STATE=0x3B - -############################################################################### -#Set the Felica CLT Power state : -#This settings will be used when application does not set this parameter -# bit pos 0 = Switch On -# bit pos 1 = Switch Off -# bit pos 2 = Battery Off -# bit pos 3 = Screen off unlock -# bit pos 4 = Screen On lock -# bit pos 5 = Screen Off lock -DEFAULT_FELICA_CLT_PWR_STATE=0x3B - -############################################################################### -#Set the default Felica T3T System Code OffHost route Location : -#This settings will be used when application does not set this parameter -# host 0x00 -# eSE 0x01 -# UICC 0x02 -# UICC2 0x03 -DEFAULT_SYS_CODE_ROUTE=0x00 - -############################################################################### -# AID Matching platform options -# AID_MATCHING_L 0x01 -# AID_MATCHING_K 0x02 -#AID_MATCHING_PLATFORM=0x01 - -############################################################################### -# eSE interface options -# NFC 0x01 -# SPI 0x02 -NXP_P61_LS_DEFAULT_INTERFACE=0x02 - -############################################################################### -#CHINA_TIANJIN_RF_SETTING -#Enable 0x01 -#Disable 0x00 -#NXP_CHINA_TIANJIN_RF_ENABLED=0x01 - -############################################################################### -#SWP_SWITCH_TIMEOUT_SETTING -# Allowed range of swp timeout setting is 0x00 to 0x3C [0 - 60]. -# Timeout in milliseconds, for example -# No Timeout 0x00 -# 10 millisecond timeout 0x0A -#NXP_SWP_SWITCH_TIMEOUT=0x0A - -############################################################################### -# Flashing Options Configurations -# FLASH_UPPER_VERSION 0x01 -# FLASH_DIFFERENT_VERSION 0x02 -# FLASH_ALWAYS 0x03 -NXP_FLASH_CONFIG=0x02 - -############################################################################### -# eSE interface options for JCOP Download -# NFC 0x01 -# SPI 0x02 -NXP_P61_JCOP_DEFAULT_INTERFACE=0x02 - -############################################################################### -# Option to perform LS update every boot -# Enable 0x01 -# Disable 0x00 -NXP_LS_FORCE_UPDATE_REQUIRED=0x00 - -############################################################################### -# Option to perform JCOP update every boot -# Enable 0x01 -# Disable 0x00 -NXP_JCOP_FORCE_UPDATE_REQUIRED=0x00 - -############################################################################### -# Bail out mode -# If set to 1, NFCC is using bail out mode for either Type A or Type B poll. -# Set this parameter value to 1 if Android Beam is enabled, else set to 0. -NFA_POLL_BAIL_OUT_MODE=0x00 - -############################################################################### -# White list of Hosts -# This values will be the Hosts(NFCEEs) in the HCI Network. -DEVICE_HOST_WHITE_LIST={C0, 80} - -############################################################################### -# Choose the presence-check algorithm for type-4 tag. If not defined, the default value is 1. -# 0 NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm -# 1 NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block -# 2 NFA_RW_PRES_CHK_ISO_DEP_NAK; Type - 4 tag protocol iso-dep nak presence check -# command is sent waiting for rsp and ntf. -PRESENCE_CHECK_ALGORITHM=2 - -############################################################################### -# Vendor Specific Proprietary Protocol & Discovery Configuration -# Set to 0xFF if unsupported -# byte[0] NCI_PROTOCOL_18092_ACTIVE -# byte[1] NCI_PROTOCOL_B_PRIME -# byte[2] NCI_PROTOCOL_DUAL -# byte[3] NCI_PROTOCOL_15693 -# byte[4] NCI_PROTOCOL_KOVIO -# byte[5] NCI_PROTOCOL_MIFARE -# byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO -# byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME -# byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME -NFA_PROPRIETARY_CFG={05, FF, FF, 06, 81, 80, 70, FF, FF} - -############################################################################### -#NXP_CN_TRANSIT_BLK_NUM_CHECK_ENABLE -#Enable/Disable block number checks for china transit use case -#Enable 0x01 -#Disable 0x00 -#NXP_CN_TRANSIT_BLK_NUM_CHECK_ENABLE=0x01 - -################################################################################################### -#This flags will enable different modes of Lx Debug based on bits of the Byte0 & Byte1 - #Byte 0: - # |_________Bit Mask_______| Debug Mode - # b7|b6|b5|b4|b3|b2|b1|b0| - # | | |X | | | | | Enable L1 Events (ISO14443-4, ISO18092) - # | | | |X | | | | Enable L2 Reader Events(ROW specific) - # | | | | |X | | | Enable Felica SystemCode - # | | | | | |X | | Enable Felica RF (all Felica CM events) - # | | | | | | |X | Enable L2 Events Card Emulation (ISO14443-3, Modulation detected, RF Field ON/OFF) - #Byte 1: - # Enable RSSI 0x01 Byte1 Byte0 - # Disable RSSI 0x00 \__ __/ -# e.g. NXP_CORE_PROP_SYSTEM_DEBUG=0x0110 ==> L1 with RSSI -#NXP_CORE_PROP_SYSTEM_DEBUG=0x11 - -############################################################################### -#Enable NXP NCI runtime parser library -#Enable 0x01 -#Disable 0x00 -NXP_NCI_PARSER_LIBRARY=0x00 - -############################################################################### -# Timeout value in milliseconds for JCOP OS download to complete -OS_DOWNLOAD_TIMEOUT_VALUE=60000 - -############################################################################### -# Forcing HOST to listen for a selected protocol -# 0x00 : Disable Host Listen -# 0x01 : Enable Host to Listen (A) for ISO-DEP tech A -# 0x02 : Enable Host to Listen (B) for ISO-DEP tech B -# 0x04 : Enable Host to Listen (F) for T3T Tag Type Protocol tech F -# 0x07 : Enable Host to Listen (ABF)for ISO-DEP tech AB & T3T Tag Type Protocol tech F -HOST_LISTEN_TECH_MASK=0x07 - -############################################################################### -# Enable forward functionality -# Disable 0x00 -# Enable 0x01 -FORWARD_FUNCTIONALITY_ENABLE=0x01 - -############################################################################### -# Configure the NFC Extras to open and use a static pipe. If the value is -# not set or set to 0, then the default is use a dynamic pipe based on a -# destination gate (see NFA_HCI_DEFAULT_DEST_GATE). Note there is a value -# for each EE (ESE/SIM) -OFF_HOST_ESE_PIPE_ID=0x16 -OFF_HOST_SIM_PIPE_ID=0x0A - -############################################################################### -#Set the Felica T3T System Code Power state : -#This settings will be used when application does not set this parameter -#Update Power state as per NCI2.0 -DEFAULT_SYS_CODE_PWR_STATE=0x39 - -############################################################################### -#Default Secure Element route id -DEFAULT_OFFHOST_ROUTE=0x02 - -############################################################################### -#Maximum SMB transceive wait for response -NXP_SMB_TRANSCEIVE_TIMEOUT=2000 - -############################################################################### -# Firmware file type -#.so file 0x01 -#.bin file 0x02 -NXP_FW_TYPE=0x01 - -############################################################################ -# Extended APDU length for ISO_DEP -ISO_DEP_MAX_TRANSCEIVE=0xFEFF - -######################################################################### -# Support for Amendment I SEMS specification -# Support SEMS Amendment I 0x01 -# Support NXP LS client 0x00 -NXP_GP_AMD_I_SEMS_SUPPORTED=0x01 - -######################################################################### -# Enable/Disable default route to host in case default se is not active -# Disable feature 0x00 -# Enable feature 0x01 -NXP_CHECK_DEFAULT_PROTO_SE_ID=0x01 - -############################################################################### -# Assign terminal number to each interface based on system config -NXP_SPI_SE_TERMINAL_NUM="eSE1" -NXP_NFC_SE_TERMINAL_NUM="eSE2" -#NXP_VISO_SE_TERMINAL_NUM="eSE3" - -############################################################################### -#For static or dynamic dual UICC feature support -#Enable static dual uicc feature by setting value 0x00 -#Enable dynamic dual uicc feature by setting value 0x01 -NXP_DUAL_UICC_ENABLE=0x01 - -############################################################################### -# Time to wait by DH when NFCC will report eSE Cold Temp Error. -# The value is as per the UM and in seconds -NXP_SE_COLD_TEMP_ERROR_DELAY=0x05 - -############################################################################### -# Set configuration optimization decision setting -# Enable = 0x01 -# Disable = 0x00 -NXP_SET_CONFIG_ALWAYS=0x01 -############################################################################### -#OffHost ESE route location for MultiSE -#ESE = 01 -OFFHOST_ROUTE_ESE={01} -############################################################################### -#OffHost UICC route location for MultiSE -#UICC1 = 02 -#UICC2 = 03 -OFFHOST_ROUTE_UICC={02:03} -################################################################################ -# This will enable power state required for GSMA testing. -# When this is enabled , then default AID route power state is added with this power state -# If any aid with power state 0 is added, then this power state is used. -# bit pos 0 = Switch On -# bit pos 1 = Switch Off -# bit pos 2 = Battery Off -# bit pos 3 = Screen off unlock -# bit pos 4 = Screen On lock -# bit pos 5 = Screen Off lock -#DEFUALT_GSMA_PWR_STATE=0x3B -################################################################################# diff --git a/extract-files.sh b/extract-files.sh index 0b2a600..6691ae5 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -8,9 +8,6 @@ set -e -DEVICE=davinci -VENDOR=xiaomi - # Load extract_utils and do some sanity checks MY_DIR="${BASH_SOURCE%/*}" if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi @@ -27,11 +24,19 @@ source "${HELPER}" # Default to sanitizing the vendor folder before extraction CLEAN_VENDOR=true +ONLY_COMMON= +ONLY_TARGET= KANG= SECTION= while [ "${#}" -gt 0 ]; do case "${1}" in + --only-common ) + ONLY_COMMON=true + ;; + --only-target ) + ONLY_TARGET=true + ;; -n | --no-cleanup ) CLEAN_VENDOR=false ;; @@ -58,17 +63,22 @@ function blob_fixup() { system_ext/lib64/libwfdnative.so) "${PATCHELF}" --remove-needed "android.hidl.base@1.0.so" "${2}" ;; - vendor/lib64/hw/camera.qcom.so) - "${PATCHELF}" --remove-needed "libMegviiFacepp-0.5.2.so" "${2}" - "${PATCHELF}" --remove-needed "libmegface.so" "${2}" - "${PATCHELF}" --add-needed "libshim_megvii.so" "${2}" - ;; esac } -# Initialize the helper -setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}" +if [ -z "${ONLY_TARGET}" ]; then + # Initialize the helper for common device + setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}" -extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}" + extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}" +fi + +if [ -z "${ONLY_COMMON}" ] && [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then + # Reinitialize the helper for device + source "${MY_DIR}/../${DEVICE}/extract-files.sh" + setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}" + + extract "${MY_DIR}/../${DEVICE}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}" +fi "${MY_DIR}/setup-makefiles.sh" diff --git a/fod/Android.bp b/fod/Android.bp deleted file mode 100644 index 4645e88..0000000 --- a/fod/Android.bp +++ /dev/null @@ -1,49 +0,0 @@ -// -// Copyright (C) 2019-2020 The LineageOS Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// 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. - -cc_binary { - name: "vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci", - defaults: ["hidl_defaults"], - vintf_fragments: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci.xml"], - init_rc: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci.rc"], - relative_install_path: "hw", - srcs: [ - "service.cpp", - "FingerprintInscreen.cpp", - ], - vendor: true, - shared_libs: [ - "libbase", - "libhardware", - "libhidlbase", - "liblog", - "libutils", - "vendor.goodix.hardware.biometrics.fingerprint@2.1", - "vendor.lineage.biometrics.fingerprint.inscreen@1.0", - "vendor.xiaomi.hardware.fingerprintextension@1.0", - "vendor.xiaomi.hardware.touchfeature@1.0", - ], -} - -cc_library_static { - name: "libfod_extension.davinci", - srcs: ["FodExtension.cpp"], - include_dirs: [ - "frameworks/native/services/surfaceflinger/CompositionEngine/include", - ], - header_libs: [ - "generated_kernel_headers", - ], -} diff --git a/fod/FingerprintInscreen.cpp b/fod/FingerprintInscreen.cpp deleted file mode 100644 index 27da174..0000000 --- a/fod/FingerprintInscreen.cpp +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright (C) 2019-2020 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * 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. - */ - -#define LOG_TAG "FingerprintInscreenService" - -#include "FingerprintInscreen.h" - -#include -#include -#include -#include - -#include -#include -#include - -#define FINGERPRINT_ACQUIRED_VENDOR 6 - -#define COMMAND_NIT 10 -#define PARAM_NIT_FOD 1 -#define PARAM_NIT_NONE 0 - -#define TOUCH_FOD_ENABLE 10 - -#define FOD_UI_PATH "/sys/devices/platform/soc/soc:qcom,dsi-display/fod_ui" - -#define FOD_SENSOR_X 445 -#define FOD_SENSOR_Y 1931 -#define FOD_SENSOR_SIZE 190 - -namespace { - -static bool readBool(int fd) { - char c; - int rc; - - rc = lseek(fd, 0, SEEK_SET); - if (rc) { - LOG(ERROR) << "failed to seek fd, err: " << rc; - return false; - } - - rc = read(fd, &c, sizeof(char)); - if (rc != 1) { - LOG(ERROR) << "failed to read bool from fd, err: " << rc; - return false; - } - - return c != '0'; -} - -} // anonymous namespace - -namespace vendor { -namespace lineage { -namespace biometrics { -namespace fingerprint { -namespace inscreen { -namespace V1_0 { -namespace implementation { - -FingerprintInscreen::FingerprintInscreen() { - touchFeatureService = ITouchFeature::getService(); - xiaomiFingerprintService = IXiaomiFingerprint::getService(); - - std::thread([this]() { - int fd = open(FOD_UI_PATH, O_RDONLY); - if (fd < 0) { - LOG(ERROR) << "failed to open fd, err: " << fd; - return; - } - - struct pollfd fodUiPoll = { - .fd = fd, - .events = POLLERR | POLLPRI, - .revents = 0, - }; - - while (true) { - int rc = poll(&fodUiPoll, 1, -1); - if (rc < 0) { - LOG(ERROR) << "failed to poll fd, err: " << rc; - continue; - } - - xiaomiFingerprintService->extCmd(COMMAND_NIT, - readBool(fd) ? PARAM_NIT_FOD : PARAM_NIT_NONE); - } - }).detach(); -} - -Return FingerprintInscreen::getPositionX() { - return FOD_SENSOR_X; -} - -Return FingerprintInscreen::getPositionY() { - return FOD_SENSOR_Y; -} - -Return FingerprintInscreen::getSize() { - return FOD_SENSOR_SIZE; -} - -Return FingerprintInscreen::onStartEnroll() { - return Void(); -} - -Return FingerprintInscreen::onFinishEnroll() { - return Void(); -} - -Return FingerprintInscreen::onPress() { - return Void(); -} - -Return FingerprintInscreen::onRelease() { - return Void(); -} - -Return FingerprintInscreen::onShowFODView() { - touchFeatureService->setTouchMode(TOUCH_FOD_ENABLE, 1); - return Void(); -} - -Return FingerprintInscreen::onHideFODView() { - touchFeatureService->resetTouchMode(TOUCH_FOD_ENABLE); - return Void(); -} - -Return FingerprintInscreen::handleAcquired(int32_t acquiredInfo, int32_t vendorCode) { - std::lock_guard _lock(mCallbackLock); - if (mCallback == nullptr) { - return false; - } - - if (acquiredInfo == FINGERPRINT_ACQUIRED_VENDOR) { - if (vendorCode == 22) { - Return ret = mCallback->onFingerDown(); - if (!ret.isOk()) { - LOG(ERROR) << "FingerDown() error: " << ret.description(); - } - return true; - } - - if (vendorCode == 23) { - Return ret = mCallback->onFingerUp(); - if (!ret.isOk()) { - LOG(ERROR) << "FingerUp() error: " << ret.description(); - } - return true; - } - } - - return false; -} - -Return FingerprintInscreen::handleError(int32_t error, int32_t vendorCode) { - LOG(ERROR) << "error: " << error << ", vendorCode: " << vendorCode; - return false; -} - -Return FingerprintInscreen::setLongPressEnabled(bool) { - return Void(); -} - -Return FingerprintInscreen::getDimAmount(int32_t /* brightness */) { - return 0; -} - -Return FingerprintInscreen::shouldBoostBrightness() { - return false; -} - -Return FingerprintInscreen::setCallback(const sp& callback) { - { - std::lock_guard _lock(mCallbackLock); - mCallback = callback; - } - - return Void(); -} - -} // namespace implementation -} // namespace V1_0 -} // namespace inscreen -} // namespace fingerprint -} // namespace biometrics -} // namespace lineage -} // namespace vendor diff --git a/fod/FingerprintInscreen.h b/fod/FingerprintInscreen.h deleted file mode 100644 index 8d39985..0000000 --- a/fod/FingerprintInscreen.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (C) 2019-2020 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * 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. - */ - -#ifndef VENDOR_LINEAGE_BIOMETRICS_FINGERPRINT_INSCREEN_V1_0_FINGERPRINTINSCREEN_H -#define VENDOR_LINEAGE_BIOMETRICS_FINGERPRINT_INSCREEN_V1_0_FINGERPRINTINSCREEN_H - -#include -#include -#include - -namespace vendor { -namespace lineage { -namespace biometrics { -namespace fingerprint { -namespace inscreen { -namespace V1_0 { -namespace implementation { - -using ::android::sp; -using ::android::hardware::Return; -using ::android::hardware::Void; -using ::vendor::xiaomi::hardware::fingerprintextension::V1_0::IXiaomiFingerprint; -using ::vendor::xiaomi::hardware::touchfeature::V1_0::ITouchFeature; - -class FingerprintInscreen : public IFingerprintInscreen { -public: - FingerprintInscreen(); - Return getPositionX() override; - Return getPositionY() override; - Return getSize() override; - Return onStartEnroll() override; - Return onFinishEnroll() override; - Return onPress() override; - Return onRelease() override; - Return onShowFODView() override; - Return onHideFODView() override; - Return handleAcquired(int32_t acquiredInfo, int32_t vendorCode) override; - Return handleError(int32_t error, int32_t vendorCode) override; - Return setLongPressEnabled(bool enabled) override; - Return getDimAmount(int32_t brightness) override; - Return shouldBoostBrightness() override; - Return setCallback(const sp& callback) override; - -private: - sp touchFeatureService; - sp xiaomiFingerprintService; - - std::mutex mCallbackLock; - sp mCallback; -}; - -} // namespace implementation -} // namespace V1_0 -} // namespace inscreen -} // namespace fingerprint -} // namespace biometrics -} // namespace lineage -} // namespace vendor - -#endif // VENDOR_LINEAGE_BIOMETRICS_FINGERPRINT_INSCREEN_V1_0_FINGERPRINTINSCREEN_H diff --git a/fod/FodExtension.cpp b/fod/FodExtension.cpp deleted file mode 100644 index 1a0358e..0000000 --- a/fod/FodExtension.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2020 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -uint32_t getFodZOrder(uint32_t z, bool touched) { - if (touched) { - z |= FOD_PRESSED_LAYER_ZORDER; - } - - return z; -} - -uint64_t getFodUsageBits(uint64_t usageBits, bool touched) { - (void) touched; - return usageBits; -} diff --git a/fod/service.cpp b/fod/service.cpp deleted file mode 100644 index 8c53163..0000000 --- a/fod/service.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2019 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * 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. - */ - -#define LOG_TAG "vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci" - -#include -#include - -#include "FingerprintInscreen.h" - -using android::hardware::configureRpcThreadpool; -using android::hardware::joinRpcThreadpool; - -using vendor::lineage::biometrics::fingerprint::inscreen::V1_0::IFingerprintInscreen; -using vendor::lineage::biometrics::fingerprint::inscreen::V1_0::implementation::FingerprintInscreen; - -using android::OK; -using android::status_t; - -int main() { - android::sp service = new FingerprintInscreen(); - - configureRpcThreadpool(1, true); - - status_t status = service->registerAsService(); - if (status != OK) { - LOG(ERROR) << "Cannot register FOD HAL service."; - return 1; - } - - LOG(INFO) << "FOD HAL service ready."; - - joinRpcThreadpool(); - - LOG(ERROR) << "FOD HAL service failed to join thread pool."; - return 1; -} diff --git a/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci.rc b/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci.rc deleted file mode 100644 index 8b93887..0000000 --- a/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci.rc +++ /dev/null @@ -1,10 +0,0 @@ -on boot - chown system system /sys/devices/platform/soc/soc:qcom,dsi-display/fod_ui - chmod 0444 /sys/devices/platform/soc/soc:qcom,dsi-display/fod_ui - -service vendor.fingerprint-inscreen-1-0 /vendor/bin/hw/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci - interface vendor.lineage.biometrics.fingerprint.inscreen@1.0::IFingerprintInscreen default - class hal - user system - group system - shutdown critical diff --git a/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci.xml b/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci.xml deleted file mode 100644 index e03c70c..0000000 --- a/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.davinci.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - vendor.lineage.biometrics.fingerprint.inscreen - hwbinder - 1.0 - - IFingerprintInscreen - default - - - diff --git a/init/Android.bp b/init/Android.bp deleted file mode 100644 index d1accf1..0000000 --- a/init/Android.bp +++ /dev/null @@ -1,25 +0,0 @@ -// -// Copyright (C) 2020 The LineageOS Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// 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. -// - -cc_library_static { - name: "libinit_davinci", - srcs: ["init_davinci.cpp"], - recovery_available: true, - include_dirs: [ - "system/core/init", - ], - shared_libs: ["libbase"], -} diff --git a/init/init_davinci.cpp b/init/init_davinci.cpp deleted file mode 100644 index a2a0c04..0000000 --- a/init/init_davinci.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/* - Copyright (C) 2020 The LineageOS Project. - - 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. - */ - -#include - -#include -#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ -#include - -using android::base::GetProperty; - -std::vector ro_props_default_source_order = { - "", - "bootimage.", - "odm.", - "product.", - "system.", - "vendor.", -}; - -void property_override(char const prop[], char const value[], bool add = true) -{ - prop_info *pi; - - pi = (prop_info *) __system_property_find(prop); - if (pi) - __system_property_update(pi, value, strlen(value)); - else if (add) - __system_property_add(prop, strlen(prop), value, strlen(value)); -} - -void set_ro_build_prop(const std::string &prop, const std::string &value) { - for (const auto &source : ro_props_default_source_order) { - auto prop_name = "ro." + source + "build." + prop; - if (source == "") - property_override(prop_name.c_str(), value.c_str()); - else - property_override(prop_name.c_str(), value.c_str(), false); - } -}; - -void set_ro_product_prop(const std::string &prop, const std::string &value) { - for (const auto &source : ro_props_default_source_order) { - auto prop_name = "ro.product." + source + prop; - property_override(prop_name.c_str(), value.c_str(), false); - } -}; - -void vendor_load_properties() { - std::string region; - std::string hardware_revision; - region = GetProperty("ro.boot.hwc", "GLOBAL"); - hardware_revision = GetProperty("ro.boot.hwversion", "UNKNOWN"); - - std::string model; - std::string device; - std::string fingerprint; - std::string description; - std::string mod_device; - - if (region == "GLOBAL") { - model = "Mi 9T"; - device = "davinci"; - fingerprint = "Xiaomi/davinci/davinci:10/QKQ1.190825.002/V12.0.3.0.QFJMIXM:user/release-keys"; - description = "davinci-user 10 QKQ1.190825.002 V12.0.3.0.QFJMIXM release-keys"; - mod_device = "davinci_global"; - } else if (region == "CN") { - model = "Redmi K20"; - device = "davinci"; - fingerprint = "Xiaomi/davinci/davinci:10/QKQ1.190825.002/V12.0.3.0.QFJCNXM:user/release-keys"; - description = "davinci-user 10 QKQ1.190825.002 V12.0.3.0.QFJCNXM release-keys"; - } else if (region == "INDIA") { - model = "Redmi K20"; - device = "davinciin"; - fingerprint = "Xiaomi/davinciin/davinciin:10/QKQ1.190825.002/V12.0.3.0.QFJINXM:user/release-keys"; - description = "davinciin-user 10 QKQ1.190825.002 V12.0.3.0.QFJINXM release-keys"; - mod_device = "davinciin_in_global"; - } - - set_ro_build_prop("fingerprint", fingerprint); - set_ro_product_prop("device", device); - set_ro_product_prop("model", model); - property_override("ro.build.description", description.c_str()); - if (mod_device != "") { - property_override("ro.product.mod_device", mod_device.c_str()); - } - - property_override("ro.boot.hardware.revision", hardware_revision.c_str()); -} diff --git a/light/Android.bp b/light/Android.bp index 031bc45..9aa0bc9 100644 --- a/light/Android.bp +++ b/light/Android.bp @@ -14,10 +14,10 @@ // limitations under the License. cc_binary { - name: "android.hardware.light@2.0-service.davinci", + name: "android.hardware.light@2.0-service.xiaomi_sm6150", defaults: ["hidl_defaults"], - vintf_fragments: ["android.hardware.light@2.0-service.davinci.xml"], - init_rc: ["android.hardware.light@2.0-service.davinci.rc"], + vintf_fragments: ["android.hardware.light@2.0-service.xiaomi_sm6150.xml"], + init_rc: ["android.hardware.light@2.0-service.xiaomi_sm6150.rc"], relative_install_path: "hw", srcs: [ "service.cpp", diff --git a/light/android.hardware.light@2.0-service.davinci.rc b/light/android.hardware.light@2.0-service.xiaomi_sm6150.rc similarity index 95% rename from light/android.hardware.light@2.0-service.davinci.rc rename to light/android.hardware.light@2.0-service.xiaomi_sm6150.rc index 9803b27..5ee5955 100644 --- a/light/android.hardware.light@2.0-service.davinci.rc +++ b/light/android.hardware.light@2.0-service.xiaomi_sm6150.rc @@ -9,7 +9,7 @@ on boot chmod 0644 /sys/class/leds/right/brightness chmod 0644 /sys/class/leds/right/breath -service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.davinci +service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_sm6150 interface android.hardware.light@2.0::ILight default class hal user system diff --git a/light/android.hardware.light@2.0-service.davinci.xml b/light/android.hardware.light@2.0-service.xiaomi_sm6150.xml similarity index 100% rename from light/android.hardware.light@2.0-service.davinci.xml rename to light/android.hardware.light@2.0-service.xiaomi_sm6150.xml diff --git a/light/service.cpp b/light/service.cpp index e7cffb8..86f1242 100644 --- a/light/service.cpp +++ b/light/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "android.hardware.light@2.0-service.davinci" +#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm6150" #include diff --git a/lineage_davinci.mk b/lineage_davinci.mk deleted file mode 100644 index 45f99a7..0000000 --- a/lineage_davinci.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (C) 2020 The LineageOS Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# 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. -# - -# Inherit from those products. Most specific first. -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) - -# Inherit from davinci device -$(call inherit-product, device/xiaomi/davinci/device.mk) - -# Inherit some common Lineage stuff. -$(call inherit-product, vendor/lineage/config/common_full_phone.mk) - -PRODUCT_NAME := lineage_davinci -PRODUCT_DEVICE := davinci -PRODUCT_BRAND := Xiaomi -PRODUCT_MODEL := Mi 9T -PRODUCT_MANUFACTURER := Xiaomi - -PRODUCT_GMS_CLIENTID_BASE := android-xiaomi diff --git a/livedisplay/Android.bp b/livedisplay/Android.bp index 7efc444..d703560 100644 --- a/livedisplay/Android.bp +++ b/livedisplay/Android.bp @@ -14,10 +14,10 @@ // limitations under the License. cc_binary { - name: "vendor.lineage.livedisplay@2.0-service.davinci", + name: "vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150", defaults: ["hidl_defaults"], - vintf_fragments: ["vendor.lineage.livedisplay@2.0-service.davinci.xml"], - init_rc: ["vendor.lineage.livedisplay@2.0-service.davinci.rc"], + vintf_fragments: ["vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.xml"], + init_rc: ["vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.rc"], relative_install_path: "hw", srcs: [ "SunlightEnhancement.cpp", diff --git a/livedisplay/service.cpp b/livedisplay/service.cpp index 27c6671..604f220 100644 --- a/livedisplay/service.cpp +++ b/livedisplay/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "vendor.lineage.livedisplay@2.0-service.davinci" +#define LOG_TAG "vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150" #include #include diff --git a/livedisplay/vendor.lineage.livedisplay@2.0-service.davinci.rc b/livedisplay/vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.rc similarity index 88% rename from livedisplay/vendor.lineage.livedisplay@2.0-service.davinci.rc rename to livedisplay/vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.rc index eba2943..5877b3a 100644 --- a/livedisplay/vendor.lineage.livedisplay@2.0-service.davinci.rc +++ b/livedisplay/vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.rc @@ -2,7 +2,7 @@ on boot chown system system /sys/devices/platform/soc/soc:qcom,dsi-display/hbm chmod 0660 /sys/devices/platform/soc/soc:qcom,dsi-display/hbm -service vendor.livedisplay-hal-2-0 /vendor/bin/hw/vendor.lineage.livedisplay@2.0-service.davinci +service vendor.livedisplay-hal-2-0 /vendor/bin/hw/vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150 class hal user system group system diff --git a/livedisplay/vendor.lineage.livedisplay@2.0-service.davinci.xml b/livedisplay/vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.xml similarity index 100% rename from livedisplay/vendor.lineage.livedisplay@2.0-service.davinci.xml rename to livedisplay/vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.xml diff --git a/overlay-lineage/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml b/overlay-lineage/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml deleted file mode 100644 index 0135b00..0000000 --- a/overlay-lineage/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - 505px - diff --git a/overlay-lineage/frameworks/base/packages/SystemUI/res/drawable-nodpi/fod_icon_pressed.png b/overlay-lineage/frameworks/base/packages/SystemUI/res/drawable-nodpi/fod_icon_pressed.png deleted file mode 100644 index 877513200bc6b730129620fe20e2ba84457206ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7004 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 6 7 - - - #00ffffff diff --git a/overlay-lineage/packages/apps/Settings/res/values/config.xml b/overlay-lineage/packages/apps/Settings/res/values/config.xml deleted file mode 100644 index 9b87822..0000000 --- a/overlay-lineage/packages/apps/Settings/res/values/config.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - 1 - diff --git a/overlay-lineage/packages/apps/Settings/res/values/dimens.xml b/overlay-lineage/packages/apps/Settings/res/values/dimens.xml deleted file mode 100644 index 51f9c73..0000000 --- a/overlay-lineage/packages/apps/Settings/res/values/dimens.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 78% - diff --git a/overlay-system/frameworks/base/packages/SystemUI/res/layout/auth_biometric_fingerprint_view.xml b/overlay-system/frameworks/base/packages/SystemUI/res/layout/auth_biometric_fingerprint_view.xml deleted file mode 100644 index 4dc47ce..0000000 --- a/overlay-system/frameworks/base/packages/SystemUI/res/layout/auth_biometric_fingerprint_view.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - -