diff --git a/Android.mk b/Android.mk index 77b026c..033c58c 100644 --- a/Android.mk +++ b/Android.mk @@ -16,6 +16,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),dubai) +ifeq ($(TARGET_DEVICE),eqs) include $(call all-makefiles-under,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 1197c50..70e6d1f 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,9 +15,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_dubai.mk + $(LOCAL_DIR)/lineage_eqs.mk COMMON_LUNCH_CHOICES := \ - lineage_dubai-user \ - lineage_dubai-userdebug \ - lineage_dubai-eng + lineage_eqs-user \ + lineage_eqs-userdebug \ + lineage_eqs-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index 56d4dd7..d1a3f65 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,25 +14,24 @@ # limitations under the License. # -DEVICE_PATH := device/motorola/dubai +DEVICE_PATH := device/motorola/eqs -# Inherit from motorola sm7325-common -include device/motorola/sm7325-common/BoardConfigCommon.mk +# Inherit from motorola sm8475-common +include device/motorola/sm8475-common/BoardConfigCommon.mk # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := dubai +TARGET_BOOTLOADER_BOARD_NAME := eqs # Fingerprint -TARGET_SURFACEFLINGER_UDFPS_LIB := //$(DEVICE_PATH):libudfps_extension.dubai -SOONG_CONFIG_qtidisplay_udfps := true +#TARGET_SURFACEFLINGER_UDFPS_LIB := //$(DEVICE_PATH):libudfps_extension.eqs +#SOONG_CONFIG_qtidisplay_udfps := true # HIDL -DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/device_framework_matrix_dubai.xml -DEVICE_MANIFEST_YUPIK_FILES += $(DEVICE_PATH)/manifest_dubai.xml +DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/device_framework_matrix_eqs.xml +DEVICE_MANIFEST_CAPE_FILES += $(DEVICE_PATH)/manifest_eqs.xml # Kernel -BOARD_KERNEL_CMDLINE += androidboot.hab.product=dubai -TARGET_KERNEL_CONFIG += vendor/lineage_dubai.config +TARGET_KERNEL_CONFIG += vendor/lineage_eqs.config # Kernel Modules BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load)) @@ -41,14 +40,14 @@ BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVIC BOOT_KERNEL_MODULES := $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD) # Partitions -BOARD_USERDATAIMAGE_PARTITION_SIZE := 116340535296 +BOARD_USERDATAIMAGE_PARTITION_SIZE := 228362006528 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 := 8921284608 # ( BOARD_SUPER_PARTITION_SIZE - 4MB ) -BOARD_SUPER_PARTITION_SIZE := 8925478912 +BOARD_MOT_DP_GROUP_SIZE := 11806965760 # ( BOARD_SUPER_PARTITION_SIZE - 4MB ) +BOARD_SUPER_PARTITION_SIZE := 11811160064 # Properties TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop @@ -58,7 +57,7 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90 # Security -VENDOR_SECURITY_PATCH := 2022-06-01 +VENDOR_SECURITY_PATCH := 2022-09-01 # inherit from the proprietary version -include vendor/motorola/dubai/BoardConfigVendor.mk +include vendor/motorola/eqs/BoardConfigVendor.mk diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml old mode 100755 new mode 100644 index 82dd738..35b933a --- a/audio/audio_effects.xml +++ b/audio/audio_effects.xml @@ -3,6 +3,7 @@ + @@ -25,9 +26,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/audio_ext_spkr.conf b/audio/audio_ext_spkr.conf old mode 100755 new mode 100644 index c90b01e..1fda593 --- a/audio/audio_ext_spkr.conf +++ b/audio/audio_ext_spkr.conf @@ -1,29 +1,29 @@ global_config { - name Dubai - sonification_pad 20 - sonification_prox_timeout_sec 5 + name Eqs + force_ring_ramp true + sonification_pad 43 } ring { #dB to attenuate playback to meet safety level at each volume step #16 steps total, 15...0. In case of truncated list, last attenuation #given will be applied to all lower volume steps - attenuation 32,31,30,29,27,25,23,21,19,17,15,12,9,6,3,0 - knee_step 16 + attenuation 43,41,38,35,32,29,26,23,20,17,14,9,4,0,0,0 + knee_step 21 } voice { #dB to attenuate playback to meet safety level at each volume step #16 steps total, 15...0. In case of truncated list, last attenuation #given will be applied to all lower volume steps - attenuation 32,31,30,29,27,25,23,21,19,17,15,12,9,6,3,0 - knee_step 16 + attenuation 43,39,35,32,28,23,21,19,17,15,12,6,1,0,0,0 + knee_step 21 } media { #dB to attenuate playback to meet safety level at each volume step #16 steps total, 15...0. In case of truncated list, last attenuation #given will be applied to all lower volume steps - attenuation 32,31,30,29,27,25,23,21,19,17,15,12,9,6,3,0 - knee_step 16 + attenuation 43,39,35,32,28,23,21,19,17,15,12,6,1,0,0,0 + knee_step 21 } diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml old mode 100755 new mode 100644 index d9e49a4..3c7facc --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -1,9 +1,28 @@ - + + + + - + + + - + + + + - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + - - + @@ -177,45 +271,44 @@ + 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"/> + 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"/> + + + + + 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"/> - + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,hifi_playback,haptics output"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,hifi_playback,haptics output"/> - + + - - - + @@ -225,18 +318,19 @@ - + - - + + - - + + + diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml old mode 100755 new mode 100644 index 437824f..06145ae --- a/audio/audio_policy_volumes.xml +++ b/audio/audio_policy_volumes.xml @@ -9,23 +9,19 @@ volume index from 0 to 100. --> - 0,-3700 - 20,-2600 - 40,-1800 - 60,-1100 - 80,-500 - 100,0 - - - 0,-3000 - 33,-2000 + 1,-3000 + 33,-1600 66,-1000 100,0 + + 1,-3000 33,-2600 @@ -38,6 +34,8 @@ volume index from 0 to 100. ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> + - - 1,-6000 - 33,-3800 - 66,-1800 - 100,0 - + + + + + + + 1,-3000 33,-2600 66,-2200 100,-1800 - - 1,-3800 - 33,-2800 - 66,-2000 - 100,-1300 - - - 1,-2700 - 33,-1600 - 66,-700 - 100,0 - - + + + + + + + diff --git a/audio/default_volume_tables.xml b/audio/default_volume_tables.xml old mode 100755 new mode 100644 index 49d7012..4db0816 --- a/audio/default_volume_tables.xml +++ b/audio/default_volume_tables.xml @@ -20,24 +20,24 @@ - 1,-4800 - 33,-3100 - 66,-1500 + 1,-3900 + 33,-2600 + 66,-1300 100,0 - 1,-4900 - 33,-3400 - 66,-2000 - 100,-700 + 1,-5300 + 33,-2990 + 66,-1800 + 100,0 1,-3800 33,-3300 66,-2800 - 100,-2300 + 100,-1300 @@ -62,9 +62,9 @@ - 1,-5400 + 1,-5800 33,-3000 - 66,-1200 + 66,-1400 100,0 @@ -81,4 +81,19 @@ 60,-2100 100,-1000 + + + 1,-12700 + 20,-8000 + 60,-4000 + 100,0 + + + + + 0,-12700 + 20,-8000 + 60,-4000 + 100,0 + diff --git a/audio/sku_cape/audio_effects.xml b/audio/sku_cape/audio_effects.xml new file mode 100644 index 0000000..b7b311c --- /dev/null +++ b/audio/sku_cape/audio_effects.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/sku_cape/mixer_paths_waipio_mtp.xml b/audio/sku_cape/mixer_paths_waipio_mtp.xml new file mode 100644 index 0000000..c399e39 --- /dev/null +++ b/audio/sku_cape/mixer_paths_waipio_mtp.xml @@ -0,0 +1,3185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/sku_cape/resourcemanager_waipio_mtp.xml b/audio/sku_cape/resourcemanager_waipio_mtp.xml new file mode 100644 index 0000000..a5db352 --- /dev/null +++ b/audio/sku_cape/resourcemanager_waipio_mtp.xml @@ -0,0 +1,1208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + PAL_STREAM_ULTRA_LOW_LATENCY + PAL_STREAM_COMPRESSED + + + + 1 + + PAL_STREAM_LOW_LATENCY + PAL_STREAM_ULTRA_LOW_LATENCY + + + + + + + + + + + + + + + + + + + + + + + 0xB3000000 + 1000 + 8 + + + + + + + + + PAL_STREAM_VOICE_UI + PAL_STREAM_ACD + PAL_STREAM_ULTRASOUND + PAL_STREAM_SENSOR_PCM_DATA + + + + PAL_DEVICE_IN_HANDSET_MIC + CODEC_DMA-LPAIF_RXTX-TX-3 + 2 + 1 + 48000 + 16 + handset-mic + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + 2 + handset-dual-mic + + 1 + screen-record-mic + + + + PAL_STREAM_VOIP_TX + 2 + HW + 16 + 2 + handset-dmic-endfire + + + PAL_STREAM_VOICE_CALL + 1 + HW + 16 + 2 + handset-dmic-endfire + + + PAL_STREAM_ULTRA_LOW_LATENCY + + + PAL_STREAM_RAW + + 4 + unprocessed-hdr-mic-landscape + + + 4 + unprocessed-hdr-mic-portrait + + + 4 + unprocessed-hdr-mic-inverted-landscape + + + 4 + unprocessed-hdr-mic-inverted-portrait + + + + 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 + 48000 + 16 + 1 + speaker-mic + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + 2 + speaker-dmic-endfire + + 2 + speaker-dmic-endfire-invert + + + + PAL_STREAM_VOIP_TX + 2 + 2 + speaker-dmic-endfire + + game-mic + + + game-mic + + + + PAL_STREAM_VOICE_CALL + 1 + 2 + speaker-dmic-endfire + OFF + + + PAL_STREAM_LOOPBACK + + + PAL_STREAM_ULTRA_LOW_LATENCY + + + PAL_DEVICE_OUT_SPEAKER + PAL_DEVICE_OUT_USB_HEADSET + + + + PAL_DEVICE_IN_WIRED_HEADSET + CODEC_DMA-LPAIF_RXTX-TX-3 + 1 + 1 + headset-mic + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + + + PAL_STREAM_VOIP_TX + 48000 + 16 + + + PAL_STREAM_VOICE_CALL + HW + 48000 + 16 + 1 + + + PAL_STREAM_ULTRA_LOW_LATENCY + + + PAL_DEVICE_OUT_WIRED_HEADSET + PAL_DEVICE_OUT_WIRED_HEADPHONE + + + + PAL_DEVICE_IN_BLUETOOTH_SCO_HEADSET + SLIM-DEV1-TX-7 + 1 + 1 + 8000 + 16 + bt-sco-mic + + 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_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 + CODEC_DMA-LPAIF_VA-TX-0 + 2 + 1 + 48000 + 16 + va-mic + + PAL_DEVICE_OUT_SPEAKER + PAL_DEVICE_OUT_HANDSET + PAL_DEVICE_OUT_BLUETOOTH_A2DP + + + + PAL_DEVICE_IN_HEADSET_VA_MIC + CODEC_DMA-LPAIF_VA-TX-0 + 2 + 1 + headset-va-mic + 48000 + 16 + + PAL_DEVICE_OUT_WIRED_HEADSET + PAL_DEVICE_OUT_WIRED_HEADPHONE + PAL_DEVICE_OUT_BLUETOOTH_A2DP + + + + PAL_DEVICE_IN_USB_HEADSET + USB_AUDIO-TX + 1 + 1 + 48000 + 16 + usb-headset-mic + + PAL_STREAM_VOIP_TX + + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + + + PAL_STREAM_VOICE_CALL + 1 + HW + + + PAL_STREAM_ULTRA_LOW_LATENCY + + + PAL_DEVICE_OUT_USB_HEADSET + + + + PAL_DEVICE_IN_FM_TUNER + MI2S-LPAIF-TX-TERTIARY + 1 + 1 + play-fm + + PAL_STREAM_LOOPBACK + + + + PAL_DEVICE_IN_PROXY + PCM_RT_PROXY-TX-1 + 2 + 1 + afe-proxy + + PAL_STREAM_PROXY + + + + PAL_DEVICE_IN_VI_FEEDBACK + CODEC_DMA-LPAIF_WSA-TX-0 + 2 + 2 + 48000 + 32 + vi-feedback + + + PAL_DEVICE_IN_BLUETOOTH_A2DP + SLIM-DEV1-TX-7 + 1 + 1 + bt-a2dp-mic + 44100 + 16 + + + PAL_DEVICE_IN_TELEPHONY_RX + PCM_RT_PROXY-TX-1 + 2 + 2 + afe-proxy + + PAL_STREAM_PROXY + + + + PAL_DEVICE_IN_ULTRASOUND_MIC + CODEC_DMA-LPAIF_RXTX-TX-4 + 2 + 1 + 96000 + 16 + ultrasound-mic + + PAL_STREAM_ULTRASOUND + + + + PAL_DEVICE_IN_EXT_EC_REF + MI2S-LPAIF-TX-TERTIARY + ext_ec_ref_tx + 2 + 2 + 16 + 48000 + + + PAL_DEVICE_NONE + CODEC_DMA-LPAIF_WSA-RX-0 + 2 + 1 + none + 48000 + 16 + + + PAL_DEVICE_OUT_SPEAKER + CODEC_DMA-LPAIF_WSA-RX-0 + 2 + 2 + 48000 + 16 + speaker + 1 + + 0 + 1 + + + + PAL_AUDIO_FMT_PCM_S16_LE + + 0 + + 0 + + 3 + + PAL_STREAM_VOICE_CALL + 1 + 2 + voice-speaker-stereo + + + PAL_STREAM_VOIP_RX + 3 + 2 + voice-speaker-stereo + + + PAL_STREAM_ULTRASOUND + 1 + 96000 + + + + PAL_DEVICE_OUT_HANDSET + CODEC_DMA-LPAIF_WSA-RX-0 + 2 + 1 + + 0 + 48000 + 16 + 0 + handset + 0 + + PAL_STREAM_VOICE_CALL + 1 + 1 + voice-handset + + voice-handset-hac + + + + PAL_STREAM_VOIP_RX + 1 + voice-handset + 3 + + voice-handset-hac + + + + PAL_STREAM_ULTRASOUND + 2 + 96000 + + + + PAL_DEVICE_OUT_WIRED_HEADPHONE + CODEC_DMA-LPAIF_RXTX-RX-0 + 2 + 2 + 1 + headphones + + + PAL_STREAM_VOICE_CALL + 1 + 48000 + 16 + + + PAL_STREAM_VOIP_RX + 2 + 48000 + 16 + + + + PAL_DEVICE_OUT_WIRED_HEADSET + CODEC_DMA-LPAIF_RXTX-RX-0 + 2 + 2 + 1 + headphones + + + PAL_STREAM_VOICE_CALL + 1 + 48000 + 16 + + + PAL_STREAM_VOIP_RX + 2 + 48000 + 16 + + + + PAL_DEVICE_OUT_BLUETOOTH_A2DP + SLIM-DEV1-RX-7 + 1 + 1 + bt-a2dp + 44100 + 16 + + PAL_STREAM_VOICE_CALL + 1 + + + + PAL_DEVICE_OUT_BLUETOOTH_SCO + SLIM-DEV1-RX-7 + 1 + 1 + bt-sco + 8000 + 16 + + PAL_STREAM_VOICE_CALL + 1 + + + + PAL_DEVICE_OUT_AUX_DIGITAL + DISPLAY_PORT-RX + 32 + 2 + display-port + 1 + + PAL_STREAM_VOICE_CALL + 1 + + + + PAL_DEVICE_OUT_HDMI + DISPLAY_PORT-RX + 32 + 2 + 1 + display-port + + PAL_STREAM_VOICE_CALL + 1 + + + + PAL_DEVICE_OUT_USB_DEVICE + USB_AUDIO-RX + 2 + 2 + usb-headphones + 1 + + PAL_STREAM_VOICE_CALL + 1 + 48000 + 16 + + + PAL_STREAM_VOIP_RX + 2 + 48000 + 16 + + + + PAL_DEVICE_OUT_USB_HEADSET + USB_AUDIO-RX + 2 + 2 + usb-headphones + 1 + + PAL_STREAM_VOICE_CALL + 1 + 48000 + 16 + + + PAL_STREAM_VOIP_RX + 2 + 48000 + 16 + + + + PAL_DEVICE_OUT_AUX_DIGITAL_1 + DISPLAY_PORT-RX + 8 + 2 + display-port + 1 + + PAL_STREAM_VOICE_CALL + 1 + + + + PAL_DEVICE_OUT_PROXY + PCM_RT_PROXY-RX-1 + 8 + 2 + afe-proxy + 0 + 48000 + + PAL_STREAM_VOICE_CALL + 1 + + + + PAL_DEVICE_OUT_HEARING_AID + PCM_RT_PROXY-RX-1 + 8 + 2 + afe-proxy + 0 + + PAL_STREAM_VOICE_CALL + 1 + + + + PAL_DEVICE_OUT_HAPTICS_DEVICE + CODEC_DMA-LPAIF_RXTX-RX-6 + 2 + 1 + haptics-dev + + + PAL_DEVICE_OUT_ULTRASOUND + CODEC_DMA-LPAIF_WSA-RX-1 + 2 + 1 + ultrasound-handset + 96000 + 16 + + + + + PAL_STREAM_VOIP_TX + + + PAL_STREAM_GENERIC + + + + + PAL_STREAM_DEEP_BUFFER + + + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + PAL_STREAM_VOICE_UI + + + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + PAL_STREAM_ACD + + + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + PAL_STREAM_PROXY + + + PAL_STREAM_COMPRESSED + PAL_STREAM_ULTRA_LOW_LATENCY + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + PAL_STREAM_RAW + + + PAL_STREAM_COMPRESSED + PAL_STREAM_ULTRA_LOW_LATENCY + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/sku_yupik/audio_platform_info.xml b/audio/sku_yupik/audio_platform_info.xml deleted file mode 100755 index 542af86..0000000 --- a/audio/sku_yupik/audio_platform_info.xml +++ /dev/null @@ -1,572 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/sku_yupik/mixer_paths.xml b/audio/sku_yupik/mixer_paths.xml deleted file mode 100755 index ba94e68..0000000 --- a/audio/sku_yupik/mixer_paths.xml +++ /dev/null @@ -1,2290 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/keylayout/goodix_ts.kl b/configs/keylayout/goodix_ts.kl deleted file mode 100755 index 25c3c5c..0000000 --- a/configs/keylayout/goodix_ts.kl +++ /dev/null @@ -1,9 +0,0 @@ -# -# Goodix Touch sensor fod key event -# -# -# 704 finger touch down -# 705 finger touch up -# goodix_ts "finger present" -key 704 SYSTEM_NAVIGATION_DOWN -key 705 SYSTEM_NAVIGATION_UP diff --git a/device.mk b/device.mk index a498c18..60fee71 100644 --- a/device.mk +++ b/device.mk @@ -14,9 +14,6 @@ # limitations under the License. # -# A/B -TARGET_IS_VAB := true - # Boot animation TARGET_SCREEN_HEIGHT := 2400 TARGET_SCREEN_WIDTH := 1080 @@ -31,20 +28,21 @@ PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi PRODUCT_SHIPPING_API_LEVEL := 31 -# Inherit from motorola sm7325-common -$(call inherit-product, device/motorola/sm7325-common/sm7325.mk) +# Inherit from motorola sm8475-common +$(call inherit-product, device/motorola/sm8475-common/sm8475.mk) # Overlay PRODUCT_PACKAGES += \ - FrameworksResDubai \ - LineageSystemUIDubai \ - SettingsProviderResDubai \ - SystemUIResDubai + FrameworksResEqs \ + LineageSystemUIEqs \ + SettingsProviderResEqs \ + SystemUIResEqs # Audio PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/sku_yupik/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/audio_platform_info.xml \ - $(LOCAL_PATH)/audio/sku_yupik/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/mixer_paths.xml \ + $(LOCAL_PATH)/audio/sku_cape/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sku_cape/audio_effects.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/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 \ @@ -53,7 +51,7 @@ PRODUCT_COPY_FILES += \ # Fingerprint PRODUCT_PACKAGES += \ - android.hardware.biometrics.fingerprint@2.3-service.dubai + android.hardware.biometrics.fingerprint@2.3-service.eqs # Init $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/etc/init/hw/*.rc),\ @@ -63,21 +61,17 @@ $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/etc/init/*.rc),\ $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/bin/*.sh),\ $(eval PRODUCT_COPY_FILES += $(f):$(TARGET_COPY_OUT_VENDOR)/bin/$(notdir $f))) -# Keylayout -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/keylayout/goodix_ts.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/goodix_ts.kl - # 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_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v0.xml \ - $(LOCAL_PATH)/media/media_profiles_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v1.xml + $(LOCAL_PATH)/media/media_profiles_cape.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_cape.xml # NFC PRODUCT_PACKAGES += \ android.hardware.nfc@1.2.vendor \ android.hardware.nfc@1.2-service.st \ android.hardware.secure_element@1.2.vendor \ + android.hardware.secure_element@1.2-service-gto \ com.android.nfc_extras \ libchrome.vendor \ NfcNci \ @@ -89,15 +83,8 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml -# Sensors -PRODUCT_PACKAGES += \ - sensors.dubai - -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf - # Soong namespaces PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH) # Inherit from vendor blobs -$(call inherit-product, vendor/motorola/dubai/dubai-vendor.mk) +$(call inherit-product, vendor/motorola/eqs/eqs-vendor.mk) diff --git a/device_framework_matrix_dubai.xml b/device_framework_matrix_eqs.xml similarity index 100% rename from device_framework_matrix_dubai.xml rename to device_framework_matrix_eqs.xml diff --git a/extract-files.sh b/extract-files.sh index 4196aee..1fa3125 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -14,8 +14,8 @@ fi set -e -export DEVICE=dubai -export DEVICE_COMMON=sm7325-common +export DEVICE=eqs +export DEVICE_COMMON=sm8475-common export VENDOR=motorola "./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@" diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp index 8aff97d..b3415e2 100644 --- a/fingerprint/Android.bp +++ b/fingerprint/Android.bp @@ -1,8 +1,8 @@ cc_binary { - name: "android.hardware.biometrics.fingerprint@2.3-service.dubai", + name: "android.hardware.biometrics.fingerprint@2.3-service.eqs", defaults: ["hidl_defaults"], - init_rc: ["android.hardware.biometrics.fingerprint@2.3-service.dubai.rc"], - vintf_fragments: ["android.hardware.biometrics.fingerprint@2.3-service.dubai.xml"], + 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", @@ -22,7 +22,7 @@ cc_binary { } cc_library_static { - name: "libudfps_extension.dubai", + name: "libudfps_extension.eqs", srcs: ["UdfpsExtension.cpp"], include_dirs: [ "frameworks/native/services/surfaceflinger/CompositionEngine/include" diff --git a/fingerprint/BiometricsFingerprint.cpp b/fingerprint/BiometricsFingerprint.cpp index 01b5b01..7cb49e8 100644 --- a/fingerprint/BiometricsFingerprint.cpp +++ b/fingerprint/BiometricsFingerprint.cpp @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.dubai" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.eqs" #include "BiometricsFingerprint.h" diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.dubai.rc b/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.eqs.rc similarity index 75% rename from fingerprint/android.hardware.biometrics.fingerprint@2.3-service.dubai.rc rename to fingerprint/android.hardware.biometrics.fingerprint@2.3-service.eqs.rc index 22c789d..2509e07 100644 --- a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.dubai.rc +++ b/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.eqs.rc @@ -1,4 +1,4 @@ -service fps_hal.dubai /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.3-service.dubai +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. diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.dubai.xml b/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.eqs.xml similarity index 100% rename from fingerprint/android.hardware.biometrics.fingerprint@2.3-service.dubai.xml rename to fingerprint/android.hardware.biometrics.fingerprint@2.3-service.eqs.xml diff --git a/fingerprint/service.cpp b/fingerprint/service.cpp index 7a3b091..356e837 100644 --- a/fingerprint/service.cpp +++ b/fingerprint/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.dubai" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.eqs" #include #include #include "BiometricsFingerprint.h" diff --git a/interfaces/motorola/Android.bp b/interfaces/motorola/Android.bp index 114bca5..eb448a5 100644 --- a/interfaces/motorola/Android.bp +++ b/interfaces/motorola/Android.bp @@ -1,4 +1,4 @@ hidl_package_root { name: "com.motorola", - path: "device/motorola/dubai/interfaces/motorola", + path: "device/motorola/eqs/interfaces/motorola", } diff --git a/lineage.dependencies b/lineage.dependencies index 76799e5..83d5d5e 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -1,6 +1,6 @@ [ { - "repository": "android_device_motorola_sm7325-common", - "target_path": "device/motorola/sm7325-common" + "repository": "android_device_motorola_sm8475-common", + "target_path": "device/motorola/sm8475-common" } ] diff --git a/lineage_dubai.mk b/lineage_eqs.mk similarity index 73% rename from lineage_dubai.mk rename to lineage_eqs.mk index 53257f4..5be5348 100644 --- a/lineage_dubai.mk +++ b/lineage_eqs.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 dubai device -$(call inherit-product, device/motorola/dubai/device.mk) +# Inherit from eqs device +$(call inherit-product, device/motorola/eqs/device.mk) # Inherit some common Lineage stuff. $(call inherit-product, vendor/lineage/config/common_full_phone.mk) -PRODUCT_NAME := lineage_dubai -PRODUCT_DEVICE := dubai +PRODUCT_NAME := lineage_eqs +PRODUCT_DEVICE := eqs PRODUCT_MANUFACTURER := motorola PRODUCT_BRAND := motorola -PRODUCT_MODEL := motorola edge 30 +PRODUCT_MODEL := motorola edge 30 ultra PRODUCT_GMS_CLIENTID_BASE := android-motorola PRODUCT_BUILD_PROP_OVERRIDES += \ - TARGET_PRODUCT=dubai_retail \ - PRIVATE_BUILD_DESC="dubai_g-user 12 S1RD32M.55-67 356bc release-keys" + TARGET_PRODUCT=eqs_retail \ + PRIVATE_BUILD_DESC="eqs_g-user 12 S1RD32M.55-67 356bc release-keys" -BUILD_FINGERPRINT := motorola/dubai_g/dubai:12/S1RD32M.55-67/356bc:user/release-keys +BUILD_FINGERPRINT := motorola/eqs_g/eqs:12/S1RD32M.55-67/356bc:user/release-keys diff --git a/manifest_dubai.xml b/manifest_eqs.xml similarity index 100% rename from manifest_dubai.xml rename to manifest_eqs.xml diff --git a/media/media_profiles_yupik_v0.xml b/media/media_profiles_cape.xml similarity index 93% rename from media/media_profiles_yupik_v0.xml rename to media/media_profiles_cape.xml index 35dd969..e29f379 100644 --- a/media/media_profiles_yupik_v0.xml +++ b/media/media_profiles_cape.xml @@ -1,6 +1,6 @@ - + - + - + @@ -109,8 +109,8 @@ - - - -