diff --git a/Android.mk b/Android.mk index 033c58c..c11e2ac 100644 --- a/Android.mk +++ b/Android.mk @@ -16,6 +16,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),eqs) +ifeq ($(TARGET_DEVICE),rtwo) include $(call all-makefiles-under,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 70e6d1f..eb772f7 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,9 +15,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_eqs.mk + $(LOCAL_DIR)/lineage_rtwo.mk COMMON_LUNCH_CHOICES := \ - lineage_eqs-user \ - lineage_eqs-userdebug \ - lineage_eqs-eng + lineage_rtwo-user \ + lineage_rtwo-userdebug \ + lineage_rtwo-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index 5e5fe89..b0031d1 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,49 +14,62 @@ # limitations under the License. # -DEVICE_PATH := device/motorola/eqs +DEVICE_PATH := device/motorola/rtwo -# Inherit from motorola sm8475-common -include device/motorola/sm8475-common/BoardConfigCommon.mk +# Inherit from motorola sm8550-common +include device/motorola/sm8550-common/BoardConfigCommon.mk # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := eqs +TARGET_BOOTLOADER_BOARD_NAME := rtwo # Fingerprint -#TARGET_SURFACEFLINGER_UDFPS_LIB := //$(DEVICE_PATH):libudfps_extension.eqs +#TARGET_SURFACEFLINGER_UDFPS_LIB := //$(DEVICE_PATH):libudfps_extension.rtwo #SOONG_CONFIG_qtidisplay_udfps := true # HIDL -DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/device_framework_matrix_eqs.xml -DEVICE_MANIFEST_CAPE_FILES += $(DEVICE_PATH)/manifest_eqs.xml +DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/device_framework_matrix_rtwo.xml +DEVICE_MANIFEST_CAPE_FILES += $(DEVICE_PATH)/manifest_rtwo.xml ODM_MANIFEST_SKUS += dne -ODM_MANIFEST_DNE_FILES := $(DEVICE_PATH)/manifest_eqs_ese.xml +ODM_MANIFEST_DNE_FILES := $(DEVICE_PATH)/manifest_rtwo_ese.xml # Kernel TARGET_KERNEL_CONFIG += \ - vendor/ext_config/moto-waipio-eqs.config \ - vendor/ext_config/lineage-moto-waipio-eqs.config + vendor/ext_config/moto-kalama-rtwo.config \ + vendor/ext_config/lineage-moto-kalama-rtwo.config + +TARGET_KERNEL_DIR := $(DEVICE_PATH)-kernel + +KERNEL_MODULE_DIR := $(TARGET_KERNEL_DIR)/modules +TARGET_FORCE_PREBUILT_KERNEL := true +TARGET_PREBUILT_KERNEL := $(TARGET_KERNEL_DIR)/kernel +BOARD_PREBUILT_DTBOIMAGE := $(TARGET_KERNEL_DIR)/dtbo.img +BOARD_PREBUILT_DTBIMAGE_DIR := $(TARGET_KERNEL_DIR) # Kernel Modules +KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko) + BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load)) BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_boot)) BOARD_VENDOR_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_boot BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.recovery)) -BOOT_KERNEL_MODULES := $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD) +# BOOT_KERNEL_MODULES := $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD) +BOARD_SYSTEM_DLKM_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_boot)) + +BOARD_VENDOR_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_MODULES_LOAD))) +BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD))) # Partitions -BOARD_USERDATAIMAGE_PARTITION_SIZE := 228362006528 +BOARD_USERDATAIMAGE_PARTITION_SIZE := 230140391424 ifneq ($(WITH_GMS),true) BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 3318226944 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 873680896 BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE := 916299776 endif -BOARD_MOT_DP_GROUP_SIZE := 11806965760 # ( BOARD_SUPER_PARTITION_SIZE - 4MB ) -BOARD_SUPER_PARTITION_SIZE := 11811160064 +BOARD_MOT_DP_GROUP_SIZE := 9940496384 # ( BOARD_SUPER_PARTITION_SIZE - 4MB ) +BOARD_SUPER_PARTITION_SIZE := 9940500480 # Properties -TARGET_PRODUCT_PROP += $(DEVICE_PATH)/product.prop TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop @@ -67,4 +80,4 @@ TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90 VENDOR_SECURITY_PATCH := 2023-04-01 # inherit from the proprietary version -include vendor/motorola/eqs/BoardConfigVendor.mk +include vendor/motorola/rtwo/BoardConfigVendor.mk diff --git a/audio/audio_ext_spkr.conf b/audio/audio_ext_spkr.conf index 1fda593..c34e424 100644 --- a/audio/audio_ext_spkr.conf +++ b/audio/audio_ext_spkr.conf @@ -1,7 +1,7 @@ global_config { - name Eqs + name Rtwo force_ring_ramp true - sonification_pad 43 + sonification_pad 26 } ring { diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml index 06145ae..ff2d5e7 100644 --- a/audio/audio_policy_volumes.xml +++ b/audio/audio_policy_volumes.xml @@ -8,12 +8,8 @@ volume index from 0 to 100. --> - - 1,-3000 - 33,-1600 - 66,-1000 - 100,0 - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 100 - waipiovirtualsndcard + kalamavirtualsndcard 100 diff --git a/audio/default_volume_tables.xml b/audio/default_volume_tables.xml index 4db0816..5b5fed7 100644 --- a/audio/default_volume_tables.xml +++ b/audio/default_volume_tables.xml @@ -35,9 +35,9 @@ 1,-3800 - 33,-3300 - 66,-2800 - 100,-1300 + 33,-2900 + 66,-1800 + 100,-1000 diff --git a/audio/microphone_characteristics.xml b/audio/microphone_characteristics.xml index 8f0fb61..b5c67c5 100644 --- a/audio/microphone_characteristics.xml +++ b/audio/microphone_characteristics.xml @@ -1,29 +1,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -64,7 +73,8 @@ - + + diff --git a/audio/sku_cape/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/sku_cape/audio_policy_configuration_a2dp_offload_disabled.xml deleted file mode 100755 index 5770621..0000000 --- a/audio/sku_cape/audio_policy_configuration_a2dp_offload_disabled.xml +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - - - - - - - - - - - - Earpiece - Speaker - Telephony Tx - Built-In Mic - Built-In Back Mic - FM Tuner - Telephony Rx - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/sku_cape/mixer_paths_waipio_mtp.xml b/audio/sku_cape/mixer_paths_waipio_mtp.xml deleted file mode 100644 index c399e39..0000000 --- a/audio/sku_cape/mixer_paths_waipio_mtp.xml +++ /dev/null @@ -1,3185 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/sku_cape/audio_effects.xml b/audio/sku_kalama/audio_effects.xml similarity index 91% rename from audio/sku_cape/audio_effects.xml rename to audio/sku_kalama/audio_effects.xml index b7b311c..bb1fc55 100644 --- a/audio/sku_cape/audio_effects.xml +++ b/audio/sku_kalama/audio_effects.xml @@ -1,6 +1,7 @@ + @@ -15,17 +16,17 @@ - + + + - - - + @@ -48,22 +49,21 @@ - + - - - - - - - + + + + + + diff --git a/audio/sku_cape/audio_policy_configuration.xml b/audio/sku_kalama/audio_policy_configuration.xml similarity index 67% rename from audio/sku_cape/audio_policy_configuration.xml rename to audio/sku_kalama/audio_policy_configuration.xml index 868faef..ee39437 100644 --- a/audio/sku_cape/audio_policy_configuration.xml +++ b/audio/sku_kalama/audio_policy_configuration.xml @@ -1,5 +1,5 @@ - + + @@ -56,6 +92,7 @@ Built-In Back Mic FM Tuner Telephony Rx + Echo Reference Speaker @@ -71,13 +108,23 @@ flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> + + + - + + + @@ -88,7 +135,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000 128000 176400 192000 352800 384000" channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_2POINT1 AUDIO_CHANNEL_OUT_QUAD AUDIO_CHANNEL_OUT_PENTA AUDIO_CHANNEL_OUT_5POINT1 AUDIO_CHANNEL_OUT_6POINT1 AUDIO_CHANNEL_OUT_7POINT1"/> - + samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/> @@ -163,15 +210,54 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK"/> + + + + + + + + + + + + + + + + + + + @@ -179,7 +265,7 @@ + samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/> + 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 AUDIO_FORMAT_LC3"> + 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 AUDIO_FORMAT_LC3"> + 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 AUDIO_FORMAT_LC3"> + + + + + + + + + @@ -282,10 +383,20 @@ - + + + + + + + @@ -300,17 +411,19 @@ + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx,A2DP In,Echo Reference,BLE In"/> + + + + + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + + - - + + - + + + + + + + + + + + + + + + - + diff --git a/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x.xml b/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x.xml new file mode 100644 index 0000000..aab5b3d --- /dev/null +++ b/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x.xml @@ -0,0 +1,1457 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x_nohdr.xml b/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x_nohdr.xml new file mode 100644 index 0000000..bd41f08 --- /dev/null +++ b/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x_nohdr.xml @@ -0,0 +1,1460 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/sku_cape/resourcemanager_waipio_mtp.xml b/audio/sku_kalama/resourcemanager_kalama_mtp.xml similarity index 52% rename from audio/sku_cape/resourcemanager_waipio_mtp.xml rename to audio/sku_kalama/resourcemanager_kalama_mtp.xml index a5db352..b09babd 100644 --- a/audio/sku_cape/resourcemanager_waipio_mtp.xml +++ b/audio/sku_kalama/resourcemanager_kalama_mtp.xml @@ -1,65 +1,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + 2.0 + + PAL_STREAM_COMPRESSED + 1 + + 4 + unprocessed-hdr-mic-landscape + + + 4 + unprocessed-hdr-mic-portrait + + + 4 + unprocessed-hdr-mic-inverted-landscape + + + 4 + unprocessed-hdr-mic-inverted-portrait + PAL_STREAM_VOIP_TX 2 - HW - 16 - 2 - handset-dmic-endfire + 1 PAL_STREAM_VOICE_CALL 1 HW 16 + 1 2 handset-dmic-endfire + + screen-call-dmic-endfire + + + 4 + quad-mic + PAL_STREAM_ULTRA_LOW_LATENCY + + 2 + handset-dmic-endfire + PAL_STREAM_RAW + 1 + handset-mic-unprocessed 4 unprocessed-hdr-mic-landscape @@ -183,47 +295,97 @@ PAL_DEVICE_OUT_HANDSET PAL_DEVICE_OUT_SPEAKER - PAL_DEVICE_OUT_USB_HEADSET PAL_DEVICE_IN_SPEAKER_MIC CODEC_DMA-LPAIF_RXTX-TX-3 - 2 + 4 48000 16 1 + 0 speaker-mic PAL_STREAM_LOW_LATENCY PAL_STREAM_DEEP_BUFFER - 2 - speaker-dmic-endfire - - 2 - speaker-dmic-endfire-invert + 1 + 1 + handset-mic + + 3 + three-mic + + + 4 + quad-mic + + + 4 + unprocessed-hdr-mic-landscape + + + 4 + unprocessed-hdr-mic-portrait + + + 4 + unprocessed-hdr-mic-inverted-landscape + + + 4 + unprocessed-hdr-mic-inverted-portrait + + + + + PAL_STREAM_COMPRESSED + 1 + + 4 + unprocessed-hdr-mic-landscape + + + 4 + unprocessed-hdr-mic-portrait + + + 4 + unprocessed-hdr-mic-inverted-landscape + + + 4 + unprocessed-hdr-mic-inverted-portrait PAL_STREAM_VOIP_TX 2 + 1 2 - speaker-dmic-endfire - - game-mic - - - game-mic - + voice-speaker-dmic-ef PAL_STREAM_VOICE_CALL 1 2 - speaker-dmic-endfire + voice-speaker-dmic-ef OFF + 16 + 1 + + 4 + quad-mic + PAL_STREAM_LOOPBACK @@ -233,7 +395,12 @@ PAL_DEVICE_OUT_SPEAKER - PAL_DEVICE_OUT_USB_HEADSET + PAL_DEVICE_OUT_WIRED_HEADPHONE + PAL_DEVICE_OUT_LINE + PAL_DEVICE_OUT_AUX_DIGITAL + PAL_DEVICE_OUT_HDMI + PAL_DEVICE_OUT_USB_DEVICE + PAL_DEVICE_OUT_AUX_LINE @@ -242,16 +409,31 @@ 1 1 headset-mic + 0 PAL_STREAM_LOW_LATENCY PAL_STREAM_DEEP_BUFFER + 1 + + + + PAL_STREAM_COMPRESSED + 1 PAL_STREAM_VOIP_TX 48000 16 + 1 PAL_STREAM_VOICE_CALL @@ -259,13 +441,13 @@ 48000 16 1 + 1 PAL_STREAM_ULTRA_LOW_LATENCY PAL_DEVICE_OUT_WIRED_HEADSET - PAL_DEVICE_OUT_WIRED_HEADPHONE @@ -282,6 +464,9 @@ PAL_STREAM_DEEP_BUFFER + + PAL_STREAM_COMPRESSED + PAL_STREAM_VOIP_TX @@ -295,28 +480,6 @@ PAL_DEVICE_OUT_BLUETOOTH_SCO - - - - PAL_DEVICE_IN_MIC1 - CODEC_DMA-LPAIF_RXTX-TX-3 - 1 - 1 - mic1 - - - PAL_DEVICE_IN_MIC2 - CODEC_DMA-LPAIF_RXTX-TX-3 - 1 - 1 - mic2 - - - PAL_DEVICE_IN_MIC3 - CODEC_DMA-LPAIF_RXTX-TX-3 - 1 - 1 - mic3 PAL_DEVICE_IN_HANDSET_VA_MIC @@ -326,10 +489,13 @@ 48000 16 va-mic + 1 PAL_DEVICE_OUT_SPEAKER PAL_DEVICE_OUT_HANDSET PAL_DEVICE_OUT_BLUETOOTH_A2DP + PAL_DEVICE_OUT_BLUETOOTH_BLE + PAL_DEVICE_OUT_BLUETOOTH_BLE_BROADCAST @@ -340,10 +506,14 @@ headset-va-mic 48000 16 + 1 PAL_DEVICE_OUT_WIRED_HEADSET PAL_DEVICE_OUT_WIRED_HEADPHONE + PAL_DEVICE_OUT_LINE PAL_DEVICE_OUT_BLUETOOTH_A2DP + PAL_DEVICE_OUT_BLUETOOTH_BLE + PAL_DEVICE_OUT_BLUETOOTH_BLE_BROADCAST @@ -352,21 +522,36 @@ 1 1 48000 - 16 + 0 usb-headset-mic PAL_STREAM_VOIP_TX + 1 PAL_STREAM_LOW_LATENCY PAL_STREAM_DEEP_BUFFER + 1 + + + + PAL_STREAM_COMPRESSED + 1 PAL_STREAM_VOICE_CALL 1 HW + 1 PAL_STREAM_ULTRA_LOW_LATENCY @@ -377,10 +562,12 @@ PAL_DEVICE_IN_FM_TUNER - MI2S-LPAIF-TX-TERTIARY - 1 - 1 + MI2S-LPAIF-TX-SECONDARY + 2 + 2 play-fm + 48000 + 16 PAL_STREAM_LOOPBACK @@ -389,7 +576,7 @@ PAL_DEVICE_IN_PROXY PCM_RT_PROXY-TX-1 2 - 1 + 2 afe-proxy PAL_STREAM_PROXY @@ -404,6 +591,15 @@ 32 vi-feedback + + PAL_DEVICE_IN_CPS_FEEDBACK + CODEC_DMA-LPAIF_WSA-TX-2 + 2 + 2 + 24000 + 32 + cps-feedback + PAL_DEVICE_IN_BLUETOOTH_A2DP SLIM-DEV1-TX-7 @@ -413,6 +609,34 @@ 44100 16 + + PAL_DEVICE_IN_BLUETOOTH_BLE + SLIM-DEV1-TX-7 + 1 + 1 + bt-ble-mic + 44100 + 16 + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + + + PAL_STREAM_VOIP_TX + + + PAL_STREAM_VOICE_CALL + 1 + + + PAL_STREAM_ULTRA_LOW_LATENCY + + + PAL_DEVICE_OUT_BLUETOOTH_BLE + + PAL_DEVICE_IN_TELEPHONY_RX PCM_RT_PROXY-TX-1 @@ -444,6 +668,18 @@ 16 48000 + + PAL_DEVICE_IN_ECHO_REF + PCM_DUMMY-TX-0 + echo-ref-record + 1 + 1 + 16 + 48000 + + PAL_STREAM_RAW + + PAL_DEVICE_NONE CODEC_DMA-LPAIF_WSA-RX-0 @@ -459,16 +695,24 @@ 2 2 48000 - 16 speaker 1 + 0 0 - 1 + + 2 + 0 - PAL_AUDIO_FMT_PCM_S16_LE + + + PAL_AUDIO_FMT_PCM_S24_LE 0 0 48000 - 16 0 handset 0 PAL_STREAM_VOICE_CALL - 1 1 - voice-handset + 1 + + voice-screen-call + voice-handset-hac PAL_STREAM_VOIP_RX + 2 1 - voice-handset - 3 voice-handset-hac PAL_STREAM_ULTRASOUND - 2 + 4 96000 @@ -566,12 +810,14 @@ 1 48000 16 + voice-headphones PAL_STREAM_VOIP_RX 2 48000 16 + voice-headphones @@ -604,16 +850,60 @@ PAL_STREAM_VOICE_CALL 1 - 48000 + 48000 16 + voice-headphones PAL_STREAM_VOIP_RX 2 48000 16 + voice-headphones - + + + PAL_DEVICE_OUT_LINE + CODEC_DMA-LPAIF_RXTX-RX-0 + 2 + 2 + 1 + line + + + PAL_STREAM_VOICE_CALL + 1 + voice-line + 48000 + 16 + + + PAL_STREAM_VOIP_RX + 2 + voice-line + 48000 + 16 + + PAL_DEVICE_OUT_BLUETOOTH_A2DP SLIM-DEV1-RX-7 @@ -627,6 +917,28 @@ 1 + + PAL_DEVICE_OUT_BLUETOOTH_BLE + SLIM-DEV1-RX-7 + 1 + 1 + bt-ble + 44100 + 16 + + PAL_STREAM_VOICE_CALL + 1 + + + + PAL_DEVICE_OUT_BLUETOOTH_BLE_BROADCAST + SLIM-DEV1-RX-7 + 1 + 1 + bt-ble + 44100 + 16 + PAL_DEVICE_OUT_BLUETOOTH_SCO SLIM-DEV1-RX-7 @@ -674,14 +986,6 @@ PAL_STREAM_VOICE_CALL 1 - 48000 - 16 - - - PAL_STREAM_VOIP_RX - 2 - 48000 - 16 @@ -694,14 +998,6 @@ PAL_STREAM_VOICE_CALL 1 - 48000 - 16 - - - PAL_STREAM_VOIP_RX - 2 - 48000 - 16 @@ -757,6 +1053,15 @@ 96000 16 + + PAL_DEVICE_OUT_ULTRASOUND_DEDICATED + CODEC_DMA-LPAIF_WSA-RX-1 + 2 + 1 + ultrasound-handset + 96000 + 16 + @@ -776,6 +1081,15 @@ + + PAL_STREAM_COMPRESSED + + + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + PAL_STREAM_VOICE_UI @@ -816,28 +1130,38 @@ + + PAL_STREAM_SENSOR_PCM_DATA + + + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + - + - - - + + + - - + + - + + - + @@ -858,21 +1182,14 @@ - - - - - - - - + - + @@ -893,6 +1210,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -900,124 +1240,7 @@ - - - - QC_ACD - - - - - - - - - - - - ACD_SOUND_MODEL_ID_EVENT - event.eai - 0x0B001007 - - - - - - - - - - - - - ACD_SOUND_MODEL_ID_SPEECH - speech.eai - 0x0B001008 - - - - - - ACD_SOUND_MODEL_ID_MUSIC - music.eai - 0x0B001009 - - - - - - ACD_SOUND_MODEL_AMBIENCE_NOISE_SILENCE - - 0xFFFFFFFF - - - - - - - - - - - - QC_SENSOR_PCM_DATA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1025,13 +1248,6 @@ - - - - - - - @@ -1046,6 +1262,13 @@ + + + + + + + @@ -1053,13 +1276,6 @@ - - - - - - - @@ -1081,13 +1297,6 @@ - - - - - - - @@ -1110,99 +1319,215 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + QC_ACD + + + + + + + + + + + + ACD_SOUND_MODEL_ID_EVENT + event.eai + 0x0B001007 + + + + + + + + + + + + + + + + + + + + + + ACD_SOUND_MODEL_ID_SPEECH + speech.eai + 0x0B001008 + + + + + + ACD_SOUND_MODEL_ID_MUSIC + music.eai + 0x0B001009 + + + + + + ACD_SOUND_MODEL_AMBIENCE_NOISE_SILENCE + + 0xFFFFFFFF + + + + + + + + + + + + QC_SENSOR_PCM_DATA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + QC_VOICE_UI + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HOTWORD_VOICE_UI + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/sku_cape_qssi/audio_policy_configuration.xml b/audio/sku_kalama_qssi/audio_policy_configuration.xml similarity index 67% rename from audio/sku_cape_qssi/audio_policy_configuration.xml rename to audio/sku_kalama_qssi/audio_policy_configuration.xml index 868faef..ee39437 100644 --- a/audio/sku_cape_qssi/audio_policy_configuration.xml +++ b/audio/sku_kalama_qssi/audio_policy_configuration.xml @@ -1,5 +1,5 @@ - + + @@ -56,6 +92,7 @@ Built-In Back Mic FM Tuner Telephony Rx + Echo Reference Speaker @@ -71,13 +108,23 @@ flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> + + + - + + + @@ -88,7 +135,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000 128000 176400 192000 352800 384000" channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_2POINT1 AUDIO_CHANNEL_OUT_QUAD AUDIO_CHANNEL_OUT_PENTA AUDIO_CHANNEL_OUT_5POINT1 AUDIO_CHANNEL_OUT_6POINT1 AUDIO_CHANNEL_OUT_7POINT1"/> - + samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/> @@ -163,15 +210,54 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK"/> + + + + + + + + + + + + + + + + + + + @@ -179,7 +265,7 @@ + samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/> + 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 AUDIO_FORMAT_LC3"> + 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 AUDIO_FORMAT_LC3"> + 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 AUDIO_FORMAT_LC3"> + + + + + + + + + @@ -282,10 +383,20 @@ - + + + + + + + @@ -300,17 +411,19 @@ + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx,A2DP In,Echo Reference,BLE In"/> + + + + + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + + - - + + - + + + + + + + + + + + + + + + - + diff --git a/audio/usecaseKvManager.xml b/audio/usecaseKvManager.xml index 72857c9..a66e679 100644 --- a/audio/usecaseKvManager.xml +++ b/audio/usecaseKvManager.xml @@ -1,66 +1,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -110,6 +109,15 @@ + + + + + + + + + @@ -118,7 +126,7 @@ - + @@ -126,6 +134,12 @@ + + + + + + @@ -150,10 +164,18 @@ - + - + + + + + + + + + @@ -187,7 +209,7 @@ - + @@ -218,6 +240,22 @@ + + + + + + + + + + + + + + + + @@ -314,6 +352,10 @@ + + + + @@ -372,7 +414,7 @@ - + @@ -483,22 +525,11 @@ - + + - - - - - - - - - - - - - - + + @@ -529,6 +560,13 @@ + + + + + + + @@ -595,6 +633,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -618,6 +702,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -668,16 +779,35 @@ + + + + + + + - + + + + + + + + + + + + + @@ -717,16 +847,34 @@ + + + + + + - + + + + + + + + + + + + + - + @@ -749,13 +897,19 @@ - - + + + + + + + + @@ -771,7 +925,7 @@ - + @@ -780,9 +934,31 @@ + + + + + + + + + + + + + + + + + + + + + + - + @@ -803,21 +979,45 @@ - + + + + + + + + + + + + + + + + + + + - + + + + + + + @@ -863,8 +1063,11 @@ - - + + + + + @@ -874,11 +1077,19 @@ - + + + - + + + + + + + @@ -887,8 +1098,8 @@ - - + + @@ -942,33 +1153,51 @@ - + - + + + + + + + - + - + + + + + + + + + + + + + @@ -984,7 +1213,7 @@ - + @@ -1020,7 +1249,7 @@ - + @@ -1047,13 +1276,23 @@ - + - - + + + + + + + + + + + + @@ -1065,6 +1304,12 @@ + + + + + + @@ -1074,7 +1319,7 @@ - + @@ -1093,11 +1338,17 @@ - + + + + + + + - + @@ -1123,8 +1374,8 @@ DevicePPType="SINGLE_MIC_16KHZ_16BIT_FFNS,DUAL_MIC_16KHZ_16BIT_FFNS,TRI_MIC_16KHZ_16BIT_FFNS,QUAD_MIC_16KHZ_16BIT_FFNS"> - - + + @@ -1133,6 +1384,13 @@ + + + + + + @@ -1140,6 +1398,13 @@ + + + + + + @@ -1161,8 +1426,8 @@ DevicePPType="SINGLE_MIC_16KHZ_16BIT_HEADSET_FFNS"> - - + + @@ -1171,6 +1436,13 @@ + + + + + + @@ -1178,6 +1450,13 @@ + + + + + + @@ -1186,6 +1465,21 @@ + + + + + + + + + + + + + + + @@ -1200,5 +1494,12 @@ + + + + + + + diff --git a/audio/usecaseKvManager_prc.xml b/audio/usecaseKvManager_prc.xml new file mode 100644 index 0000000..1df011a --- /dev/null +++ b/audio/usecaseKvManager_prc.xml @@ -0,0 +1,1499 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/usecaseKvManager_tmo.xml b/audio/usecaseKvManager_tmo.xml new file mode 100644 index 0000000..f5fd45b --- /dev/null +++ b/audio/usecaseKvManager_tmo.xml @@ -0,0 +1,1505 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/device.mk b/device.mk index 56d987e..27703f0 100644 --- a/device.mk +++ b/device.mk @@ -26,28 +26,28 @@ PRODUCT_AAPT_CONFIG := normal PRODUCT_AAPT_PREF_CONFIG := 400dpi PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi -BOARD_SHIPPING_API_LEVEL := 31 -BOARD_API_LEVEL := 31 -PRODUCT_SHIPPING_API_LEVEL := 31 +BOARD_SHIPPING_API_LEVEL := 33 +BOARD_API_LEVEL := 33 +PRODUCT_SHIPPING_API_LEVEL := 33 -# Inherit from motorola sm8475-common -$(call inherit-product, device/motorola/sm8475-common/sm8475.mk) +# Inherit from motorola sm8550-common +$(call inherit-product, device/motorola/sm8550-common/sm8550.mk) # Overlay PRODUCT_PACKAGES += \ - FrameworksResEqs \ - LineageSystemUIEqs \ - SettingsProviderResEqs \ - SystemUIResEqs + FrameworksResRtwo \ + LineageSystemUIRtwo \ + SettingsProviderResRtwo \ + SystemUIResRtwo # Audio PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/sku_cape/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_cape/audio_effects.xml \ - $(LOCAL_PATH)/audio/sku_cape/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_cape/audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/sku_cape/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_cape/audio_policy_configuration_a2dp_offload_disabled.xml \ - $(LOCAL_PATH)/audio/sku_cape/mixer_paths_waipio_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_cape/mixer_paths_waipio_mtp.xml \ - $(LOCAL_PATH)/audio/sku_cape/resourcemanager_waipio_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_cape/resourcemanager_waipio_mtp.xml \ - $(LOCAL_PATH)/audio/sku_cape_qssi/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_cape_qssi/audio_policy_configuration.xml \ + $(LOCAL_PATH)/audio/sku_kalama/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/audio_effects.xml \ + $(LOCAL_PATH)/audio/sku_kalama/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/audio_policy_configuration.xml \ + $(LOCAL_PATH)/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x.xml \ + $(LOCAL_PATH)/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x_nohdr.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x_nohdr.xml \ + $(LOCAL_PATH)/audio/sku_kalama/resourcemanager_kalama_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/resourcemanager_kalama_mtp.xml \ + $(LOCAL_PATH)/audio/sku_kalama_qssi/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama_qssi/audio_policy_configuration.xml \ $(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ $(LOCAL_PATH)/audio/audio_ext_spkr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_ext_spkr.conf \ @@ -56,10 +56,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/microphone_characteristics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/microphone_characteristics.xml \ $(LOCAL_PATH)/audio/usecaseKvManager.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usecaseKvManager.xml -# Fingerprint -PRODUCT_PACKAGES += \ - android.hardware.biometrics.fingerprint@2.3-service.eqs - # Init $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/etc/init/hw/*.rc),\ $(eval PRODUCT_COPY_FILES += $(f):$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/$(notdir $f))) @@ -70,8 +66,7 @@ $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/bin/*.sh),\ # Media PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \ - $(LOCAL_PATH)/media/media_profiles_cape.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_cape.xml + $(LOCAL_PATH)/media/media_profiles_kalama.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_kalama.xml # NFC PRODUCT_PACKAGES += \ @@ -79,7 +74,6 @@ PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2.vendor \ com.android.nfc_extras \ libchrome.vendor \ - NfcNci \ SecureElement \ Tag @@ -90,11 +84,11 @@ PRODUCT_COPY_FILES += \ # PowerShare PRODUCT_PACKAGES += \ - vendor.lineage.powershare@1.0-service.eqs + vendor.lineage.powershare@1.0-service.rtwo # Sensors PRODUCT_PACKAGES += \ - sensors.eqs + sensors.rtwo PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf @@ -102,10 +96,10 @@ PRODUCT_COPY_FILES += \ # Touch # PowerShare PRODUCT_PACKAGES += \ - vendor.lineage.touch@1.0-service.eqs + vendor.lineage.touch@1.0-service.rtwo # Soong namespaces PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH) # Inherit from vendor blobs -$(call inherit-product, vendor/motorola/eqs/eqs-vendor.mk) +$(call inherit-product, vendor/motorola/rtwo/rtwo-vendor.mk) diff --git a/device_framework_matrix_eqs.xml b/device_framework_matrix_rtwo.xml similarity index 100% rename from device_framework_matrix_eqs.xml rename to device_framework_matrix_rtwo.xml diff --git a/extract-files.sh b/extract-files.sh index 1fa3125..ac32d0d 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -14,8 +14,8 @@ fi set -e -export DEVICE=eqs -export DEVICE_COMMON=sm8475-common +export DEVICE=rtwo +export DEVICE_COMMON=sm8550-common export VENDOR=motorola "./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@" diff --git a/fingerprint/.clang-format b/fingerprint/.clang-format deleted file mode 100644 index 5d8d909..0000000 --- a/fingerprint/.clang-format +++ /dev/null @@ -1,14 +0,0 @@ -BasedOnStyle: Google -AccessModifierOffset: -2 -AllowShortFunctionsOnASingleLine: Inline -ColumnLimit: 99 -CommentPragmas: NOLINT:.* -DerivePointerAlignment: false -IndentWidth: 4 -PointerAlignment: Right -TabWidth: 4 -UseTab: Never -PenaltyExcessCharacter: 32 -AllowShortIfStatementsOnASingleLine: false -SpacesBeforeTrailingComments: 2 - diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp deleted file mode 100644 index ac00c4e..0000000 --- a/fingerprint/Android.bp +++ /dev/null @@ -1,22 +0,0 @@ -cc_binary { - name: "android.hardware.biometrics.fingerprint@2.3-service.eqs", - defaults: ["hidl_defaults"], - init_rc: ["android.hardware.biometrics.fingerprint@2.3-service.eqs.rc"], - vintf_fragments: ["android.hardware.biometrics.fingerprint@2.3-service.eqs.xml"], - relative_install_path: "hw", - srcs: [ - "service.cpp", - "BiometricsFingerprint.cpp", - ], - vendor: true, - shared_libs: [ - "libbase", - "libhidlbase", - "liblog", - "libutils", - "android.hardware.biometrics.fingerprint@2.1", - "android.hardware.biometrics.fingerprint@2.2", - "android.hardware.biometrics.fingerprint@2.3", - "com.motorola.hardware.biometric.fingerprint@1.0", - ], -} diff --git a/fingerprint/BiometricsFingerprint.cpp b/fingerprint/BiometricsFingerprint.cpp deleted file mode 100644 index dd8998e..0000000 --- a/fingerprint/BiometricsFingerprint.cpp +++ /dev/null @@ -1,153 +0,0 @@ -/* - * 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. - */ -#define LOG_TAG "fingerprint@2.3-service.eqs" - -#include "BiometricsFingerprint.h" - -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#define NOTIFY_FINGER_UP IMotFodEventType::FINGER_UP -#define NOTIFY_FINGER_DOWN IMotFodEventType::FINGER_DOWN - -#define FOD_HBM_PATH "/sys/devices/platform/soc/soc:qcom,dsi-display-primary/fod_hbm" - -namespace android { -namespace hardware { -namespace biometrics { -namespace fingerprint { -namespace V2_3 { -namespace implementation { - -void setFodHbm(bool status) { - android::base::WriteStringToFile(status ? "1" : "0", FOD_HBM_PATH); -} - -void BiometricsFingerprint::disableHighBrightFod() { - std::lock_guard lock(mSetHbmFodMutex); - - if (!hbmFodEnabled) - return; - - mMotoFingerprint->sendFodEvent(NOTIFY_FINGER_UP, {}, - [](IMotFodEventResult, const hidl_vec &) {}); - setFodHbm(false); - - hbmFodEnabled = false; -} - -void BiometricsFingerprint::enableHighBrightFod() { - std::lock_guard lock(mSetHbmFodMutex); - - if (hbmFodEnabled) - return; - - setFodHbm(true); - mMotoFingerprint->sendFodEvent(NOTIFY_FINGER_DOWN, {}, - [](IMotFodEventResult, const hidl_vec &) {}); - - hbmFodEnabled = true; -} - -BiometricsFingerprint::BiometricsFingerprint() { - biometrics_2_1_service = IBiometricsFingerprint_2_1::getService(); - mMotoFingerprint = IMotoFingerPrint::getService(); - - hbmFodEnabled = false; -} - -Return BiometricsFingerprint::setNotify( - const sp &clientCallback) { - return biometrics_2_1_service->setNotify(clientCallback); -} - -Return BiometricsFingerprint::preEnroll() { - return biometrics_2_1_service->preEnroll(); -} - -Return BiometricsFingerprint::enroll(const hidl_array &hat, - uint32_t gid, uint32_t timeoutSec) { - return biometrics_2_1_service->enroll(hat, gid, timeoutSec); -} - -Return BiometricsFingerprint::postEnroll() { - return biometrics_2_1_service->postEnroll(); -} - -Return BiometricsFingerprint::getAuthenticatorId() { - return biometrics_2_1_service->getAuthenticatorId(); -} - -Return BiometricsFingerprint::cancel() { - auto ret = biometrics_2_1_service->cancel(); - BiometricsFingerprint::onFingerUp(); - return ret; -} - -Return BiometricsFingerprint::enumerate() { - return biometrics_2_1_service->enumerate(); -} - -Return BiometricsFingerprint::remove(uint32_t gid, uint32_t fid) { - return biometrics_2_1_service->remove(gid, fid); -} - -Return BiometricsFingerprint::setActiveGroup(uint32_t gid, - const hidl_string &storePath) { - return biometrics_2_1_service->setActiveGroup(gid, storePath); -} - -Return BiometricsFingerprint::authenticate(uint64_t operationId, uint32_t gid) { - auto ret = biometrics_2_1_service->authenticate(operationId, gid); - BiometricsFingerprint::onFingerUp(); - return ret; -} - -Return BiometricsFingerprint::isUdfps(uint32_t) { - return true; -} - -Return BiometricsFingerprint::onFingerDown(uint32_t, uint32_t, float, float) { - BiometricsFingerprint::enableHighBrightFod(); - - std::thread([this]() { - std::this_thread::sleep_for(std::chrono::milliseconds(200)); - BiometricsFingerprint::onFingerUp(); - }).detach(); - - return Void(); -} - -Return BiometricsFingerprint::onFingerUp() { - BiometricsFingerprint::disableHighBrightFod(); - - return Void(); -} - -} // namespace implementation -} // namespace V2_3 -} // namespace fingerprint -} // namespace biometrics -} // namespace hardware -} // namespace android diff --git a/fingerprint/BiometricsFingerprint.h b/fingerprint/BiometricsFingerprint.h deleted file mode 100644 index a76a20e..0000000 --- a/fingerprint/BiometricsFingerprint.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * 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. - */ - -#ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H -#define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H - -#include -#include -#include -#include - -namespace android { -namespace hardware { -namespace biometrics { -namespace fingerprint { -namespace V2_3 { -namespace implementation { - -using IBiometricsFingerprint_2_1 = - ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint; -using ::android::sp; -using ::android::hardware::hidl_array; -using ::android::hardware::hidl_memory; -using ::android::hardware::hidl_string; -using ::android::hardware::hidl_vec; -using ::android::hardware::Return; -using ::android::hardware::Void; -using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback; -using ::android::hardware::biometrics::fingerprint::V2_1::RequestStatus; -using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotFodEventResult; -using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotFodEventType; -using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotoFingerPrint; - -struct BiometricsFingerprint : public IBiometricsFingerprint { - BiometricsFingerprint(); - // Methods from ::V2_1::IBiometricsFingerprint follow. - Return setNotify( - const sp &clientCallback) override; - Return preEnroll() override; - Return enroll(const hidl_array &hat, uint32_t gid, - uint32_t timeoutSec) override; - Return postEnroll() override; - Return getAuthenticatorId() override; - Return cancel() override; - Return enumerate() override; - Return remove(uint32_t gid, uint32_t fid) override; - Return setActiveGroup(uint32_t gid, const hidl_string &storePath) override; - Return authenticate(uint64_t operationId, uint32_t gid) override; - - // ::V2_3::IBiometricsFingerprint follow. - Return isUdfps(uint32_t sensorId) override; - Return onFingerDown(uint32_t x, uint32_t y, float minor, float major) override; - Return onFingerUp() override; - - private: - void disableHighBrightFod(); - void enableHighBrightFod(); - - bool hbmFodEnabled; - std::mutex mSetHbmFodMutex; - - sp biometrics_2_1_service; - sp mMotoFingerprint; -}; - -} // namespace implementation -} // namespace V2_3 -} // namespace fingerprint -} // namespace biometrics -} // namespace hardware -} // namespace android -#endif // ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.eqs.rc b/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.eqs.rc deleted file mode 100644 index 6697161..0000000 --- a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.eqs.rc +++ /dev/null @@ -1,11 +0,0 @@ -on init - chown system system /sys/devices/platform/soc/soc:qcom,dsi-display-primary/fod_hbm - -service fps_hal.eqs /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.3-service.eqs - # "class hal" causes a race condition on some devices due to files created - # in /data. As a workaround, postpone startup until later in boot once - # /data is mounted. - class late_start - user system - group system input uhid - writepid /dev/cpuset/system-background/tasks diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.eqs.xml b/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.eqs.xml deleted file mode 100644 index 529f598..0000000 --- a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.eqs.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - android.hardware.biometrics.fingerprint - hwbinder - 2.3 - - IBiometricsFingerprint - default - - - - vendor.egistec.hardware.fingerprint - hwbinder - 4.0 - - IBiometricsFingerprintRbs - default - - - diff --git a/fingerprint/service.cpp b/fingerprint/service.cpp deleted file mode 100644 index 34ff311..0000000 --- a/fingerprint/service.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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. - */ - -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.eqs" -#include -#include - -#include "BiometricsFingerprint.h" - -using android::hardware::configureRpcThreadpool; -using android::hardware::joinRpcThreadpool; - -using android::hardware::biometrics::fingerprint::V2_3::IBiometricsFingerprint; -using android::hardware::biometrics::fingerprint::V2_3::implementation::BiometricsFingerprint; - -using android::OK; -using android::status_t; - -int main() { - android::sp service = new BiometricsFingerprint(); - - configureRpcThreadpool(1, true); - - status_t status = service->registerAsService(); - if (status != OK) { - LOG(ERROR) << "Cannot register Biometrics 2.3 HAL service."; - return 1; - } - - LOG(INFO) << "Biometrics 2.3 HAL service ready."; - - joinRpcThreadpool(); - - LOG(ERROR) << "Biometrics 2.3 HAL service failed to join thread pool."; - return 1; -} diff --git a/lineage.dependencies b/lineage.dependencies index 83d5d5e..6a8ae29 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -1,6 +1,6 @@ [ { - "repository": "android_device_motorola_sm8475-common", - "target_path": "device/motorola/sm8475-common" + "repository": "android_device_motorola_sm8550-common", + "target_path": "device/motorola/sm8550-common" } ] diff --git a/lineage_eqs.mk b/lineage_rtwo.mk similarity index 73% rename from lineage_eqs.mk rename to lineage_rtwo.mk index 83e4461..24594e3 100644 --- a/lineage_eqs.mk +++ b/lineage_rtwo.mk @@ -18,22 +18,22 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) -# Inherit from eqs device -$(call inherit-product, device/motorola/eqs/device.mk) +# Inherit from rtwo device +$(call inherit-product, device/motorola/rtwo/device.mk) # Inherit some common Lineage stuff. $(call inherit-product, vendor/lineage/config/common_full_phone.mk) -PRODUCT_NAME := lineage_eqs -PRODUCT_DEVICE := eqs +PRODUCT_NAME := lineage_rtwo +PRODUCT_DEVICE := rtwo PRODUCT_MANUFACTURER := motorola PRODUCT_BRAND := motorola -PRODUCT_MODEL := motorola edge 30 ultra +PRODUCT_MODEL := motorola edge 40 pro PRODUCT_GMS_CLIENTID_BASE := android-motorola PRODUCT_BUILD_PROP_OVERRIDES += \ - TARGET_PRODUCT=eqs_ge \ - PRIVATE_BUILD_DESC="eqs_ge-user 12 S3SQS32.16-72-31-3 47c58c-b5d541 release-keys" + TARGET_PRODUCT=rtwo_ge \ + PRIVATE_BUILD_DESC="rtwo_ge-user 13 T1TR33.43-20-28 8fa75-44ae0 release-keys" -BUILD_FINGERPRINT := motorola/eqs_ge/msi:12/S3SQS32.16-72-31-3/47c58c-b5d541:user/release-keys +BUILD_FINGERPRINT := motorola/rtwo_ge/rtwo:13/T1TR33.43-20-28/8fa75-44ae0:user/release-keys diff --git a/manifest_eqs.xml b/manifest_rtwo.xml similarity index 100% rename from manifest_eqs.xml rename to manifest_rtwo.xml diff --git a/manifest_eqs_ese.xml b/manifest_rtwo_ese.xml similarity index 100% rename from manifest_eqs_ese.xml rename to manifest_rtwo_ese.xml diff --git a/media/media_profiles_cape.xml b/media/media_profiles_cape.xml deleted file mode 100644 index e29f379..0000000 --- a/media/media_profiles_cape.xml +++ /dev/null @@ -1,1931 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/media_profiles_vendor.xml b/media/media_profiles_kalama.xml similarity index 92% rename from media/media_profiles_vendor.xml rename to media/media_profiles_kalama.xml index 41f5b22..4ac16d6 100644 --- a/media/media_profiles_vendor.xml +++ b/media/media_profiles_kalama.xml @@ -507,6 +507,56 @@ channels="2" /> + + + + + + + + + + + + + + diff --git a/modules.blocklist b/modules.blocklist index 9e80a7f..6585c6d 100644 --- a/modules.blocklist +++ b/modules.blocklist @@ -1,68 +1,64 @@ # SPDX-License-Identifier: GPL-2.0-only # Copyright (c) 2020, The Linux Foundation. All rights reserved. blocklist 8250_of -blocklist dummy_hcd -blocklist llcc_perfmon -blocklist tda18250 -blocklist tda9887 -blocklist tuner-simple -blocklist mt2266 -blocklist tea5767 -blocklist xc5000 -blocklist mt2131 -blocklist qt1010 -blocklist tuner-types -blocklist tua9001 -blocklist m88rs6000t -blocklist tda18218 -blocklist mxl5007t -blocklist fc2580 -blocklist r820t -blocklist mc44s803 -blocklist fc0012 -blocklist si2157 -blocklist tda827x -blocklist tuner-xc2028 -blocklist mt2060 -blocklist qm1d1b0004 -blocklist qm1d1c0042 -blocklist tda18212 -blocklist fc0013 -blocklist msi001 -blocklist fc0011 -blocklist tda8290 -blocklist max2165 -blocklist xc4000 -blocklist it913x -blocklist mt20xx -blocklist mxl301rf -blocklist mt2063 -blocklist e4000 -blocklist tea5761 -blocklist tda18271 -blocklist mxl5005s -blocklist dummy-cpufreq -blocklist dummy_hcd -blocklist kheaders -blocklist atomic64_test -blocklist test_user_copy -blocklist lkdtm -blocklist net_failover blocklist adc-tm -blocklist rtc-test +blocklist atomic64_test blocklist can-bcm blocklist can-gw blocklist can-raw +blocklist dummy-cpufreq +blocklist dummy_hcd +blocklist dummy_hcd +blocklist e4000 blocklist failover +blocklist fc0011 +blocklist fc0012 +blocklist fc0013 +blocklist fc2580 +blocklist it913x +blocklist kheaders +blocklist lkdtm +blocklist llcc_perfmon +blocklist locktorture +blocklist m88rs6000t +blocklist max2165 +blocklist mc44s803 +blocklist mmrm_test_module +blocklist msi001 +blocklist mt2060 +blocklist mt2063 +blocklist mt20xx +blocklist mt2131 +blocklist mt2266 +blocklist mxl301rf +blocklist net_failover +blocklist qm1d1b0004 +blocklist qm1d1c0042 +blocklist qt1010 +blocklist r820t +blocklist rcutorture +blocklist rtc-test +blocklist si2157 +blocklist tda18212 +blocklist tda18218 +blocklist tda18250 +blocklist tda18271 +blocklist tda827x +blocklist tda8290 +blocklist tda9887 +blocklist tea5761 +blocklist tea5767 +blocklist test_user_copy +blocklist torture +blocklist tua9001 +blocklist tuner-simple +blocklist tuner-types +blocklist tuner-xc2028 blocklist vmw_vsock_virtio_transport blocklist vmw_vsock_virtio_transport_common -blocklist vsock_diag blocklist vsock -blocklist torture -blocklist locktorture -blocklist rcutorture -blocklist mmrm_test_module -blocklist q5drv_linux +blocklist vsock_diag +blocklist xc4000 +blocklist xc5000 blocklist limits_stat -blocklist fpc1020_mmi -blocklist goodix_fod_mmi +blocklist kunit diff --git a/modules.blocklist.vendor_boot b/modules.blocklist.vendor_boot index 9e80a7f..6585c6d 100644 --- a/modules.blocklist.vendor_boot +++ b/modules.blocklist.vendor_boot @@ -1,68 +1,64 @@ # SPDX-License-Identifier: GPL-2.0-only # Copyright (c) 2020, The Linux Foundation. All rights reserved. blocklist 8250_of -blocklist dummy_hcd -blocklist llcc_perfmon -blocklist tda18250 -blocklist tda9887 -blocklist tuner-simple -blocklist mt2266 -blocklist tea5767 -blocklist xc5000 -blocklist mt2131 -blocklist qt1010 -blocklist tuner-types -blocklist tua9001 -blocklist m88rs6000t -blocklist tda18218 -blocklist mxl5007t -blocklist fc2580 -blocklist r820t -blocklist mc44s803 -blocklist fc0012 -blocklist si2157 -blocklist tda827x -blocklist tuner-xc2028 -blocklist mt2060 -blocklist qm1d1b0004 -blocklist qm1d1c0042 -blocklist tda18212 -blocklist fc0013 -blocklist msi001 -blocklist fc0011 -blocklist tda8290 -blocklist max2165 -blocklist xc4000 -blocklist it913x -blocklist mt20xx -blocklist mxl301rf -blocklist mt2063 -blocklist e4000 -blocklist tea5761 -blocklist tda18271 -blocklist mxl5005s -blocklist dummy-cpufreq -blocklist dummy_hcd -blocklist kheaders -blocklist atomic64_test -blocklist test_user_copy -blocklist lkdtm -blocklist net_failover blocklist adc-tm -blocklist rtc-test +blocklist atomic64_test blocklist can-bcm blocklist can-gw blocklist can-raw +blocklist dummy-cpufreq +blocklist dummy_hcd +blocklist dummy_hcd +blocklist e4000 blocklist failover +blocklist fc0011 +blocklist fc0012 +blocklist fc0013 +blocklist fc2580 +blocklist it913x +blocklist kheaders +blocklist lkdtm +blocklist llcc_perfmon +blocklist locktorture +blocklist m88rs6000t +blocklist max2165 +blocklist mc44s803 +blocklist mmrm_test_module +blocklist msi001 +blocklist mt2060 +blocklist mt2063 +blocklist mt20xx +blocklist mt2131 +blocklist mt2266 +blocklist mxl301rf +blocklist net_failover +blocklist qm1d1b0004 +blocklist qm1d1c0042 +blocklist qt1010 +blocklist r820t +blocklist rcutorture +blocklist rtc-test +blocklist si2157 +blocklist tda18212 +blocklist tda18218 +blocklist tda18250 +blocklist tda18271 +blocklist tda827x +blocklist tda8290 +blocklist tda9887 +blocklist tea5761 +blocklist tea5767 +blocklist test_user_copy +blocklist torture +blocklist tua9001 +blocklist tuner-simple +blocklist tuner-types +blocklist tuner-xc2028 blocklist vmw_vsock_virtio_transport blocklist vmw_vsock_virtio_transport_common -blocklist vsock_diag blocklist vsock -blocklist torture -blocklist locktorture -blocklist rcutorture -blocklist mmrm_test_module -blocklist q5drv_linux +blocklist vsock_diag +blocklist xc4000 +blocklist xc5000 blocklist limits_stat -blocklist fpc1020_mmi -blocklist goodix_fod_mmi +blocklist kunit diff --git a/modules.load b/modules.load index 5132e3a..4d779cd 100644 --- a/modules.load +++ b/modules.load @@ -1,173 +1,133 @@ msm_sysstats.ko -zsmalloc.ko -lzo.ko -lzo-rle.ko +kunit.ko msm_show_resume_irq.ko -mhi_cntrl_qcom.ko mhi.ko +mhi_cntrl_qcom.ko mhi_dev_uci.ko mhi_dev_netdev.ko mhi_dev_dtr.ko -phy-qcom-ufs-qmp-v4-lahaina.ko -phy-qcom-ufs-qmp-v4-parrot.ko -phy-qcom-ufs-qmp-v3.ko -phy-qcom-ufs-qmp-14nm.ko +mhi_dev_satellite.ko +phy-qcom-ufs-qmp-v4-waipio.ko +phy-qcom-ufs-qmp-v4.ko +phy-qcom-ufs-qmp-v4-khaje.ko pinctrl-spmi-gpio.ko pinctrl-spmi-mpp.ko pwm-qti-lpg.ko pci-msm-drv.ko -camcc-waipio.ko -camcc-diwali.ko -debugcc-diwali.ko -videocc-waipio.ko -gpucc-waipio.ko -debugcc-waipio.ko -gpucc-diwali.ko -videocc-diwali.ko +debugcc-kalama.ko +gpucc-kalama.ko bam_dma.ko -gpi.ko -pci-edma.ko +msm_gpi.ko qcom_cpuss_sleep_stats.ko -mdt_loader.ko -cdsp-loader.ko -qcom_ramdump.ko pdr_interface.ko qmi_helpers.ko heap_mem_ext_v01.ko msm_memshare.ko -boot_stats.ko smp2p.ko -subsystem_sleep_stats.ko -adsp_sleepmon.ko -sysmon_subsystem_stats.ko -qsee_ipc_irq_bridge.ko -core_hang_detect.ko -soc_sleep_stats.ko -rq_stats.ko -dcc_v2.ko -smcinvoke_mod.ko -microdump_collector.ko -llcc_perfmon.ko smp2p_sleepstate.ko -sensors_ssc.ko -glink_pkt.ko +qsee_ipc_irq_bridge.ko glink_probe.ko +glink_pkt.ko pmic_glink.ko qti_battery_debug.ko charger-ulog-glink.ko altmode-glink.ko -pmic-pon-log.ko -spss_utils.ko -msm_performance.ko -qpnp-pbs.ko -spcom.ko +soc_sleep_stats.ko cdsprm.ko +sysmon_subsystem_stats.ko +subsystem_sleep_stats.ko +adsp_sleepmon.ko +eud.ko +microdump_collector.ko +llcc_perfmon.ko +cdsp-loader.ko +pmic-pon-log.ko +boot_stats.ko +rq_stats.ko +core_hang_detect.ko +usb_bam.ko +memlat.ko +memlat_scmi.ko +rimps_log.ko +qcom_ramdump.ko +panel_event_notifier.ko +dmesg_dumper.ko +sys_pm_vx.ko +qdss_bridge.ko fsa4480-i2c.ko msm_show_epoch.ko -eud.ko -guestvm_loader.ko -hyp_core_ctl.ko +gh_tlmm_vm_mem_access.ko +sps_drv.ko +spss_utils.ko +spcom.ko +msm_performance.ko +qcom_va_minidump.ko qbt_handler.ko -qcom_soc_wdt.ko -sys_pm_vx.ko -msm_ext_display.ko -icnss2.ko -rimps_log.ko -plh_scmi.ko -gplaf_scmi.ko -qdss_bridge.ko -memlat.ko -qcom_logbuf_vendor_hooks.ko -panel_event_notifier.ko -qcom_sync_file.ko hung_task_enh.ko -qfprom-sys.ko -qcom_pm8008-regulator.ko -qpnp-amoled-regulator.ko +qti-fixed-regulator.ko +qti-ocp-notifier.ko hvc_gunyah.ko -msm_rng.ko +msm_geni_serial.ko frpc-adsprpc.ko rdbg.ko qcom_iommu_debug.ko lt9611uxc.ko -msm_kgsl.ko -zram.ko -hdcp_qseecom.ko -qseecom-mod.ko -qcom-i2c-pmic.ko -nfc_i2c.ko +qseecom_proxy.ko sg.ko spi-msm-geni.ko spmi-pmic-arb-debug.ko spmi-glink-debug.ko -cnss2.ko -cnss_utils.ko -wlan_firmware_service.ko -cnss_plat_ipc_qmi_svc.ko -cnss_nl.ko -cnss_prealloc.ko -asix.ko -ax88179_178a.ko msm_sharedmem.ko +phy-generic.ko phy-qcom-emu.ko phy-msm-ssusb-qmp.ko -phy-msm-snps-hs.ko phy-msm-snps-eusb2.ko +phy-msm-m31-eusb2.ko dwc3-msm.ko ehset.ko -lvstest.ko -ssusb-redriver-ps5169.ko -usb_f_diag.ko -usb_f_qdss.ko -usb_f_ccid.ko -usb_f_cdev.ko -usb_f_gsi.ko f_fs_ipc_log.ko +usb_f_cdev.ko +usb_f_ccid.ko +usb_f_qdss.ko +usb_f_gsi.ko +usb_f_diag.ko ucsi_glink.ko +usbmon.ko repeater.ko +repeater-qti-pmic-eusb2.ko repeater-i2c-eusb2.ko +redriver.ko +nb7vpq904m.ko +ps5169.ko pm8941-pwrkey.ko qcom-hv-haptics.ko i2c-msm-geni.ko -i2c-dev.ko i3c-master-msm-geni.ko qcom_ipc_lite.ko synx-driver.ko qcom-pon.ko +reboot-mode.ko qti_battery_charger.ko qcom-spmi-temp-alarm.ko -qti-adc-tm.ko -qti_qmi_sensor_v2.ko -qti_qmi_cdev.ko bcl_soc.ko -msm_lmh_dcvs.ko cpu_voltage_cooling.ko -policy_engine.ko -sdpm_clk.ko ddr_cdev.ko -qti_userspace_cdev.ko +max31760_fan.ko +msm_lmh_dcvs.ko +policy_engine.ko +qti_qmi_cdev.ko +qti_qmi_sensor_v2.ko qti_cpufreq_cdev.ko qti_devfreq_cdev.ko -btpower.ko -bt_fm_slim.ko +qti_userspace_cdev.ko +sdpm_clk.ko qcom_edac.ko qcom-cpufreq-hw-debug.ko qcom_lpm.ko -sdhci-msm.ko leds-qti-flash.ko leds-qti-tri-led.ko -leds-qpnp-vibrator-ldo.ko -plh_vendor.ko -gplaf_vendor.ko -tz_log.ko -qce50.ko -qcedev-mod.ko +memlat_vendor.ko ipa_fmwk.ko -usb_bam.ko -sps_drv.ko -ep_pcie_drv.ko -mhi_dev_drv.ko -mhi_dev_net.ko qcom_pil_info.ko rproc_qcom_common.ko qcom_q6v5.ko @@ -181,16 +141,12 @@ qcom_glink_spss.ko qcom_smd.ko gh_irq_lend.ko gh_mem_notifier.ko -gh_virtio_backend.ko -qcom-spmi-adc5.ko +qcom-spmi-adc5-gen3.ko qcom-vadc-common.ko nvmem_qfprom.ko icc-test.ko -qnoc-parrot.ko slimbus.ko slim-qcom-ngd-ctrl.ko -hwmon.ko -qti_amoled_ecm.ko coresight.ko coresight-tmc.ko coresight-funnel.ko @@ -210,10 +166,21 @@ stm_p_ost.ko stm_console.ko stm_ftrace.ko snd-usb-audio-qmi.ko +snd-soc-hdmi-codec.ko +cfg80211.ko +mac80211.ko qrtr-smd.ko qrtr-mhi.ko qrtr-gunyah.ko -wlan.ko +qca_cld3_kiwi.ko +qca_cld3_kiwi_v2.ko +qca_cld3_qca6490.ko +cnss2.ko +cnss_plat_ipc_qmi_svc.ko +wlan_firmware_service.ko +cnss_nl.ko +cnss_prealloc.ko +cnss_utils.ko q6_notifier_dlkm.ko spf_core_dlkm.ko audpkt_ion_dlkm.ko @@ -229,23 +196,134 @@ swr_ctrl_dlkm.ko snd_event_dlkm.ko wcd_core_dlkm.ko mbhc_dlkm.ko -swr_dmic_dlkm.ko wcd9xxx_dlkm.ko -swr_haptics_dlkm.ko stub_dlkm.ko machine_dlkm.ko +swr_dmic_dlkm.ko +swr_haptics_dlkm.ko +hdmi_dlkm.ko lpass_cdc_wsa2_macro_dlkm.ko lpass_cdc_wsa_macro_dlkm.ko lpass_cdc_va_macro_dlkm.ko lpass_cdc_rx_macro_dlkm.ko lpass_cdc_tx_macro_dlkm.ko lpass_cdc_dlkm.ko +wsa884x_dlkm.ko wsa883x_dlkm.ko wcd938x_dlkm.ko wcd938x_slave_dlkm.ko -wcd937x_dlkm.ko -wcd937x_slave_dlkm.ko +q6_notifier_dlkm.ko +spf_core_dlkm.ko +audpkt_ion_dlkm.ko +gpr_dlkm.ko +audio_pkt_dlkm.ko +q6_dlkm.ko +adsp_loader_dlkm.ko +audio_prm_dlkm.ko +q6_pdr_dlkm.ko +pinctrl_lpi_dlkm.ko +swr_dlkm.ko +swr_ctrl_dlkm.ko +snd_event_dlkm.ko +wcd_core_dlkm.ko +mbhc_dlkm.ko +wcd9xxx_dlkm.ko +stub_dlkm.ko +machine_dlkm.ko +swr_dmic_dlkm.ko +swr_haptics_dlkm.ko hdmi_dlkm.ko +lpass_cdc_wsa2_macro_dlkm.ko +lpass_cdc_wsa_macro_dlkm.ko +lpass_cdc_va_macro_dlkm.ko +lpass_cdc_rx_macro_dlkm.ko +lpass_cdc_tx_macro_dlkm.ko +lpass_cdc_dlkm.ko +wsa884x_dlkm.ko +wsa883x_dlkm.ko +wcd938x_dlkm.ko +wcd938x_slave_dlkm.ko +tz_log_dlkm.ko +qcedev-mod_dlkm.ko +qcrypto-msm_dlkm.ko +qce50_dlkm.ko +hdcp_qseecom_dlkm.ko +qrng_dlkm.ko +smcinvoke_dlkm.ko +qca_cld3_kiwi.ko +qca_cld3_kiwi_v2.ko +qca_cld3_qca6490.ko +cnss2.ko +cnss_plat_ipc_qmi_svc.ko +wlan_firmware_service.ko +cnss_nl.ko +cnss_prealloc.ko +cnss_utils.ko +q6_notifier_dlkm.ko +spf_core_dlkm.ko +audpkt_ion_dlkm.ko +gpr_dlkm.ko +audio_pkt_dlkm.ko +q6_dlkm.ko +adsp_loader_dlkm.ko +audio_prm_dlkm.ko +q6_pdr_dlkm.ko +pinctrl_lpi_dlkm.ko +swr_dlkm.ko +swr_ctrl_dlkm.ko +snd_event_dlkm.ko +wcd_core_dlkm.ko +mbhc_dlkm.ko +wcd9xxx_dlkm.ko +stub_dlkm.ko +machine_dlkm.ko +swr_dmic_dlkm.ko +swr_haptics_dlkm.ko +hdmi_dlkm.ko +lpass_cdc_wsa2_macro_dlkm.ko +lpass_cdc_wsa_macro_dlkm.ko +lpass_cdc_va_macro_dlkm.ko +lpass_cdc_rx_macro_dlkm.ko +lpass_cdc_tx_macro_dlkm.ko +lpass_cdc_dlkm.ko +wsa884x_dlkm.ko +wsa883x_dlkm.ko +wcd938x_dlkm.ko +wcd938x_slave_dlkm.ko +q6_notifier_dlkm.ko +spf_core_dlkm.ko +audpkt_ion_dlkm.ko +gpr_dlkm.ko +audio_pkt_dlkm.ko +q6_dlkm.ko +adsp_loader_dlkm.ko +audio_prm_dlkm.ko +q6_pdr_dlkm.ko +pinctrl_lpi_dlkm.ko +swr_dlkm.ko +swr_ctrl_dlkm.ko +snd_event_dlkm.ko +wcd_core_dlkm.ko +mbhc_dlkm.ko +wcd9xxx_dlkm.ko +stub_dlkm.ko +machine_dlkm.ko +swr_dmic_dlkm.ko +swr_haptics_dlkm.ko +hdmi_dlkm.ko +lpass_cdc_wsa2_macro_dlkm.ko +lpass_cdc_wsa_macro_dlkm.ko +lpass_cdc_va_macro_dlkm.ko +lpass_cdc_rx_macro_dlkm.ko +lpass_cdc_tx_macro_dlkm.ko +lpass_cdc_dlkm.ko +wsa884x_dlkm.ko +wsa883x_dlkm.ko +wcd938x_dlkm.ko +wcd938x_slave_dlkm.ko +btpower.ko +bt_fm_slim.ko +radio-i2c-rtc6226-qca.ko camera.ko gsim.ko ipam.ko @@ -258,29 +336,42 @@ rmnet_offload.ko rmnet_perf_tether.ko rmnet_perf.ko rmnet_shs.ko -rmnet_wlan.ko rmnet_aps.ko rmnet_sch.ko +rmnet_wlan.ko msm_drm.ko msm-eva.ko +msm_ext_display.ko +sync_fence.ko +msm_hw_fence.ko msm-mmrm.ko +mmrm_test_module.ko +nxp-nci.ko +tz_log_dlkm.ko +qcedev-mod_dlkm.ko +qcrypto-msm_dlkm.ko +qce50_dlkm.ko +hdcp_qseecom_dlkm.ko +qrng_dlkm.ko +smcinvoke_dlkm.ko msm_video.ko utags.ko mmi_annotate.ko mmi_info.ko moto_f_usbnet.ko bm_adsp_ulog.ko +watchdogtest.ko +wakeup_sources.ko mmi_charger.ko -moto_f_mass_storage.ko -rbs_fod_mmi.ko -st21nfc.ko -st54spi.ko mmi_relay.ko -sensors_class.ko -sx937x_multi.ko +qti_glink_charger.ko +mmi_lpd_mitigate.ko touchscreen_mmi.ko goodix_brl_mmi.ko -qti_glink_charger.ko +sensors_class.ko +sx937x_multi.ko wl2868c.ko -mmi_sys_temp.ko +goodix_fod_mmi.ko qpnp_adaptive_charge.ko +mmi_sys_temp.ko +msm_kgsl.ko diff --git a/modules.load.recovery b/modules.load.recovery index d95017f..578b948 100644 --- a/modules.load.recovery +++ b/modules.load.recovery @@ -1,12 +1,14 @@ -gh_virt_wdt.ko qcom_wdt_core.ko +gh_virt_wdt.ko qcom_cpu_vendor_hooks.ko clk-rpmh.ko -gcc-waipio.ko +gcc-kalama.ko icc-rpmh.ko +camcc-kalama.ko qcom_ipcc.ko qcom_ipc_logging.ko qcom-pdc.ko +thermal_minidump.ko qcom_tsens.ko rpmh-regulator.ko bwmon.ko @@ -14,58 +16,52 @@ qcom-cpufreq-hw.ko sched-walt.ko thermal_pause.ko cpu_hotplug.ko -cfg80211.ko clk-dummy.ko clk-qcom.ko cmd-db.ko cqhci.ko crypto-qti-common.ko crypto-qti-hwkm.ko +dcc_v2.ko dcvs_fp.ko debug-regulator.ko -dispcc-diwali.ko -dispcc-waipio.ko -gcc-diwali.ko +dispcc-kalama.ko +tcsrcc-kalama.ko +videocc-kalama.ko gdsc-regulator.ko gh_arm_drv.ko gh_ctrl.ko gh_dbl.ko gh_msgq.ko gh_rm_drv.ko -gh_virt_wdt.ko +gunyah.ko +mdt_loader.ko hwkm.ko icc-bcm-voter.ko icc-debug.ko iommu-logger.ko -kryo_arm64_edac.ko llcc-qcom.ko -mac80211.ko -mem_buf_dev.ko -mem_buf.ko mem-hooks.ko +mem_buf_dev.ko +mem_buf_msgq.ko +mem_buf.ko memory_dump_v2.ko minidump.ko msm_dma_iommu_mapping.ko -pinctrl-waipio.ko -qnoc-waipio.ko -qti-fixed-regulator.ko -reboot-mode.ko -msm_geni_serial.ko +pinctrl-kalama.ko +qnoc-kalama.ko +ns.ko nvmem_qcom-spmi-sdam.ko -phy-generic.ko phy-qcom-ufs.ko -phy-qcom-ufs-qmp-v4-waipio.ko -phy-qcom-ufs-qmp-v4-diwali.ko -phy-qcom-ufs-qmp-v4-cape.ko -pinctrl-cape.ko -pinctrl-diwali.ko +phy-qcom-ufs-qmp-v4-kalama.ko +phy-qcom-ufs-qrbtc-sdm845.ko pinctrl-msm.ko proxy-consumer.ko qcom-dcvs.ko qcom-dload-mode.ko qcom_dma_heaps.ko -qcom_gic_intr_routing.ko qcom_hwspinlock.ko +qcom_logbuf_vh.ko qcom_iommu_util.ko qcom_llcc_pmu.ko qcom-pmu-lib.ko @@ -76,8 +72,6 @@ spmi-pmic-arb.ko qcom-reboot-reason.ko qcom_rpmh.ko qcom-scm.ko -qcom_wdt_core.ko -qnoc-diwali.ko qnoc-qos.ko qrtr.ko qti-regmap-debugfs.ko @@ -87,187 +81,149 @@ secure_buffer.ko smem.ko socinfo.ko stub-regulator.ko -tmecom-intf.ko -ufshcd-crypto-qti.ko -ufs_qcom.ko -arm_smmu.ko -msm-geni-se.ko qcom_aoss.ko msm_qmp.ko +tmecom-intf.ko +ufs_qcom.ko +ufshcd-crypto-qti.ko +arm_smmu.ko +sdhci-msm.ko qcom_rimps.ko c1dcvs_vendor.ko c1dcvs_scmi.ko bcl_pmic5.ko +nvme-core.ko +nvme.ko msm_sysstats.ko -zsmalloc.ko -lzo.ko -lzo-rle.ko +kunit.ko msm_show_resume_irq.ko -mhi_cntrl_qcom.ko mhi.ko +mhi_cntrl_qcom.ko mhi_dev_uci.ko mhi_dev_netdev.ko mhi_dev_dtr.ko -phy-qcom-ufs-qmp-v4-lahaina.ko -phy-qcom-ufs-qmp-v4-parrot.ko -phy-qcom-ufs-qmp-v3.ko -phy-qcom-ufs-qmp-14nm.ko +mhi_dev_satellite.ko +phy-qcom-ufs-qmp-v4-waipio.ko +phy-qcom-ufs-qmp-v4.ko +phy-qcom-ufs-qmp-v4-khaje.ko pinctrl-spmi-gpio.ko pinctrl-spmi-mpp.ko pwm-qti-lpg.ko pci-msm-drv.ko -camcc-waipio.ko -camcc-diwali.ko -debugcc-diwali.ko -videocc-waipio.ko -gpucc-waipio.ko -debugcc-waipio.ko -gpucc-diwali.ko -videocc-diwali.ko +debugcc-kalama.ko +gpucc-kalama.ko bam_dma.ko -gpi.ko -pci-edma.ko +msm_gpi.ko qcom_cpuss_sleep_stats.ko -mdt_loader.ko -cdsp-loader.ko -qcom_ramdump.ko pdr_interface.ko qmi_helpers.ko heap_mem_ext_v01.ko msm_memshare.ko -boot_stats.ko smp2p.ko -subsystem_sleep_stats.ko -adsp_sleepmon.ko -sysmon_subsystem_stats.ko -qsee_ipc_irq_bridge.ko -core_hang_detect.ko -soc_sleep_stats.ko -rq_stats.ko -dcc_v2.ko -smcinvoke_mod.ko -microdump_collector.ko -llcc_perfmon.ko smp2p_sleepstate.ko -sensors_ssc.ko -glink_pkt.ko +qsee_ipc_irq_bridge.ko glink_probe.ko +glink_pkt.ko pmic_glink.ko qti_battery_debug.ko charger-ulog-glink.ko altmode-glink.ko -pmic-pon-log.ko -spss_utils.ko -msm_performance.ko -qpnp-pbs.ko -spcom.ko +soc_sleep_stats.ko cdsprm.ko +sysmon_subsystem_stats.ko +subsystem_sleep_stats.ko +adsp_sleepmon.ko +eud.ko +microdump_collector.ko +llcc_perfmon.ko +cdsp-loader.ko +pmic-pon-log.ko +boot_stats.ko +rq_stats.ko +core_hang_detect.ko +usb_bam.ko +memlat.ko +memlat_scmi.ko +rimps_log.ko +qcom_ramdump.ko +panel_event_notifier.ko +dmesg_dumper.ko +sys_pm_vx.ko +qdss_bridge.ko fsa4480-i2c.ko msm_show_epoch.ko -eud.ko -guestvm_loader.ko -hyp_core_ctl.ko +gh_tlmm_vm_mem_access.ko +sps_drv.ko +spss_utils.ko +spcom.ko +msm_performance.ko +qcom_va_minidump.ko qbt_handler.ko -qcom_soc_wdt.ko -sys_pm_vx.ko -msm_ext_display.ko -icnss2.ko -rimps_log.ko -plh_scmi.ko -gplaf_scmi.ko -qdss_bridge.ko -memlat.ko -qcom_logbuf_vendor_hooks.ko -panel_event_notifier.ko -qcom_sync_file.ko hung_task_enh.ko -qfprom-sys.ko -qcom_pm8008-regulator.ko -qpnp-amoled-regulator.ko +qti-fixed-regulator.ko +qti-ocp-notifier.ko hvc_gunyah.ko -msm_rng.ko +msm_geni_serial.ko frpc-adsprpc.ko rdbg.ko qcom_iommu_debug.ko lt9611uxc.ko -msm_kgsl.ko -zram.ko -hdcp_qseecom.ko -qseecom-mod.ko -qcom-i2c-pmic.ko -nfc_i2c.ko +qseecom_proxy.ko sg.ko spi-msm-geni.ko spmi-pmic-arb-debug.ko spmi-glink-debug.ko -cnss2.ko -cnss_utils.ko -wlan_firmware_service.ko -cnss_plat_ipc_qmi_svc.ko -cnss_nl.ko -cnss_prealloc.ko -asix.ko -ax88179_178a.ko msm_sharedmem.ko +phy-generic.ko phy-qcom-emu.ko phy-msm-ssusb-qmp.ko -phy-msm-snps-hs.ko phy-msm-snps-eusb2.ko +phy-msm-m31-eusb2.ko dwc3-msm.ko ehset.ko -lvstest.ko -ssusb-redriver-ps5169.ko -usb_f_diag.ko -usb_f_qdss.ko -usb_f_ccid.ko -usb_f_cdev.ko -usb_f_gsi.ko f_fs_ipc_log.ko +usb_f_cdev.ko +usb_f_ccid.ko +usb_f_qdss.ko +usb_f_gsi.ko +usb_f_diag.ko ucsi_glink.ko +usbmon.ko repeater.ko +repeater-qti-pmic-eusb2.ko repeater-i2c-eusb2.ko +redriver.ko +nb7vpq904m.ko +ps5169.ko pm8941-pwrkey.ko qcom-hv-haptics.ko i2c-msm-geni.ko -i2c-dev.ko i3c-master-msm-geni.ko qcom_ipc_lite.ko synx-driver.ko qcom-pon.ko +reboot-mode.ko qti_battery_charger.ko qcom-spmi-temp-alarm.ko -qti-adc-tm.ko -qti_qmi_sensor_v2.ko -qti_qmi_cdev.ko bcl_soc.ko -msm_lmh_dcvs.ko cpu_voltage_cooling.ko -policy_engine.ko -sdpm_clk.ko ddr_cdev.ko -qti_userspace_cdev.ko +max31760_fan.ko +msm_lmh_dcvs.ko +policy_engine.ko +qti_qmi_cdev.ko +qti_qmi_sensor_v2.ko qti_cpufreq_cdev.ko qti_devfreq_cdev.ko -btpower.ko -bt_fm_slim.ko +qti_userspace_cdev.ko +sdpm_clk.ko qcom_edac.ko qcom-cpufreq-hw-debug.ko qcom_lpm.ko -sdhci-msm.ko leds-qti-flash.ko leds-qti-tri-led.ko -leds-qpnp-vibrator-ldo.ko -plh_vendor.ko -gplaf_vendor.ko -tz_log.ko -qce50.ko -qcedev-mod.ko +memlat_vendor.ko ipa_fmwk.ko -usb_bam.ko -sps_drv.ko -ep_pcie_drv.ko -mhi_dev_drv.ko -mhi_dev_net.ko qcom_pil_info.ko rproc_qcom_common.ko qcom_q6v5.ko @@ -281,16 +237,12 @@ qcom_glink_spss.ko qcom_smd.ko gh_irq_lend.ko gh_mem_notifier.ko -gh_virtio_backend.ko -qcom-spmi-adc5.ko +qcom-spmi-adc5-gen3.ko qcom-vadc-common.ko nvmem_qfprom.ko icc-test.ko -qnoc-parrot.ko slimbus.ko slim-qcom-ngd-ctrl.ko -hwmon.ko -qti_amoled_ecm.ko coresight.ko coresight-tmc.ko coresight-funnel.ko @@ -310,11 +262,21 @@ stm_p_ost.ko stm_console.ko stm_ftrace.ko snd-usb-audio-qmi.ko +snd-soc-hdmi-codec.ko +cfg80211.ko +mac80211.ko qrtr-smd.ko qrtr-mhi.ko qrtr-gunyah.ko +hdcp_qseecom_dlkm.ko +smcinvoke_dlkm.ko msm_drm.ko +msm_ext_display.ko +sync_fence.ko +msm_hw_fence.ko msm-mmrm.ko +hdcp_qseecom_dlkm.ko +smcinvoke_dlkm.ko goodix_brl_mmi.ko mmi_annotate.ko mmi_info.ko diff --git a/modules.load.system_dlkm b/modules.load.system_dlkm new file mode 100644 index 0000000..6fbb46e --- /dev/null +++ b/modules.load.system_dlkm @@ -0,0 +1,2 @@ +kernel/mm/zsmalloc.ko +kernel/drivers/block/zram/zram.ko diff --git a/modules.load.vendor_boot b/modules.load.vendor_boot index d836897..d3d7e73 100644 --- a/modules.load.vendor_boot +++ b/modules.load.vendor_boot @@ -1,12 +1,14 @@ -gh_virt_wdt.ko qcom_wdt_core.ko +gh_virt_wdt.ko qcom_cpu_vendor_hooks.ko clk-rpmh.ko -gcc-waipio.ko +gcc-kalama.ko icc-rpmh.ko +camcc-kalama.ko qcom_ipcc.ko qcom_ipc_logging.ko qcom-pdc.ko +thermal_minidump.ko qcom_tsens.ko rpmh-regulator.ko bwmon.ko @@ -14,58 +16,52 @@ qcom-cpufreq-hw.ko sched-walt.ko thermal_pause.ko cpu_hotplug.ko -cfg80211.ko clk-dummy.ko clk-qcom.ko cmd-db.ko cqhci.ko crypto-qti-common.ko crypto-qti-hwkm.ko +dcc_v2.ko dcvs_fp.ko debug-regulator.ko -dispcc-diwali.ko -dispcc-waipio.ko -gcc-diwali.ko +dispcc-kalama.ko +tcsrcc-kalama.ko +videocc-kalama.ko gdsc-regulator.ko gh_arm_drv.ko gh_ctrl.ko gh_dbl.ko gh_msgq.ko gh_rm_drv.ko -gh_virt_wdt.ko +gunyah.ko +mdt_loader.ko hwkm.ko icc-bcm-voter.ko icc-debug.ko iommu-logger.ko -kryo_arm64_edac.ko llcc-qcom.ko -mac80211.ko -mem_buf_dev.ko -mem_buf.ko mem-hooks.ko +mem_buf_dev.ko +mem_buf_msgq.ko +mem_buf.ko memory_dump_v2.ko minidump.ko msm_dma_iommu_mapping.ko -pinctrl-waipio.ko -qnoc-waipio.ko -qti-fixed-regulator.ko -reboot-mode.ko -msm_geni_serial.ko +pinctrl-kalama.ko +qnoc-kalama.ko +ns.ko nvmem_qcom-spmi-sdam.ko -phy-generic.ko phy-qcom-ufs.ko -phy-qcom-ufs-qmp-v4-waipio.ko -phy-qcom-ufs-qmp-v4-diwali.ko -phy-qcom-ufs-qmp-v4-cape.ko -pinctrl-cape.ko -pinctrl-diwali.ko +phy-qcom-ufs-qmp-v4-kalama.ko +phy-qcom-ufs-qrbtc-sdm845.ko pinctrl-msm.ko proxy-consumer.ko qcom-dcvs.ko qcom-dload-mode.ko qcom_dma_heaps.ko -qcom_gic_intr_routing.ko qcom_hwspinlock.ko +qcom_logbuf_vh.ko qcom_iommu_util.ko qcom_llcc_pmu.ko qcom-pmu-lib.ko @@ -76,8 +72,6 @@ spmi-pmic-arb.ko qcom-reboot-reason.ko qcom_rpmh.ko qcom-scm.ko -qcom_wdt_core.ko -qnoc-diwali.ko qnoc-qos.ko qrtr.ko qti-regmap-debugfs.ko @@ -87,14 +81,16 @@ secure_buffer.ko smem.ko socinfo.ko stub-regulator.ko -tmecom-intf.ko -ufshcd-crypto-qti.ko -ufs_qcom.ko -arm_smmu.ko -msm-geni-se.ko qcom_aoss.ko msm_qmp.ko +tmecom-intf.ko +ufs_qcom.ko +ufshcd-crypto-qti.ko +arm_smmu.ko +sdhci-msm.ko qcom_rimps.ko c1dcvs_vendor.ko c1dcvs_scmi.ko bcl_pmic5.ko +nvme-core.ko +nvme.ko diff --git a/powershare/Android.bp b/powershare/Android.bp index b9241b2..8c4f47e 100644 --- a/powershare/Android.bp +++ b/powershare/Android.bp @@ -1,8 +1,8 @@ cc_binary { - name: "vendor.lineage.powershare@1.0-service.eqs", + name: "vendor.lineage.powershare@1.0-service.rtwo", defaults: ["hidl_defaults"], - init_rc: ["vendor.lineage.powershare@1.0-service.eqs.rc"], - vintf_fragments: ["vendor.lineage.powershare@1.0-service.eqs.xml"], + init_rc: ["vendor.lineage.powershare@1.0-service.rtwo.rc"], + vintf_fragments: ["vendor.lineage.powershare@1.0-service.rtwo.xml"], vendor: true, relative_install_path: "hw", srcs: [ diff --git a/powershare/PowerShare.cpp b/powershare/PowerShare.cpp index 6b6efdf..4ab9553 100644 --- a/powershare/PowerShare.cpp +++ b/powershare/PowerShare.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "vendor.lineage.powershare@1.0-service.eqs" +#define LOG_TAG "vendor.lineage.powershare@1.0-service.rtwo" #include "PowerShare.h" diff --git a/powershare/service.cpp b/powershare/service.cpp index 01e420a..d353f7d 100644 --- a/powershare/service.cpp +++ b/powershare/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "vendor.lineage.powershare@1.0-service.eqs" +#define LOG_TAG "vendor.lineage.powershare@1.0-service.rtwo" #include #include diff --git a/powershare/vendor.lineage.powershare@1.0-service.eqs.rc b/powershare/vendor.lineage.powershare@1.0-service.rtwo.rc similarity index 79% rename from powershare/vendor.lineage.powershare@1.0-service.eqs.rc rename to powershare/vendor.lineage.powershare@1.0-service.rtwo.rc index 3b1e76e..55f91c8 100644 --- a/powershare/vendor.lineage.powershare@1.0-service.eqs.rc +++ b/powershare/vendor.lineage.powershare@1.0-service.rtwo.rc @@ -1,4 +1,4 @@ -service vendor.powershare-hal-1-0 /vendor/bin/hw/vendor.lineage.powershare@1.0-service.eqs +service vendor.powershare-hal-1-0 /vendor/bin/hw/vendor.lineage.powershare@1.0-service.rtwo class hal user system group system diff --git a/powershare/vendor.lineage.powershare@1.0-service.eqs.xml b/powershare/vendor.lineage.powershare@1.0-service.rtwo.xml similarity index 100% rename from powershare/vendor.lineage.powershare@1.0-service.eqs.xml rename to powershare/vendor.lineage.powershare@1.0-service.rtwo.xml diff --git a/product.prop b/product.prop deleted file mode 100644 index 3af0545..0000000 --- a/product.prop +++ /dev/null @@ -1,2 +0,0 @@ -# Moto -ro.vendor.product.display=motorola edge 30 ultra diff --git a/proprietary-files.txt b/proprietary-files.txt index cd0d2d1..abebd3d 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,47 +1,55 @@ -# All unpinned blobs below are extracted from 12-S3SQS32.16-72-31-3 47c58c-b5d541 release-keys. +# All unpinned blobs below are extracted from 13-T1TR33.43-20-28 8fa75-44ae0 release-keys. # ACDB Data -vendor/etc/acdbdata/waipio_mtp/MTP_acdb_cal.acdb -vendor/etc/acdbdata/waipio_mtp/MTP_workspaceFile.qwsp - -# ADSP Modules -vendor/lib/rfsa/adsp/libSnpeHtpV68Skel.so -vendor/lib/rfsa/adsp/libSnpeHtpV69Skel.so -vendor/lib/rfsa/adsp/libVppFrcQnnHtp.so -vendor/lib/rfsa/adsp/libVppQnnHtp.so -vendor/lib/rfsa/adsp/libcalculator_skel.so -vendor/lib/rfsa/adsp/libmobilenet_dsp_frc.so -vendor/lib/rfsa/adsp/libmobilenet_dsp_frc_networks.so -vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so -vendor/lib/rfsa/adsp/libsnpe_dsp_v65_domains_v2_skel.so -vendor/lib/rfsa/adsp/libsnpe_dsp_v66_domains_v2_skel.so -vendor/lib/rfsa/adsp/libvpp_ais_networks.so -vendor/lib/rfsa/adsp/libvpp_vqa_networks.so -vendor/lib/rfsa/adsp/libvpt_action_recognition.so +vendor/etc/acdbdata/ffv_models/ffv__5.0.1_0.1__3.0.0_0.0__eai_2.10_enpu3.pmd +vendor/etc/acdbdata/ffv_models/ffv__5.0.1_0.1__eai_2.10_enpu3.pmd +vendor/etc/acdbdata/kalama_mtp/MTP_acdb_cal.acdb +vendor/etc/acdbdata/kalama_mtp/MTP_workspaceFileXml.qwsp +vendor/etc/acdbdata/nn_ns_models/fai__2.0.0_0.1__3.0.0_0.0__3.1.0_0.0__3.2.0_0.0__eai_2.7_enpu3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.0.0_0.1__3.0.0_0.0__eai_1.36_enpu2.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.3.0_0.1__3.0.0_0.0__eai_1.10.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.3.0_0.1__3.0.0_0.0__eai_1.36_enpu2_comp.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.6.3_0.0__3.0.0_0.0__3.1.1.0_0.0__3.2.0_0.0__eai_2.7_enpu_v3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.6.3_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.1__eai_2.10_enpuv3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.6.5_0.0__3.0.0_0.0__3.1.0_0.0__3.2.0_0.0__eai_2.10_enpuv3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.6.5_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.0__eai_2.10_enpuv3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.7.20_0.0__3.0.0_0.0__eai_1.36_enpu2.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.7.2_0.0__3.0.0_0.0__eai_1.36_enpu2.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.7.5_0.0__3.0.0_0.0__3.1.1.0_0.0__3.2.0_0.0__eai_2.7_enpu_v3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.7.5_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.1__eai_2.10_enpuv3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.7.8_0.0__3.0.0_0.0__3.1.0_0.0__3.2.0_0.0__eai_2.10_enpuv3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.7.8_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.0__eai_2.10_enpuv3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.7.8_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.1__eai_2.10_enpuv3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__4.8.2_0.0__3.0.0_0.0__3.1.1.0_0.0__3.2.0_0.0__eai_2.7_enpu_v3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__4.8.3_0.0__3.0.0_0.0__3.1.0_0.0__3.2.0_0.0__eai_2.10_enpuv3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__4.8.3_0.0__3.0.0_0.0__eai_1.43_enpu2.pmd +vendor/etc/acdbdata/nn_ns_models/fai__4.8.4_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.0__eai_2.10_enpuv3.pmd +vendor/etc/acdbdata/nn_ns_models/fai__4.8.4_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.1__eai_2.10_enpuv3.pmd +vendor/etc/acdbdata/nn_vad_models/fai__3.0.0_0.0__eai_1.36_enpu2.pmd +vendor/etc/acdbdata/nn_vad_models/fai__3.0.0_0.0__eai_2.10_enpuv3.pmd # Audio libraries -vendor/lib/audio_algo.sst_component.so vendor/lib/libar-acdb.so -vendor/lib64/audio_algo.sst_component.so vendor/lib64/libar-acdb.so # Camera vendor/etc/eva/facedetection/model3.dat -vendor/etc/face3d/qcnn_concat_file_model-0324_2_encrypted vendor/etc/pwr/PowerFeatureConfig.xml vendor/etc/pwr/VideoPowerOptFeature.xml -vendor/lib/camera/com.qti.ois.mot_bu63169.so +vendor/lib/camera/com.qti.ois.mot_dw9784.so vendor/lib/camera/fdconfigpreview.bin vendor/lib/camera/fdconfigpreviewlite.bin vendor/lib/camera/fdconfigvideo.bin vendor/lib/camera/fdconfigvideolite.bin +vendor/lib/com.qti.camx.chiiqutils.so vendor/lib/com.qti.chiusecaseselector.so vendor/lib/com.qti.qseeaon.so vendor/lib/com.qti.qseeutils.so -vendor/lib/com.qti.settings.sm8450.so +vendor/lib/com.qti.settings.sm8550.so vendor/lib/com.qti.stats.common.so vendor/lib/com.qualcomm.mcx.distortionmapper.so vendor/lib/com.qualcomm.mcx.linearmapper.so +vendor/lib/com.qualcomm.mcx.nonlinearmapper.so vendor/lib/com.qualcomm.mcx.policy.mfl.so vendor/lib/com.qualcomm.mcx.policy.xr.so vendor/lib/com.qualcomm.qti.mcx.usecase.extension.so @@ -56,10 +64,11 @@ vendor/lib/libaidenoiserv2.so vendor/lib/libarcsoft_chi_utils.so vendor/lib/libbitmlengine.so vendor/lib/libbitmlenginev2.so -vendor/lib/libcamera_nn_stub.so vendor/lib/libcamerapostproc.so +vendor/lib/libchifeature2.so vendor/lib/libchilog.so vendor/lib/libcom.qti.chinodeutils.so +vendor/lib/libcommonchiutils.so vendor/lib/libeva.so vendor/lib/libeva_util.so vendor/lib/libface3d_dev.so @@ -69,6 +78,7 @@ vendor/lib/libhme.so vendor/lib/libipebpsstriping.so vendor/lib/libipebpsstriping170.so vendor/lib/libipebpsstriping480.so +vendor/lib/libisphwsetting.so vendor/lib/libjpege.so vendor/lib/libmfGhostDetection.so vendor/lib/libmfec.so @@ -103,27 +113,29 @@ vendor/lib/libubifocus.so vendor/lib/libvideooptfeature.so vendor/lib/libvideoutils.so vendor/lib/libvidhance.so -vendor/lib/vendor.qti.hardware.camera.aon@1.0-service-impl.so +vendor/lib/vendor.qti.hardware.camera.aon-service-impl.so vendor/lib/vendor.qti.hardware.camera.postproc@1.0-service-impl.so vendor/lib64/camera/arcsoft_dc_calibration_u.bin -vendor/lib64/camera/com.qti.ois.mot_bu63169.so +vendor/lib64/camera/com.qti.ois.mot_dw9784.so vendor/lib64/camera/fdconfigpreview.bin vendor/lib64/camera/fdconfigpreviewlite.bin vendor/lib64/camera/fdconfigvideo.bin vendor/lib64/camera/fdconfigvideolite.bin +vendor/lib64/canyon_arcsoft_portrait_super_night_se_raw.bin +vendor/lib64/canyon_arcsoft_super_night_raw.bin +vendor/lib64/canyon_arcsoft_super_night_se_raw.bin +vendor/lib64/com.qti.camx.chiiqutils.so vendor/lib64/com.qti.chiusecaseselector.so vendor/lib64/com.qti.qseeaon.so vendor/lib64/com.qti.qseeutils.so -vendor/lib64/com.qti.settings.sm8450.so +vendor/lib64/com.qti.settings.sm8550.so vendor/lib64/com.qti.stats.common.so vendor/lib64/com.qualcomm.mcx.distortionmapper.so vendor/lib64/com.qualcomm.mcx.linearmapper.so +vendor/lib64/com.qualcomm.mcx.nonlinearmapper.so vendor/lib64/com.qualcomm.mcx.policy.mfl.so vendor/lib64/com.qualcomm.mcx.policy.xr.so vendor/lib64/com.qualcomm.qti.mcx.usecase.extension.so -vendor/lib64/frontier_arcsoft_portrait_super_night_se_raw.bin -vendor/lib64/frontier_arcsoft_super_night_raw.bin -vendor/lib64/frontier_arcsoft_super_night_se_raw.bin vendor/lib64/hw/camera.qcom.so vendor/lib64/hw/com.qti.chi.override.so vendor/lib64/libAncHumanSegFigureFusion.so @@ -133,15 +145,15 @@ vendor/lib64/libPlatformValidatorShared.so vendor/lib64/libQ6MSFR_manager_stub.so vendor/lib64/libSNPE.so vendor/lib64/libSnpeHtpPrepare.so -vendor/lib64/libSnpeHtpV68Stub.so -vendor/lib64/libSnpeHtpV69Stub.so +vendor/lib64/libSnpeHtpV73Stub.so vendor/lib64/liba2d_helper.so vendor/lib64/libaidenoiser.so vendor/lib64/libaidenoiserv2.so vendor/lib64/libancbase_rt_fusion.so vendor/lib64/libarcsoft_chi_utils.so vendor/lib64/libarcsoft_hdr_detection.so -vendor/lib64/libarcsoft_high_dynamic_range.so +vendor/lib64/libarcsoft_high_dynamic_range_v4.so +vendor/lib64/libarcsoft_hpobjecttracking.so vendor/lib64/libarcsoft_mcxmflpolicy.so vendor/lib64/libarcsoft_portrait_distortion_correction.so vendor/lib64/libarcsoft_portrait_super_night_se_raw.so @@ -153,12 +165,11 @@ vendor/lib64/libarcsoft_triple_zoomtranslator.so vendor/lib64/libbitmlengine.so vendor/lib64/libbitmlenginev2.so vendor/lib64/libc++_shared.so -vendor/lib64/libcalculator.so -vendor/lib64/libcalculator_htp.so -vendor/lib64/libcamera_nn_stub.so vendor/lib64/libcamerapostproc.so +vendor/lib64/libchifeature2.so vendor/lib64/libchilog.so vendor/lib64/libcom.qti.chinodeutils.so +vendor/lib64/libcommonchiutils.so vendor/lib64/libeva.so vendor/lib64/libeva_util.so vendor/lib64/libeye_tracking_dsp_sample_stub.so @@ -166,10 +177,10 @@ vendor/lib64/libface3d_dev.so vendor/lib64/libfcell.so vendor/lib64/libhdr10plus.so vendor/lib64/libhme.so -vendor/lib64/libhta.so vendor/lib64/libipebpsstriping.so vendor/lib64/libipebpsstriping170.so vendor/lib64/libipebpsstriping480.so +vendor/lib64/libisphwsetting.so vendor/lib64/libjpege.so vendor/lib64/libmfGhostDetection.so vendor/lib64/libmfec.so @@ -197,11 +208,8 @@ vendor/lib64/libqll10.so vendor/lib64/libqllengine.so vendor/lib64/libqshcamera.so vendor/lib64/libremosaic_wrapper.so -vendor/lib64/libremosaiclib_s5khp1.so -vendor/lib64/libremosaiclib_s5kjn1.so vendor/lib64/librmsclib1.so vendor/lib64/libsfeShiftExtrapolation.so -vendor/lib64/libsnpe_dsp_domains_v2.so vendor/lib64/libsnpe_loader.so vendor/lib64/libswregistrationalgo.so vendor/lib64/libsynx.so @@ -212,26 +220,12 @@ vendor/lib64/libtriplecam_video_optical_zoom.so vendor/lib64/libubifocus.so vendor/lib64/libvideooptfeature.so vendor/lib64/libvidhance.so -vendor/lib64/vendor.qti.hardware.camera.aon@1.0-service-impl.so +vendor/lib64/vendor.qti.hardware.camera.aon-service-impl.so vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so # Camera - camx -vendor/lib/camx.device@3.2-impl.so -vendor/lib/camx.device@3.3-impl.so -vendor/lib/camx.device@3.4-ext-impl.so -vendor/lib/camx.device@3.4-impl.so -vendor/lib/camx.device@3.5-ext-impl.so -vendor/lib/camx.device@3.5-impl.so -vendor/lib/camx.device@3.6-ext-impl.so -vendor/lib/camx.device@3.6-impl.so -vendor/lib/camx.device@3.7-impl.so -vendor/lib/camx.provider@2.4-external.so -vendor/lib/camx.provider@2.4-impl.so -vendor/lib/camx.provider@2.4-legacy.so -vendor/lib/camx.provider@2.5-external.so -vendor/lib/camx.provider@2.5-legacy.so -vendor/lib/camx.provider@2.6-legacy.so -vendor/lib/camx.provider@2.7-legacy.so +vendor/lib/camx.device-impl.so +vendor/lib/camx.provider-impl.so vendor/lib/libcamxcommonutils.so vendor/lib/libcamxexternalformatutils.so vendor/lib/libcamxfacialfeatures.so @@ -246,22 +240,8 @@ vendor/lib/libcamxstatscore.so vendor/lib/libcamxswispiqmodule.so vendor/lib/libcamxswprocessalgo.so vendor/lib/libcamxtintlessalgo.so -vendor/lib64/camx.device@3.2-impl.so -vendor/lib64/camx.device@3.3-impl.so -vendor/lib64/camx.device@3.4-ext-impl.so -vendor/lib64/camx.device@3.4-impl.so -vendor/lib64/camx.device@3.5-ext-impl.so -vendor/lib64/camx.device@3.5-impl.so -vendor/lib64/camx.device@3.6-ext-impl.so -vendor/lib64/camx.device@3.6-impl.so -vendor/lib64/camx.device@3.7-impl.so -vendor/lib64/camx.provider@2.4-external.so -vendor/lib64/camx.provider@2.4-impl.so -vendor/lib64/camx.provider@2.4-legacy.so -vendor/lib64/camx.provider@2.5-external.so -vendor/lib64/camx.provider@2.5-legacy.so -vendor/lib64/camx.provider@2.6-legacy.so -vendor/lib64/camx.provider@2.7-legacy.so +vendor/lib64/camx.device-impl.so +vendor/lib64/camx.provider-impl.so vendor/lib64/libcamxcommonutils.so vendor/lib64/libcamxexternalformatutils.so vendor/lib64/libcamxfacialfeatures.so @@ -278,9 +258,8 @@ vendor/lib64/libcamxswprocessalgo.so vendor/lib64/libcamxtintlessalgo.so # Camera - Components -vendor/lib/camera/components/com.bots.node.vendortagwrite.so vendor/lib/camera/components/com.mot.node.c2d.so -vendor/lib/camera/components/com.qti.camx.chiiqutils.so +vendor/lib/camera/components/com.mot.node.tfraw.so vendor/lib/camera/components/com.qti.eisv2.so vendor/lib/camera/components/com.qti.eisv3.so vendor/lib/camera/components/com.qti.hvx.addconstant.so @@ -289,6 +268,7 @@ vendor/lib/camera/components/com.qti.node.afbfusion.so vendor/lib/camera/components/com.qti.node.aon.so vendor/lib/camera/components/com.qti.node.customhwnode.so vendor/lib/camera/components/com.qti.node.depth.so +vendor/lib/camera/components/com.qti.node.depthprovider.so vendor/lib/camera/components/com.qti.node.dewarp.so vendor/lib/camera/components/com.qti.node.dummydepth.so vendor/lib/camera/components/com.qti.node.dummyrtb.so @@ -304,9 +284,10 @@ vendor/lib/camera/components/com.qti.node.hdr10pgen.so vendor/lib/camera/components/com.qti.node.hdr10phist.so vendor/lib/camera/components/com.qti.node.memcpy.so vendor/lib/camera/components/com.qti.node.ml.so -vendor/lib/camera/components/com.qti.node.mlinference.so vendor/lib/camera/components/com.qti.node.muxer.so +vendor/lib/camera/components/com.qti.node.rawsvq.so vendor/lib/camera/components/com.qti.node.remosaic.so +vendor/lib/camera/components/com.qti.node.seg.so vendor/lib/camera/components/com.qti.node.stich.so vendor/lib/camera/components/com.qti.node.swaidenoiser.so vendor/lib/camera/components/com.qti.node.swbestats.so @@ -316,10 +297,10 @@ vendor/lib/camera/components/com.qti.node.swfusion.so vendor/lib/camera/components/com.qti.node.swhme.so vendor/lib/camera/components/com.qti.node.swlsc.so vendor/lib/camera/components/com.qti.node.swmctf.so -vendor/lib/camera/components/com.qti.node.swmfnr.so vendor/lib/camera/components/com.qti.node.swpdpc.so vendor/lib/camera/components/com.qti.node.swpreprocess.so vendor/lib/camera/components/com.qti.node.swregistration.so +vendor/lib/camera/components/com.qti.node.swvrt.so vendor/lib/camera/components/com.qti.stats.aec.so vendor/lib/camera/components/com.qti.stats.aecwrapper.so vendor/lib/camera/components/com.qti.stats.aecxcore.so @@ -346,13 +327,13 @@ vendor/lib/camera/components/com.vidhance.node.ica.so vendor/lib/camera/components/com.vidhance.node.processing.so vendor/lib/camera/components/com.vidhance.stats.aec_dmbr.so vendor/lib64/camera/components/com.arcsoft.node.dc_capture.so +vendor/lib64/camera/components/com.arcsoft.node.objecttracking.so vendor/lib64/camera/components/com.arcsoft.node.smooth_transition.so vendor/lib64/camera/components/com.arcsoft.node.supernightraw.so -vendor/lib64/camera/components/com.bots.node.vendortagwrite.so vendor/lib64/camera/components/com.mot.node.c2d.so -vendor/lib64/camera/components/com.mot.node.hdr.so +vendor/lib64/camera/components/com.mot.node.hdr4.so vendor/lib64/camera/components/com.mot.node.scene_detect.so -vendor/lib64/camera/components/com.qti.camx.chiiqutils.so +vendor/lib64/camera/components/com.mot.node.tfraw.so vendor/lib64/camera/components/com.qti.eisv2.so vendor/lib64/camera/components/com.qti.eisv3.so vendor/lib64/camera/components/com.qti.hvx.addconstant.so @@ -361,6 +342,7 @@ vendor/lib64/camera/components/com.qti.node.afbfusion.so vendor/lib64/camera/components/com.qti.node.aon.so vendor/lib64/camera/components/com.qti.node.customhwnode.so vendor/lib64/camera/components/com.qti.node.depth.so +vendor/lib64/camera/components/com.qti.node.depthprovider.so vendor/lib64/camera/components/com.qti.node.dewarp.so vendor/lib64/camera/components/com.qti.node.dummydepth.so vendor/lib64/camera/components/com.qti.node.dummyrtb.so @@ -376,9 +358,10 @@ vendor/lib64/camera/components/com.qti.node.hdr10pgen.so vendor/lib64/camera/components/com.qti.node.hdr10phist.so vendor/lib64/camera/components/com.qti.node.memcpy.so vendor/lib64/camera/components/com.qti.node.ml.so -vendor/lib64/camera/components/com.qti.node.mlinference.so vendor/lib64/camera/components/com.qti.node.muxer.so +vendor/lib64/camera/components/com.qti.node.rawsvq.so vendor/lib64/camera/components/com.qti.node.remosaic.so +vendor/lib64/camera/components/com.qti.node.seg.so vendor/lib64/camera/components/com.qti.node.stich.so vendor/lib64/camera/components/com.qti.node.swaidenoiser.so vendor/lib64/camera/components/com.qti.node.swbestats.so @@ -388,10 +371,10 @@ vendor/lib64/camera/components/com.qti.node.swfusion.so vendor/lib64/camera/components/com.qti.node.swhme.so vendor/lib64/camera/components/com.qti.node.swlsc.so vendor/lib64/camera/components/com.qti.node.swmctf.so -vendor/lib64/camera/components/com.qti.node.swmfnr.so vendor/lib64/camera/components/com.qti.node.swpdpc.so vendor/lib64/camera/components/com.qti.node.swpreprocess.so vendor/lib64/camera/components/com.qti.node.swregistration.so +vendor/lib64/camera/components/com.qti.node.swvrt.so vendor/lib64/camera/components/com.qti.stats.aec.so vendor/lib64/camera/components/com.qti.stats.aecwrapper.so vendor/lib64/camera/components/com.qti.stats.aecxcore.so @@ -421,11 +404,11 @@ vendor/lib64/camera/components/libdepthmapwrapper_secure.so # Camera - eeprom vendor/lib/camera/com.mot.eeprom.mot_gt24p128e_imx663_eeprom.so -vendor/lib/camera/com.mot.eeprom.mot_gt24p128e_s5khp1_eeprom.so +vendor/lib/camera/com.mot.eeprom.mot_gt24p128e_ov50a_eeprom.so vendor/lib/camera/com.mot.eeprom.mot_gt24p128e_s5kjn1_eeprom.so vendor/lib/camera/com.mot.eeprom.mot_gt24p64e_ov60a_eeprom.so vendor/lib64/camera/com.mot.eeprom.mot_gt24p128e_imx663_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_gt24p128e_s5khp1_eeprom.so +vendor/lib64/camera/com.mot.eeprom.mot_gt24p128e_ov50a_eeprom.so vendor/lib64/camera/com.mot.eeprom.mot_gt24p128e_s5kjn1_eeprom.so vendor/lib64/camera/com.mot.eeprom.mot_gt24p64e_ov60a_eeprom.so @@ -441,24 +424,19 @@ vendor/etc/jiigan/jiigan_model.data vendor/etc/tetras/portrait_repair_composite.model # Camera - feature2 +vendor/lib/com.qti.feature2.afbrckt.so vendor/lib/com.qti.feature2.anchorsync.so +vendor/lib/com.qti.feature2.arcrawpro.so vendor/lib/com.qti.feature2.demux.so vendor/lib/com.qti.feature2.derivedoffline.so vendor/lib/com.qti.feature2.frameselect.so vendor/lib/com.qti.feature2.fusion.so vendor/lib/com.qti.feature2.generic.so -vendor/lib/com.qti.feature2.gs.cedros.so -vendor/lib/com.qti.feature2.gs.fillmore.so -vendor/lib/com.qti.feature2.gs.sdm865.so -vendor/lib/com.qti.feature2.gs.sm8350.so -vendor/lib/com.qti.feature2.gs.sm8450.so +vendor/lib/com.qti.feature2.gs.sm8550.so vendor/lib/com.qti.feature2.hdr.so vendor/lib/com.qti.feature2.mcreprocrt.so vendor/lib/com.qti.feature2.memcpy.so -vendor/lib/com.qti.feature2.mfsr.netrani.so -vendor/lib/com.qti.feature2.mfsr.sm8450.so vendor/lib/com.qti.feature2.mfsr.so -vendor/lib/com.qti.feature2.ml.fillmore.so vendor/lib/com.qti.feature2.ml.so vendor/lib/com.qti.feature2.mux.so vendor/lib/com.qti.feature2.qcfa.so @@ -470,6 +448,7 @@ vendor/lib/com.qti.feature2.serializer.so vendor/lib/com.qti.feature2.statsregeneration.so vendor/lib/com.qti.feature2.stub.so vendor/lib/com.qti.feature2.swmf.so +vendor/lib64/com.qti.feature2.afbrckt.so vendor/lib64/com.qti.feature2.anchorsync.so vendor/lib64/com.qti.feature2.arcrawpro.so vendor/lib64/com.qti.feature2.demux.so @@ -477,18 +456,11 @@ vendor/lib64/com.qti.feature2.derivedoffline.so vendor/lib64/com.qti.feature2.frameselect.so vendor/lib64/com.qti.feature2.fusion.so vendor/lib64/com.qti.feature2.generic.so -vendor/lib64/com.qti.feature2.gs.cedros.so -vendor/lib64/com.qti.feature2.gs.fillmore.so -vendor/lib64/com.qti.feature2.gs.sdm865.so -vendor/lib64/com.qti.feature2.gs.sm8350.so -vendor/lib64/com.qti.feature2.gs.sm8450.so +vendor/lib64/com.qti.feature2.gs.sm8550.so vendor/lib64/com.qti.feature2.hdr.so vendor/lib64/com.qti.feature2.mcreprocrt.so vendor/lib64/com.qti.feature2.memcpy.so -vendor/lib64/com.qti.feature2.mfsr.netrani.so -vendor/lib64/com.qti.feature2.mfsr.sm8450.so vendor/lib64/com.qti.feature2.mfsr.so -vendor/lib64/com.qti.feature2.ml.fillmore.so vendor/lib64/com.qti.feature2.ml.so vendor/lib64/com.qti.feature2.mux.so vendor/lib64/com.qti.feature2.qcfa.so @@ -502,9 +474,31 @@ vendor/lib64/com.qti.feature2.stub.so vendor/lib64/com.qti.feature2.swmf.so # Camera - ICP +vendor/firmware/CAMERA_ICP.b00 +vendor/firmware/CAMERA_ICP.b01 +vendor/firmware/CAMERA_ICP.b02 +vendor/firmware/CAMERA_ICP.b03 +vendor/firmware/CAMERA_ICP.b04 +vendor/firmware/CAMERA_ICP.b05 +vendor/firmware/CAMERA_ICP.b06 +vendor/firmware/CAMERA_ICP.b07 +vendor/firmware/CAMERA_ICP.b08 +vendor/firmware/CAMERA_ICP.b09 +vendor/firmware/CAMERA_ICP.b10 +vendor/firmware/CAMERA_ICP.b11 +vendor/firmware/CAMERA_ICP.b12 +vendor/firmware/CAMERA_ICP.b13 +vendor/firmware/CAMERA_ICP.b14 +vendor/firmware/CAMERA_ICP.b15 +vendor/firmware/CAMERA_ICP.b16 +vendor/firmware/CAMERA_ICP.b17 +vendor/firmware/CAMERA_ICP.b18 +vendor/firmware/CAMERA_ICP.b19 +vendor/firmware/CAMERA_ICP.b20 vendor/firmware/CAMERA_ICP.elf +vendor/firmware/CAMERA_ICP.mbn +vendor/firmware/CAMERA_ICP.mdt vendor/firmware/CAMERA_ICP_170.elf -vendor/firmware/CAMERA_ICP_480.elf # Camera - Motorola vendor/bin/hw/motorola.hardware.camera.desktop@2.0-service @@ -515,64 +509,56 @@ vendor/lib64/motorola.hardware.camera.desktop@1.0.so vendor/lib64/motorola.hardware.camera.desktop@2.0.so # Camera - OIS -vendor/firmware/mot_bu63169.coeff -vendor/firmware/mot_bu63169.prog +vendor/firmware/mot_dw9784.prog # Camera - sensor vendor/lib/camera/com.qti.sensor.mot_imx663.so +vendor/lib/camera/com.qti.sensor.mot_ov50a.so vendor/lib/camera/com.qti.sensor.mot_ov60a.so -vendor/lib/camera/com.qti.sensor.mot_s5khp1.so vendor/lib/camera/com.qti.sensor.mot_s5kjn1.so vendor/lib64/camera/com.qti.sensor.mot_imx663.so +vendor/lib64/camera/com.qti.sensor.mot_ov50a.so vendor/lib64/camera/com.qti.sensor.mot_ov60a.so -vendor/lib64/camera/com.qti.sensor.mot_s5khp1.so vendor/lib64/camera/com.qti.sensor.mot_s5kjn1.so # Camera - sensormodule -vendor/lib/camera/com.qti.sensormodule.mot_eqs_imx663_ofilm.bin -vendor/lib/camera/com.qti.sensormodule.mot_eqs_ov60a_qtech.bin -vendor/lib/camera/com.qti.sensormodule.mot_eqs_s5khp1_qtech.bin -vendor/lib/camera/com.qti.sensormodule.mot_eqs_s5kjn1_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_eqs_imx663_ofilm.bin -vendor/lib64/camera/com.qti.sensormodule.mot_eqs_ov60a_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_eqs_s5khp1_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_eqs_s5kjn1_qtech.bin +vendor/lib/camera/com.qti.sensormodule.mot_rtwo_imx663_sunny.bin +vendor/lib/camera/com.qti.sensormodule.mot_rtwo_ov50a_qtech.bin +vendor/lib/camera/com.qti.sensormodule.mot_rtwo_ov60a_qtech.bin +vendor/lib/camera/com.qti.sensormodule.mot_rtwo_s5kjn1_qtech.bin +vendor/lib64/camera/com.qti.sensormodule.mot_rtwo_imx663_sunny.bin +vendor/lib64/camera/com.qti.sensormodule.mot_rtwo_ov50a_qtech.bin +vendor/lib64/camera/com.qti.sensormodule.mot_rtwo_ov60a_qtech.bin +vendor/lib64/camera/com.qti.sensormodule.mot_rtwo_s5kjn1_qtech.bin # Camera - tuned vendor/lib/camera/com.qti.tuned.default.bin -vendor/lib/camera/com.qti.tuned.mot_eqs_imx663.bin -vendor/lib/camera/com.qti.tuned.mot_eqs_ov60a.bin -vendor/lib/camera/com.qti.tuned.mot_eqs_s5khp1.bin -vendor/lib/camera/com.qti.tuned.mot_eqs_s5kjn1.bin +vendor/lib/camera/com.qti.tuned.mot_rtwo_imx663.bin +vendor/lib/camera/com.qti.tuned.mot_rtwo_ov50a.bin +vendor/lib/camera/com.qti.tuned.mot_rtwo_ov60a.bin +vendor/lib/camera/com.qti.tuned.mot_rtwo_s5kjn1.bin vendor/lib64/camera/com.qti.tuned.default.bin -vendor/lib64/camera/com.qti.tuned.mot_eqs_imx663.bin -vendor/lib64/camera/com.qti.tuned.mot_eqs_ov60a.bin -vendor/lib64/camera/com.qti.tuned.mot_eqs_s5khp1.bin -vendor/lib64/camera/com.qti.tuned.mot_eqs_s5kjn1.bin +vendor/lib64/camera/com.qti.tuned.mot_rtwo_imx663.bin +vendor/lib64/camera/com.qti.tuned.mot_rtwo_ov50a.bin +vendor/lib64/camera/com.qti.tuned.mot_rtwo_ov60a.bin +vendor/lib64/camera/com.qti.tuned.mot_rtwo_s5kjn1.bin # Charger firmware -vendor/firmware/cps4035.bin +vendor/firmware/cps4038.bin # Display calibration data vendor/etc/display/qdcm_calib_data_mipi_mot_cmd_csot_1080p_dsc_667.json -vendor/etc/display/qdcm_calib_data_mipi_mot_cmd_csot_1080p_dsc_667_c6.json -vendor/etc/display/qdcm_calib_data_mipi_mot_cmd_csot_ili_1080p_dsc_667.json vendor/etc/display/qdcm_calib_data_mipi_mot_cmd_tianma_1080p_667.json vendor/etc/display/qdcm_calib_data_mipi_mot_video_dummy_qhd.json -vendor/etc/display/qdcm_calib_data_nt36672e_lcd_video_mode_dsi_novatek_panel_with_DSC.json -vendor/etc/display/qdcm_calib_data_nt36672e_lcd_video_mode_dsi_novatek_panel_without_DSC.json # Fingerprint -vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-ets -vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-ets.rc -vendor/lib64/libRbsFlow.so -vendor/lib64/libets_teeclient_v3.so -vendor/lib64/vendor.egistec.hardware.fingerprint@4.0.so -vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so +vendor/lib64/hw/fingerprint.goodix.so +vendor/lib64/libgf_hal.so +vendor/lib64/vendor.goodix.hardware.biometrics.fingerprint@2.1_vendor.so # HotwordEnrollment --product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk --product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk +product/priv-app/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND.apk +product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND.apk system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml system_ext/framework/com.android.hotwordenrollment.common.util.jar @@ -591,74 +577,65 @@ system/framework/com.motorola.motosignature.jar system/framework/moto-core_services.jar system/framework/moto-settings.jar system_ext/bin/motsettings -system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml -system_ext/framework/com.motorola.androidx.camera.extensions.jar -system_ext/etc/public.libraries-motocamera.txt -system_ext/lib/libmcf_native_window_helper.motocamera.so -system_ext/lib64/libmcf_native_window_helper.motocamera.so -system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk # Moto Permissions product/etc/permissions/com.motorola.camera3.xml:vendor/etc/permissions/com.motorola.camera3.xml product/etc/permissions/com.motorola.camera3.content.ai.xml:vendor/etc/permissions/com.motorola.camera3.content.ai.xml -product/etc/permissions/com.motorola.camera3.eqs.xml:vendor/etc/permissions/com.motorola.camera3.eqs.xml +product/etc/permissions/com.motorola.camera3.rtwo.xml:vendor/etc/permissions/com.motorola.camera3.rtwo.xml product/etc/permissions/com.motorola.camera3.lens.xml:vendor/etc/permissions/com.motorola.camera3.lens.xml product/etc/permissions/com.motorola.moto-uirefresh.xml product/etc/permissions/com.motorola.motodisplay.xml product/etc/permissions/privapp-permissions-com.motorola.motodisplay.xml -system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml:vendor/etc/permissions/com.motorola.androidx.camera.extensions.xml # NFC -vendor/bin/hw/android.hardware.nfc@1.2-service.st -vendor/bin/hw/android.hardware.secure_element@1.2-service-gto -vendor/bin/STFlashTool -vendor/etc/init/android.hardware.nfc@1.2-service.st.rc -vendor/etc/init/android.hardware.secure_element@1.2-service-gto.rc -vendor/lib64/android.hardware.secure_element@1.0-impl-gto.so -vendor/lib64/libstnfc-auth.so -vendor/lib64/nfc_nci.st21nfc.st.so +system_ext/app/NfcNciNxp/NfcNciNxp.apk;OVERRIDES=NfcNci +vendor/bin/hw/vendor.nxp.hardware.nfc@2.0-service +vendor/bin/nqnfcinfo +vendor/etc/init/vendor.nxp.hardware.nfc@2.0-service.rc +vendor/lib64/nfc_nci.nqx.default.hw.so +vendor/lib64/vendor.nxp.hardware.nfc@2.0.so # NFC - configs -vendor/etc/libnfc-hal-st.conf -vendor/etc/libnfc-hal-st54j.conf -vendor/etc/libnfc-nci-st.conf -vendor/etc/libse-gto-hal.conf -vendor/etc/st21nfc_conf_ds.txt -vendor/etc/st21nfc_conf_ss.txt -vendor/etc/st54j_conf_ds.txt -vendor/etc/st54j_conf_ss.txt +vendor/etc/libnfc-PN560_38_4MHZ.conf +vendor/etc/libnfc-SN220_19_2MHZ.conf +vendor/etc/libnfc-SN220_38_4MHZ.conf +vendor/etc/libnfc-SN220_38_4MHZ_UICC.conf +vendor/etc/libnfc-mtp-SN100.conf +vendor/etc/libnfc-mtp-SN100_38_4MHZ.conf +vendor/etc/libnfc-nci.conf +vendor/etc/libnfc-qrd-SN100.conf +vendor/etc/libnfc-qrd-SN100_38_4MHZ.conf # NFC firmware -vendor/firmware/st21nfc_fw.bin -vendor/firmware/st21nfc_fw7.bin -vendor/firmware/st54j_fw.bin # OEM vendor/etc/vhw.xml # Sensors -vendor/lib64/libflatbuffers-cpp_vendor.so -vendor/lib64/libruy_vendor.so -vendor/lib64/libtextclassifier_hash_vendor.so -vendor/lib64/libtflite_vendor.so vendor/lib64/sensors.moto.so vendor/lib64/sensors.ssc.so # Sensor - configs vendor/etc/sensors/als_comp_config.xml -vendor/etc/sensors/als_comp_tf_csotc4.config -vendor/etc/sensors/als_comp_tf_csotc6.config -vendor/etc/sensors/als_comp_tf_tianma.config -vendor/etc/sensors/config/icm4x6xx_0.json +vendor/etc/sensors/als_comp_tf_csot.config +vendor/etc/sensors/als_comp_tf_csot_dc.config +vendor/etc/sensors/config/bmp5_0.json +vendor/etc/sensors/config/icp201xx_0.json +vendor/etc/sensors/config/kailua_irq.json +vendor/etc/sensors/config/kailua_power_0.json +vendor/etc/sensors/config/kailua_qsh_ble_0.json +vendor/etc/sensors/config/lsm6dso_0.json +vendor/etc/sensors/config/mn29xxx_0.json vendor/etc/sensors/config/mot_camgest.json vendor/etc/sensors/config/mot_chopchop.json -vendor/etc/sensors/config/mot_drop.json vendor/etc/sensors/config/mot_ftm.json vendor/etc/sensors/config/mot_ltv.json vendor/etc/sensors/config/mot_tap.json vendor/etc/sensors/config/mot_vsync_psd.json vendor/etc/sensors/config/mxg4300_0.json vendor/etc/sensors/config/qmc6308_0.json +vendor/etc/sensors/config/qsh_ble.json vendor/etc/sensors/config/qsh_camera.json vendor/etc/sensors/config/sns_amd.json vendor/etc/sensors/config/sns_amd_sw_disabled.json @@ -673,6 +650,8 @@ vendor/etc/sensors/config/sns_ccd_v3_0_walk.json vendor/etc/sensors/config/sns_ccd_v3_1_walk.json vendor/etc/sensors/config/sns_ccd_v4_0_sensors.json vendor/etc/sensors/config/sns_ccd_v4_0_te_cd_regs.json +vendor/etc/sensors/config/sns_ccd_v5.json +vendor/etc/sensors/config/sns_ccd_v5_0_te_cd_regs.json vendor/etc/sensors/config/sns_cm.json vendor/etc/sensors/config/sns_dae.json vendor/etc/sensors/config/sns_device_orient.json @@ -685,8 +664,11 @@ vendor/etc/sensors/config/sns_fmv.json vendor/etc/sensors/config/sns_fmv_legacy.json vendor/etc/sensors/config/sns_geomag_rv.json vendor/etc/sensors/config/sns_gyro_cal.json +vendor/etc/sensors/config/sns_heart_rate.json vendor/etc/sensors/config/sns_mag_cal.json vendor/etc/sensors/config/sns_mag_cal_legacy.json +vendor/etc/sensors/config/sns_multishake.json +vendor/etc/sensors/config/sns_offbody_detect_phone.json vendor/etc/sensors/config/sns_pedometer.json vendor/etc/sensors/config/sns_rmd.json vendor/etc/sensors/config/sns_rotv.json @@ -695,29 +677,23 @@ vendor/etc/sensors/config/sns_tilt.json vendor/etc/sensors/config/sns_tilt_sw_disabled.json vendor/etc/sensors/config/sns_tilt_sw_enabled.json vendor/etc/sensors/config/sns_tilt_to_wake.json +vendor/etc/sensors/config/sns_wrist_pedo.json vendor/etc/sensors/config/tcs3720_0.json -vendor/etc/sensors/config/tcs3720_0_csot_dvt2.json -vendor/etc/sensors/config/tcs3720_0_csotc4_always.json -vendor/etc/sensors/config/tcs3720_0_csotc4_pvt1.json -vendor/etc/sensors/config/tcs3720_0_csotc6_always.json -vendor/etc/sensors/config/tcs3720_0_csotc6_pvt1.json -vendor/etc/sensors/config/tcs3720_0_evt_dvt1.json +vendor/etc/sensors/config/tcs3720_0_csotv0_always.json +vendor/etc/sensors/config/tcs3720_0_csotv1v2_always.json vendor/etc/sensors/config/tcs3720_0_tianma_always.json -vendor/etc/sensors/config/tcs3720_0_tianma_dvt2.json -vendor/etc/sensors/config/waipio_default_sensors.json -vendor/etc/sensors/config/waipio_dynamic_sensors.json -vendor/etc/sensors/config/waipio_irq.json -vendor/etc/sensors/config/waipio_power_0.json vendor/etc/sensors/sns_reg_config # Thermal engine - configs -vendor/etc/thermal-engine-eqs.conf +vendor/etc/thermal-engine-rtwo.conf vendor/etc/thermal-engine.conf # Touchscreen firmware +vendor/firmware/csot01_goodix_cfg_group.bin vendor/firmware/csot_goodix_cfg_group.bin vendor/firmware/csot_goodix_test_limits_255.csv -vendor/firmware/goodix-csot-gt9916-2207161f-62de58cd-eqs.bin -vendor/firmware/goodix-tianma-gt9916-2207161f-62de5b51-eqs.bin -vendor/firmware/tianma_goodix_cfg_group.bin -vendor/firmware/tianma_goodix_test_limits_255.csv +vendor/firmware/goodix-csot-gt9916P-2212130b-6398358c-rtwo.bin +vendor/firmware/goodix-csot01-gt9916P-3206151d-62cbe0fe-rtwo.bin +vendor/firmware/goodix-tm-gt9916P-22121302-6398384b-rtwo.bin +vendor/firmware/tm_goodix_cfg_group.bin +vendor/firmware/tm_goodix_test_limits_255.csv diff --git a/resource-overlay/eqs/Frameworks/Android.bp b/resource-overlay/rtwo/Frameworks/Android.bp similarity index 70% rename from resource-overlay/eqs/Frameworks/Android.bp rename to resource-overlay/rtwo/Frameworks/Android.bp index afb74f8..ca11cb5 100644 --- a/resource-overlay/eqs/Frameworks/Android.bp +++ b/resource-overlay/rtwo/Frameworks/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "FrameworksResEqs", + name: "FrameworksResRtwo", sdk_version: "current", vendor: true } diff --git a/resource-overlay/eqs/Frameworks/AndroidManifest.xml b/resource-overlay/rtwo/Frameworks/AndroidManifest.xml similarity index 89% rename from resource-overlay/eqs/Frameworks/AndroidManifest.xml rename to resource-overlay/rtwo/Frameworks/AndroidManifest.xml index 55c15e4..8e88d90 100644 --- a/resource-overlay/eqs/Frameworks/AndroidManifest.xml +++ b/resource-overlay/rtwo/Frameworks/AndroidManifest.xml @@ -4,6 +4,6 @@ SPDX-License-Identifier: Apache-2.0 --> + package="android.overlay.rtwo"> diff --git a/resource-overlay/eqs/Frameworks/res/values-land/dimens.xml b/resource-overlay/rtwo/Frameworks/res/values-land/dimens.xml similarity index 100% rename from resource-overlay/eqs/Frameworks/res/values-land/dimens.xml rename to resource-overlay/rtwo/Frameworks/res/values-land/dimens.xml diff --git a/resource-overlay/eqs/Frameworks/res/values/config.xml b/resource-overlay/rtwo/Frameworks/res/values/config.xml similarity index 100% rename from resource-overlay/eqs/Frameworks/res/values/config.xml rename to resource-overlay/rtwo/Frameworks/res/values/config.xml diff --git a/resource-overlay/eqs/Frameworks/res/values/dimens.xml b/resource-overlay/rtwo/Frameworks/res/values/dimens.xml similarity index 100% rename from resource-overlay/eqs/Frameworks/res/values/dimens.xml rename to resource-overlay/rtwo/Frameworks/res/values/dimens.xml diff --git a/resource-overlay/eqs/Frameworks/res/xml/power_profile.xml b/resource-overlay/rtwo/Frameworks/res/xml/power_profile.xml similarity index 100% rename from resource-overlay/eqs/Frameworks/res/xml/power_profile.xml rename to resource-overlay/rtwo/Frameworks/res/xml/power_profile.xml diff --git a/resource-overlay/eqs/LineageSystemUI/Android.bp b/resource-overlay/rtwo/LineageSystemUI/Android.bp similarity index 80% rename from resource-overlay/eqs/LineageSystemUI/Android.bp rename to resource-overlay/rtwo/LineageSystemUI/Android.bp index a9e9d9c..5045146 100644 --- a/resource-overlay/eqs/LineageSystemUI/Android.bp +++ b/resource-overlay/rtwo/LineageSystemUI/Android.bp @@ -4,6 +4,6 @@ // runtime_resource_overlay { - name: "LineageSystemUIEqs", + name: "LineageSystemUIRtwo", vendor: true, } diff --git a/resource-overlay/eqs/LineageSystemUI/AndroidManifest.xml b/resource-overlay/rtwo/LineageSystemUI/AndroidManifest.xml similarity index 87% rename from resource-overlay/eqs/LineageSystemUI/AndroidManifest.xml rename to resource-overlay/rtwo/LineageSystemUI/AndroidManifest.xml index 45e32b3..65410c1 100644 --- a/resource-overlay/eqs/LineageSystemUI/AndroidManifest.xml +++ b/resource-overlay/rtwo/LineageSystemUI/AndroidManifest.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0 --> + package="com.android.systemui.rtwo.lineage"> + package="com.android.providers.settings.overlay.rtwo"> diff --git a/resource-overlay/eqs/SettingsProvider/res/values/config.xml b/resource-overlay/rtwo/SettingsProvider/res/values/config.xml similarity index 100% rename from resource-overlay/eqs/SettingsProvider/res/values/config.xml rename to resource-overlay/rtwo/SettingsProvider/res/values/config.xml diff --git a/resource-overlay/eqs/SystemUI/Android.bp b/resource-overlay/rtwo/SystemUI/Android.bp similarity index 71% rename from resource-overlay/eqs/SystemUI/Android.bp rename to resource-overlay/rtwo/SystemUI/Android.bp index 71fe180..c78d286 100644 --- a/resource-overlay/eqs/SystemUI/Android.bp +++ b/resource-overlay/rtwo/SystemUI/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "SystemUIResEqs", + name: "SystemUIResRtwo", sdk_version: "current", vendor: true } diff --git a/resource-overlay/eqs/SystemUI/AndroidManifest.xml b/resource-overlay/rtwo/SystemUI/AndroidManifest.xml similarity index 86% rename from resource-overlay/eqs/SystemUI/AndroidManifest.xml rename to resource-overlay/rtwo/SystemUI/AndroidManifest.xml index e1b8b1d..1a9a9d8 100644 --- a/resource-overlay/eqs/SystemUI/AndroidManifest.xml +++ b/resource-overlay/rtwo/SystemUI/AndroidManifest.xml @@ -5,6 +5,6 @@ --> + package="com.android.systemui.overlay.rtwo"> diff --git a/resource-overlay/eqs/SystemUI/res/values-land/dimens.xml b/resource-overlay/rtwo/SystemUI/res/values-land/dimens.xml similarity index 100% rename from resource-overlay/eqs/SystemUI/res/values-land/dimens.xml rename to resource-overlay/rtwo/SystemUI/res/values-land/dimens.xml diff --git a/resource-overlay/eqs/SystemUI/res/values/config.xml b/resource-overlay/rtwo/SystemUI/res/values/config.xml similarity index 100% rename from resource-overlay/eqs/SystemUI/res/values/config.xml rename to resource-overlay/rtwo/SystemUI/res/values/config.xml diff --git a/resource-overlay/eqs/SystemUI/res/values/dimens.xml b/resource-overlay/rtwo/SystemUI/res/values/dimens.xml similarity index 100% rename from resource-overlay/eqs/SystemUI/res/values/dimens.xml rename to resource-overlay/rtwo/SystemUI/res/values/dimens.xml diff --git a/resource-overlay/eqs/SystemUI/res/values/integers.xml b/resource-overlay/rtwo/SystemUI/res/values/integers.xml similarity index 100% rename from resource-overlay/eqs/SystemUI/res/values/integers.xml rename to resource-overlay/rtwo/SystemUI/res/values/integers.xml diff --git a/rootdir/etc/init/hw/init.mmi.overlay.rc b/rootdir/etc/init/hw/init.mmi.overlay.rc index f8b6b9d..bddbc8b 100644 --- a/rootdir/etc/init/hw/init.mmi.overlay.rc +++ b/rootdir/etc/init/hw/init.mmi.overlay.rc @@ -1,88 +1,38 @@ -import /vendor/etc/init/hw/init.vendor.st21nfc.rc - -on early-init - write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor walt - write /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor walt - write /sys/devices/system/cpu/cpu7/cpufreq/scaling_governor walt +# This is for Moto rtwo device init rc file on fs - insmod /vendor/lib/modules/rbs_fod_mmi.ko - insmod /vendor/lib/modules/msm_drm.ko - insmod /vendor/lib/modules/mmi_annotate.ko - insmod /vendor/lib/modules/mmi_info.ko - insmod /vendor/lib/modules/mmi_relay.ko - insmod /vendor/lib/modules/sensors_class.ko - insmod /vendor/lib/modules/touchscreen_mmi.ko - insmod /vendor/lib/modules/goodix_brl_mmi.ko - insmod /vendor/lib/modules/sx937x_sar.ko - insmod /vendor/lib/modules/qti_glink_charger.ko - insmod /vendor/lib/modules/qpnp_adaptive_charge.ko - #zram wb - mount_all /vendor/etc/fstab.qcom.zram --early - -on early-boot - # factory i2c - chmod 0660 /dev/i2c-0 - chmod 0660 /dev/i2c-1 - chmod 0660 /dev/i2c-2 - chmod 0660 /dev/i2c-3 - chmod 0660 /dev/i2c-4 - chown system system /dev/i2c-0 - chown system system /dev/i2c-1 - chown system system /dev/i2c-2 - chown system system /dev/i2c-3 - chown system system /dev/i2c-4 - # for ufs HID - chown system system /sys/devices/platform/soc/1d84000.ufshc/ufshid/trigger - -# Create directory for wireless charge test in factory - mkdir /data/vendor/wlc 0775 vendor_tcmd system - -# Change force_charging_enable access mode and permission for tcmd - chmod 0664 /sys/class/power_supply/battery/device/force_charging_enable - chown vendor_tcmd system /sys/class/power_supply/battery/device/force_charging_enable + insmod /vendor/lib/modules/wl2868c.ko + insmod /vendor/lib/modules/sensors_class.ko + insmod /vendor/lib/modules/sx937x_multi.ko + #zram wb + mount_all /vendor/etc/fstab.qcom.zram --early on post-fs + start vendor.copy_qc_cert + # Sensors - chown system system /sys/devices/platform/soc/990000.i2c/i2c-0/0-005d/touchscreen/primary/double_tap_enabled - chown system system /sys/devices/platform/soc/990000.i2c/i2c-0/0-005d/touchscreen/primary/double_tap_pressed - chown system system /sys/devices/platform/soc/990000.i2c/i2c-0/0-005d/touchscreen/primary/udfps_enabled - chown system system /sys/devices/platform/soc/990000.i2c/i2c-0/0-005d/touchscreen/primary/udfps_pressed - -on post-fs-data - # Param updater data for various modules - mkdir /data/vendor/param 0775 system system - # prepare folders for Egis FoD fingerprint sensor - mkdir /data/vendor/egis 0770 system system - mkdir /mnt/vendor/persist/egis 0770 system system - mkdir /data/vendor/tzstorage/egis 0770 system system - mkdir /data/vendor/egis/cqa 0770 system system - - # Add for fod fps calibration - chown system system /sys/class/backlight/panel0-backlight/brightness - chown system system /sys/class/drm/card0-DSI-1/panelName - chown system system /sys/class/drm/card0-DSI-1/panelId - chown system system /d/dri/0/debug/motUtil - chmod 0666 /d/dri/0/debug/motUtil; - chmod 0666 /sys/class/backlight/panel0-backlight/brightness - chmod 0666 /sys/class/drm/card0-DSI-1/panelName - chmod 0666 /sys/class/drm/card0-DSI-1/panelId + chown system system /sys/devices/platform/soc/ac0000.qcom,qupv3_1_geni_se/a90000.spi/spi_master/spi0/spi0.0/touchscreen/primary/double_tap_enabled + chown system system /sys/devices/platform/soc/ac0000.qcom,qupv3_1_geni_se/a90000.spi/spi_master/spi0/spi0.0/touchscreen/primary/double_tap_pressed + chown system system /sys/devices/platform/soc/ac0000.qcom,qupv3_1_geni_se/a90000.spi/spi_master/spi0/spi0.0/touchscreen/primary/udfps_enabled + chown system system /sys/devices/platform/soc/ac0000.qcom,qupv3_1_geni_se/a90000.spi/spi_master/spi0/spi0.0/touchscreen/primary/udfps_pressed on early-boot - # Add for egis fingerprint - chown system system /dev/esfp0 - chmod 0664 /dev/esfp0 + chown system system /dev/goodix_fp + chmod 0664 /dev/goodix_fp + mkdir /data/vendor/gf_data 0770 system system + mkdir /mnt/vendor/persist/goodix 0770 system system +# Add for after-sales ois gyro cal + mkdir /mnt/vendor/persist/camera/gyro_compat 0770 vendor_tcmd camera +# Create directory for wireless charge test in factory + mkdir /data/vendor/wlc 0775 vendor_tcmd system + chown system system /mnt/vendor/persist/sensors/als_comp_multi_cal_raw + chmod 0664 /mnt/vendor/persist/sensors/als_comp_multi_cal_raw on boot - # allow TCMD to access cci for OIS test + # allow TCMD to access cci chmod 0660 /dev/cci_intf chown system camera /dev/cci_intf - start vendor.touchRec - # touch screen calibration file - mkdir /mnt/vendor/persist/touch - chown vendor_tcmd system /mnt/vendor/persist/touch - chmod 0775 /mnt/vendor/persist/touch # Touch game mode control chown system system /sys/class/touchscreen/primary/rotate chmod 0660 /sys/class/touchscreen/primary/rotate @@ -94,9 +44,90 @@ on boot chmod 0660 /sys/class/touchscreen/primary/sensitivity chown system system /sys/class/touchscreen/primary/gesture chmod 0660 /sys/class/touchscreen/primary/gesture - # Set adaptive charging perms for HAL - chown system system /sys/module/qpnp_adaptive_charge/parameters/upper_limit - chown system system /sys/module/qpnp_adaptive_charge/parameters/lower_limit + chown system system /sys/class/touchscreen/primary/sample + chmod 0660 /sys/class/touchscreen/primary/sample + + #change vibrator test node file access permission + chmod 0660 /sys/class/qcom-haptics/enable_play + chown vendor_tcmd system /sys/class/qcom-haptics/enable_play + + #bluetooth sar + write /data/vendor/radio/bluetooth_sar disable + chmod 0644 /data/vendor/radio/bluetooth_sar + chown radio /data/vendor/radio/bluetooth_sar + + # max readyfor apps + setprop ro.vendor.config.max_readyfor_apps 4 + +service vendor.netconfig /vendor/bin/vendor_netconfig + class main + user root + group root system + oneshot + disabled + +on boot && property:ro.bootmode=mot-factory + start vendor.netconfig + +service vendor.start_dhrystone /vendor/bin/init.dhrystone.sh -d 300 + class main + user root + group root system + oneshot + disabled + +service vendor.stop_dhrystone /vendor/bin/init.dhrystone.sh -s stop + class main + user root + group root system + oneshot + disabled + +on property:persist.vendor.dhrystone.status=0 + start vendor.stop_dhrystone + start thermal-engine + +service vendor.mot_vsync_psd /vendor/bin/mot_vsync_psd + class late_start + user root + +service vendor.capsense_reset /vendor/bin/capsense_reset + class core + user system + group system input + disabled + +on property:persist.vendor.dhrystone.status=1 + stop thermal-engine + start vendor.start_dhrystone + +service vendor.copy_qc_cert /vendor/bin/copy_qc_cert.sh + class main + user system + group root system + oneshot + disabled + +service vendor.mmi-cap-sh /vendor/bin/init.mmi.cap.sh + class core + user root + oneshot + +on property:sys.boot_completed=1 + start vendor.capsense_reset + #change adsp pmic test command file access permission + chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/tcmd + chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_pmic_icl + chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_usb_suspend + chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_wls_en + chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_wls_curr_max + chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_wls_volt_max + chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/tcmd + chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_pmic_icl + chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_usb_suspend + chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_wls_en + chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_wls_curr_max + chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_wls_volt_max chown system system /sys/class/power_supply/wireless/device/tx_mode chown system system /sys/class/power_supply/wireless/device/wls_input_current_limit @@ -104,12 +135,6 @@ on boot chmod 0660 /sys/class/power_supply/wireless/device/tx_mode chmod 0660 /sys/class/power_supply/wireless/device/wls_input_current_limit - #change vibrator test node file access permission - chmod 0660 /sys/class/qcom-haptics/enable_play - chown vendor_tcmd system /sys/class/qcom-haptics/enable_play - write /sys/class/qcom-battery/wireless_fw_update_time_ms 5000 - write /sys/class/qcom-battery/wireless_fw_update 1 - # Set wlc perms for HAL chown system system /sys/class/power_supply/wireless/device/wlc_light_ctl chown system system /sys/class/power_supply/wireless/device/wlc_fan_speed @@ -119,43 +144,72 @@ on boot chmod 0660 /sys/class/power_supply/wireless/device/wlc_light_ctl chmod 0660 /sys/class/power_supply/wireless/device/wlc_fan_speed - # vibrator hal need to access this sysfs node for AF noise issue - chown cameraserver cameraserver /sys/devices/platform/soc/soc:mot,cam-actuator/onekey_actuator - chmod 0660 /sys/devices/platform/soc/soc:mot,cam-actuator/onekey_actuator + # Change force_charging_enable access mode and permission for tcmd + chmod 0664 /sys/class/power_supply/battery/device/force_charging_enable + chown vendor_tcmd system /sys/class/power_supply/battery/device/force_charging_enable -service capsense_reset /system/vendor/bin/capsense_reset - class core - user system - group system input - disabled - -on property:sys.boot_completed=1 - start capsense_reset - #change adsp pmic test command file access permission - chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/tcmd - chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_pmic_icl - chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/tcmd - chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_pmic_icl - -#change for Rogue because the node changed -on property:vendor.wifi.tethering=false - write /sys/module/qca6490/parameters/sar_mhs disabled - -on property:vendor.wifi.tethering=true - write /sys/module/qca6490/parameters/sar_mhs enabled + # Set adaptive charging perms for HAL + chown system system /sys/module/qpnp_adaptive_charge/parameters/upper_limit + chown system system /sys/module/qpnp_adaptive_charge/parameters/lower_limit + #Try to update wireless firmware + write /sys/class/qcom-battery/wireless_fw_update_time_ms 10000 + write /sys/class/qcom-battery/wireless_fw_update 1 +#Override fwpath string when wpa_supplicant server was killed on property:vendor.wifi.station=true - write /sys/module/qca6490/parameters/sar_sta enabled + write /sys/module/kiwi_v2/parameters/sar_sta enabled on property:vendor.wifi.station=false - write /sys/module/qca6490/parameters/sar_sta disabled + write /sys/module/kiwi_v2/parameters/sar_sta disabled -on property:dev.bootcomplete=1 - stop llkd-${ro.debuggable:-0} +on property:vendor.wifi.tethering=false + write /sys/module/kiwi_v2/parameters/sar_mhs disabled +on property:vendor.wifi.tethering=true + write /sys/module/kiwi_v2/parameters/sar_mhs enabled + +on property:ro.product.is_prc=true + setprop persist.vendor.audio.use_case.extend prc + +on property:ro.carrier=tmo + setprop persist.vendor.audio.use_case.extend tmo + +#enable ftrace when boot complete +# MMI_STOPSHIP : capture sensor ftrace +on property:dev.bootcomplete=1 && property:ro.vendor.build.type=userdebug + write /sys/kernel/tracing/tracing_on 0 + write /sys/kernel/tracing/buffer_size_kb 65534 + write /sys/kernel/tracing/set_event "" + write /sys/kernel/tracing/trace "" + write /sys/kernel/tracing/events/irq/enable 1 + write /sys/kernel/tracing/events/sched/sched_switch/enable 1 + write /sys/kernel/tracing/events/sched/sched_enq_deq_task/enable 1 + write /sys/kernel/tracing/events/sched/sched_migrate_task/enable 1 + write /sys/kernel/tracing/events/sched/sched_wakeup/enable 1 + write /sys/kernel/tracing/events/sched/sched_wakeup_new/enable 1 + write /sys/kernel/tracing/events/power/cpu_idle/enable 1 + write /sys/kernel/tracing/events/power/suspend_resume/enable 1 + write /sys/kernel/tracing/events/iommu/map/enable 1 + write /sys/kernel/tracing/events/iommu/unmap/enable 1 + write /sys/kernel/tracing/events/arm_smmu/map_pages/enable 1 + write /sys/kernel/tracing/events/arm_smmu/map_sg/enable 1 + write /sys/kernel/tracing/events/arm_smmu/unmap_pages/enable 1 + write /sys/kernel/tracing/set_event "workqueue:workqueue_execute_end workqueue:workqueue_execute_start" + write /sys/kernel/tracing/set_event "workqueue:workqueue_activate_work workqueue:workqueue_queue_work" + write /sys/kernel/tracing/set_event "sched:sched_switch sched:sched_wakeup sched:sched_stat_blocked" + write /sys/kernel/tracing/set_event "sched:sched_process_wait sched:sched_load_balance" + write /sys/kernel/tracing/set_event "sched:* irq:*" + write /sys/kernel/tracing/tracing_on 1 + +on property:vendor.bluetooth.sar_state=connect + write /data/vendor/radio/bluetooth_sar connect + +on property:vendor.bluetooth.sar_state=disconnect + write /data/vendor/radio/bluetooth_sar disconnect + +#update the high watermark by set efk value on property:vendor.post_boot.parsed=1 - write /sys/devices/system/cpu/cpu4/core_ctl/enable 0 - write /sys/devices/system/cpu/cpu7/core_ctl/enable 0 + setprop sys.sysctl.extra_free_kbytes ${sys.sysctl.extra_free_kbytes} on property:vendor.usb.headset_reset=2 write /sys/bus/platform/devices/${ro.boot.usb.dwc3_msm:-a600000.ssusb}/mode none diff --git a/rootdir/etc/init/hw/init.vendor.st21nfc.rc b/rootdir/etc/init/hw/init.vendor.st21nfc.rc deleted file mode 100644 index 7612068..0000000 --- a/rootdir/etc/init/hw/init.vendor.st21nfc.rc +++ /dev/null @@ -1,25 +0,0 @@ - -# This file needs to be executed by vendor_init at boot of the device, -# both in normal and factory mode. - -on early-boot - # Change ownership and permision of st nfc device - chown nfc nfc /dev/st21nfc - chmod 0660 /dev/st21nfc - chown secure_element secure_element /dev/st54spi - chmod 0660 /dev/st54spi - -on property:ro.vendor.hw.nfc=true && property:persist.vendor.radio.multisim.config=* - start vendor.stflashtool - -on property:ro.vendor.hw.nfc=st && property:persist.vendor.radio.multisim.config=* - start vendor.stflashtool - -on property:ro.vendor.hw.nfc=ese_st && property:persist.vendor.radio.multisim.config=* - start vendor.stflashtool - -service vendor.stflashtool /vendor/bin/STFlashTool -c /vendor/etc/st21nfc_conf.txt -P vendor.nfc.fw_status - group nfc - user nfc - oneshot - disabled diff --git a/sensors/Android.bp b/sensors/Android.bp index cdf38ff..96bfa02 100644 --- a/sensors/Android.bp +++ b/sensors/Android.bp @@ -5,7 +5,7 @@ // cc_library_shared { - name: "sensors.eqs", + name: "sensors.rtwo", defaults: ["hidl_defaults"], srcs: [ "Sensor.cpp", @@ -29,7 +29,7 @@ cc_library_shared { "android.hardware.sensors@2.X-multihal", ], cflags: [ - "-DLOG_TAG=\"sensors.eqs\"", + "-DLOG_TAG=\"sensors.rtwo\"", ], vendor: true, } diff --git a/sensors/hals.conf b/sensors/hals.conf index dc88645..6850ccd 100644 --- a/sensors/hals.conf +++ b/sensors/hals.conf @@ -1,3 +1,3 @@ sensors.ssc.so sensors.moto.so -sensors.eqs.so +sensors.rtwo.so diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 6e9df75..c04daae 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -8,8 +8,8 @@ set -e -export DEVICE=eqs -export DEVICE_COMMON=sm8475-common +export DEVICE=rtwo +export DEVICE_COMMON=sm8550-common export VENDOR=motorola "./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@" diff --git a/system.prop b/system.prop index b27c1b5..cca77c7 100644 --- a/system.prop +++ b/system.prop @@ -1,3 +1,3 @@ # Google -ro.opa.device_model_id=motorola-eqs +ro.opa.device_model_id=motorola-rtwo ro.opa.eligible_device=true diff --git a/touch/Android.bp b/touch/Android.bp index 36725b8..203ed3c 100644 --- a/touch/Android.bp +++ b/touch/Android.bp @@ -14,9 +14,9 @@ // limitations under the License. cc_binary { - name: "vendor.lineage.touch@1.0-service.eqs", - vintf_fragments: ["vendor.lineage.touch@1.0-service.eqs.xml"], - init_rc: ["vendor.lineage.touch@1.0-service.eqs.rc"], + name: "vendor.lineage.touch@1.0-service.rtwo", + vintf_fragments: ["vendor.lineage.touch@1.0-service.rtwo.xml"], + init_rc: ["vendor.lineage.touch@1.0-service.rtwo.rc"], defaults: ["hidl_defaults"], relative_install_path: "hw", proprietary: true, diff --git a/touch/vendor.lineage.touch@1.0-service.eqs.rc b/touch/vendor.lineage.touch@1.0-service.rtwo.rc similarity index 92% rename from touch/vendor.lineage.touch@1.0-service.eqs.rc rename to touch/vendor.lineage.touch@1.0-service.rtwo.rc index e3d65b3..ff3bee4 100644 --- a/touch/vendor.lineage.touch@1.0-service.eqs.rc +++ b/touch/vendor.lineage.touch@1.0-service.rtwo.rc @@ -1,4 +1,4 @@ -service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.eqs +service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.rtwo interface vendor.lineage.touch@1.0::IGloveMode default interface vendor.lineage.touch@1.0::ITouchscreenGesture default class hal diff --git a/touch/vendor.lineage.touch@1.0-service.eqs.xml b/touch/vendor.lineage.touch@1.0-service.rtwo.xml similarity index 100% rename from touch/vendor.lineage.touch@1.0-service.eqs.xml rename to touch/vendor.lineage.touch@1.0-service.rtwo.xml diff --git a/vendor.prop b/vendor.prop index 49ff4da..d6b8a1f 100644 --- a/vendor.prop +++ b/vendor.prop @@ -1,5 +1,5 @@ # Bluetooth -bluetooth.device.default_name=motorola edge 30 ultra +bluetooth.device.default_name=motorola edge 40 pro # Camera persist.vendor.camera.physical.num=4