diff --git a/Android.mk b/Android.mk index 9dbe5ab..0d0dc1c 100644 --- a/Android.mk +++ b/Android.mk @@ -6,6 +6,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),xpeng) +ifeq ($(TARGET_DEVICE),fogos) include $(call all-makefiles-under,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 30877c9..eaf7a8b 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -5,4 +5,4 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_xpeng.mk + $(LOCAL_DIR)/lineage_fogos.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index 6c72113..329cd91 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -4,20 +4,20 @@ # SPDX-License-Identifier: Apache-2.0 # -DEVICE_PATH := device/motorola/xpeng +DEVICE_PATH := device/motorola/fogos -# Inherit from motorola sm7325-common -include device/motorola/sm7325-common/BoardConfigCommon.mk +# Inherit from motorola sm6375-common +include device/motorola/sm6375-common/BoardConfigCommon.mk # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := xpeng +TARGET_BOOTLOADER_BOARD_NAME := fogos # HIDL -DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest_xpeng.xml +DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest_fogos.xml # Kernel -BOARD_KERNEL_CMDLINE += androidboot.hab.product=xpeng -TARGET_KERNEL_CONFIG += vendor/lineage_xpeng.config +BOARD_KERNEL_CMDLINE += androidboot.hab.product=fogos +TARGET_KERNEL_CONFIG += vendor/fogos_defconfig # Kernel Modules BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load)) @@ -26,9 +26,8 @@ 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 := 116674899968 -BOARD_MOT_DP_GROUP_SIZE := 8585740288 # ( BOARD_SUPER_PARTITION_SIZE - 4MB ) -BOARD_SUPER_PARTITION_SIZE := 8589934592 +BOARD_MOT_DP_GROUP_SIZE := 5901385728 # (BOARD_SUPER_PARTITION_SIZE - 4MB) +BOARD_SUPER_PARTITION_SIZE := 5905580032 # Properties TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop @@ -37,8 +36,8 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop # Recovery TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90 -# Security -VENDOR_SECURITY_PATCH := 2024-01-01 +# Security patch level +VENDOR_SECURITY_PATCH := 2024-05-01 # inherit from the proprietary version -include vendor/motorola/xpeng/BoardConfigVendor.mk +include vendor/motorola/fogos/BoardConfigVendor.mk diff --git a/README.md b/README.md index c4cdf6f..79ebe16 100644 --- a/README.md +++ b/README.md @@ -1,30 +1 @@ -# Device configuration for Motorola moto g200 5G / Edge S30 - -The moto g200 5G / Edge S30 (codenamed _"xpeng"_) are high-end smartphones from Motorola. - -It was announced on 12 December 2021. Release date was 21 December 2021. - -## Device specifications - -Basic | Spec Sheet --------:|:------------------------- -CPU | Octa-core (1x2.99 GHz Cortex-X1 & 3x2.42 GHz Cortex-A78 & 4x1.80 GHz Cortex-A55) -CHIPSET | Qualcomm SM8350 Snapdragon 888+ 5G (5 nm) -GPU | Adreno 660 -Memory | 8 / 12GB -Shipped Android Version | 11 -Storage | 256/512 -Battery | 5000 mAh -Dimensions | 168.1 x 75.5 x 8.9 mm -Display | 1080 x 2460 pixels, 6.8" LTPS IPS LCD, HDR10 -Rear Camera 1 | 108 MP, f/1.9, (wide), 1/1.52", 0.7µm, PDAF -Rear Camera 2 | 13 MP, f/2.2, 119˚ (ultrawide), 1.12µm, AF -Rear Camera 3 | 2 MP, f/2.4, (depth) -Front Camera | 16 MP, f/2.2, (wide), 1.00µm -Extras | NFC (on g200), Bluetooth 5.2 A2DP LE, UDFPS, USB Type-C 2.0, Fast charging 33W -Ingress Protection | IP52 -Touch Sampling Rate | 428 Hz (on g200) or 576Hz (on S30) - -## Device picture - -![Device Picture](https://i.imgur.com/04lu80E.png) +# Device configuration files for Motorola moto g34 5G (fogos) diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml index 82dd738..0da99c9 100644 --- a/audio/audio_effects.xml +++ b/audio/audio_effects.xml @@ -2,7 +2,7 @@ - + @@ -16,7 +16,6 @@ - @@ -25,9 +24,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/audio_ext_spkr.conf b/audio/audio_ext_spkr.conf index 593aa4d..a310f30 100644 --- a/audio/audio_ext_spkr.conf +++ b/audio/audio_ext_spkr.conf @@ -1,24 +1,30 @@ global_config { - name Berlin + name fogos + force_ring_ramp true + sonification_pad 20 + sonification_prox_timeout_sec 5 } 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 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 + attenuation 32,31,30,29,27,25,23,21,19,17,15,12,9,6,3,0 + knee_step 16 } 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 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 + attenuation 32,31,30,29,27,25,23,21,19,17,15,12,9,6,3,0 + knee_step 16 } 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 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 + attenuation 32,31,30,29,27,25,23,21,19,17,15,12,9,6,3,0 + knee_step 16 } diff --git a/audio/sku_lahaina/audio_io_policy.conf b/audio/audio_io_policy.conf similarity index 53% rename from audio/sku_lahaina/audio_io_policy.conf rename to audio/audio_io_policy.conf index 2c3df01..351bb90 100644 --- a/audio/sku_lahaina/audio_io_policy.conf +++ b/audio/audio_io_policy.conf @@ -18,56 +18,123 @@ outputs { bit_width 16 app_type 69937 } - voip_rx { - flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT + proaudio { + flags AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW formats AUDIO_FORMAT_PCM_16_BIT sampling_rates 48000 bit_width 16 + app_type 69943 + } + voip_rx { + flags AUDIO_OUTPUT_FLAG_VOIP_RX + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 8000|16000|32000|48000 + bit_width 16 app_type 69946 } + deep_buffer { + flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69936 + } direct_pcm_16 { flags AUDIO_OUTPUT_FLAG_DIRECT formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT - sampling_rates 44100|48000|88200|96000|176400|192000 + sampling_rates 48000|96000 bit_width 16 - app_type 69936 + app_type 69937 } direct_pcm_24 { flags AUDIO_OUTPUT_FLAG_DIRECT formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT - sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000 + sampling_rates 48000|96000 bit_width 24 app_type 69940 } direct_pcm_32 { flags AUDIO_OUTPUT_FLAG_DIRECT formats AUDIO_FORMAT_PCM_32_BIT - sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000 + sampling_rates 48000|96000 bit_width 32 app_type 69942 } + compress_passthrough { + flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH + formats AUDIO_FORMAT_DTS|AUDIO_FORMAT_DTS_HD|AUDIO_FORMAT_DSD + sampling_rates 48000 + bit_width 16 + app_type 69941 + } compress_offload_16 { flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2|AUDIO_FORMAT_AAC_LATM_LC|AUDIO_FORMAT_AAC_LATM_HE_V1|AUDIO_FORMAT_AAC_LATM_HE_V2 - sampling_rates 44100|48000|88200|96000|176400|192000 + sampling_rates 48000|96000 bit_width 16 - app_type 69936 + app_type 69937 } compress_offload_24 { flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING - formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2|AUDIO_FORMAT_AAC_LATM_LC|AUDIO_FORMAT_AAC_LATM_HE_V1|AUDIO_FORMAT_AAC_LATM_HE_V2 - sampling_rates 44100|48000|88200|96000|176400|192000 + formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2|AUDIO_FORMAT_AAC_LATM_LC|AUDIO_FORMAT_AAC_LATM_HE_V1|AUDIO_FORMAT_AAC_LATM_HE_V2 + sampling_rates 48000|96000 bit_width 24 app_type 69940 } } inputs { - voip_tx { - flags AUDIO_INPUT_FLAG_VOIP_TX + record_16bit { formats AUDIO_FORMAT_PCM_16_BIT sampling_rates 48000 bit_width 16 + app_type 69938 + } + record_24bit { + formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT + sampling_rates 48000 + bit_width 24 + app_type 69948 + } + record_32bit { + formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT + sampling_rates 48000 + bit_width 32 + app_type 69949 + } + record_compress_16 { + flags AUDIO_INPUT_FLAG_COMPRESS + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69938 + } + record_compress_24 { + flags AUDIO_INPUT_FLAG_COMPRESS + formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT + sampling_rates 48000 + bit_width 24 + app_type 69948 + } + record_compress_32 { + flags AUDIO_INPUT_FLAG_COMPRESS + formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT + sampling_rates 48000 + bit_width 32 + app_type 69949 + } + voip_tx { + flags AUDIO_INPUT_FLAG_VOIP_TX + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 8000|16000|32000|48000 + bit_width 16 app_type 69946 } + low_latency_voip_tx { + flags AUDIO_INPUT_FLAG_FAST|AUDIO_INPUT_FLAG_VOIP_TX + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type + } } diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index a4dc59a..58dcacc 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -44,16 +44,12 @@ - - - - + + flags="AUDIO_OUTPUT_FLAG_VOIP_RX"> + samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/> @@ -151,6 +147,15 @@ + + + + + + @@ -183,7 +188,7 @@ + sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> + + + + - - + + + + + + + + + + + + + + + + + - - - - + + diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml index 5ec0722..ff391a1 100644 --- a/audio/audio_policy_volumes.xml +++ b/audio/audio_policy_volumes.xml @@ -1,4 +1,4 @@ - + 1,-5300 - 70,-2390 - 84,-1010 + 33,-2990 + 66,-1800 100,0 @@ -37,13 +37,13 @@ 1,-3800 33,-3300 66,-2800 - 100,-2300 + 100,-1300 - 1,-5400 - 34,-3600 - 67,-1800 + 1,-4800 + 34,-3200 + 67,-1600 100,0 @@ -62,12 +62,9 @@ - 1,-6500 - 30,-4500 - 43,-3300 - 65,-2200 - 85,-1200 - 93,-600 + 1,-5800 + 33,-3000 + 66,-1400 100,0 @@ -84,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_lahaina/audio_platform_info.xml b/audio/sku_holi/audio_platform_info.xml similarity index 85% rename from audio/sku_lahaina/audio_platform_info.xml rename to audio/sku_holi/audio_platform_info.xml index ac8d143..5a896b4 100644 --- a/audio/sku_lahaina/audio_platform_info.xml +++ b/audio/sku_holi/audio_platform_info.xml @@ -38,11 +38,14 @@ + + + @@ -50,11 +53,14 @@ + + + @@ -77,9 +83,9 @@ - + - + @@ -92,26 +98,24 @@ - - + + - + - - - + - + @@ -136,7 +140,6 @@ - @@ -144,11 +147,23 @@ + + + + + + + + + + + + @@ -157,8 +172,6 @@ - - @@ -166,8 +179,8 @@ - - + + @@ -179,11 +192,12 @@ + - + @@ -201,9 +215,8 @@ - - - + + @@ -215,17 +228,16 @@ - - + + - - - - + + + @@ -240,38 +252,62 @@ - - - - + + + + + + - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -292,14 +328,14 @@ + + - - @@ -314,6 +350,7 @@ + @@ -324,7 +361,6 @@ - @@ -339,17 +375,22 @@ + - - - + + + + + + + @@ -362,11 +403,14 @@ - - - - - + + + + + + + + @@ -386,7 +430,6 @@ - diff --git a/audio/sku_lahaina/mixer_paths.xml b/audio/sku_holi/mixer_paths.xml similarity index 50% rename from audio/sku_lahaina/mixer_paths.xml rename to audio/sku_holi/mixer_paths.xml index bc42c57..54ed6a2 100644 --- a/audio/sku_lahaina/mixer_paths.xml +++ b/audio/sku_holi/mixer_paths.xml @@ -103,20 +103,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -155,11 +155,13 @@ - - - + + + + + @@ -191,7 +193,7 @@ - + @@ -211,7 +213,7 @@ - + @@ -230,8 +232,6 @@ - - @@ -254,7 +254,7 @@ - + @@ -292,7 +292,6 @@ - @@ -315,20 +314,18 @@ - + + + + + - - - - - - + - @@ -337,15 +334,6 @@ - - - - - - - - - @@ -370,19 +358,15 @@ - - - - - - - - + + + - + + @@ -397,6 +381,10 @@ + + + + @@ -439,36 +427,38 @@ - + - + + + + + + + - - + + - - - - - + - - + + @@ -490,6 +480,10 @@ + + + + @@ -509,7 +503,12 @@ - + + + + + + @@ -535,8 +534,44 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -566,7 +601,12 @@ - + + + + + + @@ -579,45 +619,73 @@ - + + + + + + - + + + + + + - + - + + + + + + - + - - + + + - - + + + + + + + + + + + + + + @@ -631,6 +699,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -645,7 +733,12 @@ - + + + + + + @@ -658,35 +751,67 @@ - + + + + + + + + + + - + + + + + + - + - + + + + + + - + + + + + + - - + + + + + + + + + + @@ -698,14 +823,23 @@ + + + + + + - + + + + @@ -719,6 +853,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -733,40 +888,83 @@ - + + + + + + - + - + + + + + + - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -780,6 +978,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -794,15 +1012,12 @@ - + - - - - - - + + + @@ -823,35 +1038,63 @@ - + + + + + + - + + + + + + - + - + + + + + + - + + + + + + - - + + + + + + + + + + @@ -859,6 +1102,7 @@ + @@ -866,6 +1110,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -880,7 +1144,12 @@ - + + + + + + @@ -893,6 +1162,7 @@ + @@ -901,22 +1171,931 @@ - + + + + + + - + + + + + + - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1023,6 +2202,10 @@ + + + + @@ -1067,6 +2250,10 @@ + + + + @@ -1075,6 +2262,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1107,6 +2325,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1140,6 +2386,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1155,11 +2430,11 @@ - + - + @@ -1209,12 +2484,7 @@ - - - - - - + @@ -1228,11 +2498,21 @@ + + + + + + + + + + @@ -1254,7 +2534,7 @@ - + @@ -1272,18 +2552,28 @@ + + + + + + + + + + - + - - + + @@ -1297,6 +2587,11 @@ + + + + + @@ -1313,7 +2608,7 @@ - + @@ -1331,11 +2626,21 @@ + + + + + + + + + + @@ -1348,11 +2653,11 @@ - + - - + + @@ -1396,11 +2701,28 @@ + + + + + + + + + + + + + + + + + @@ -1428,129 +2750,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1569,36 +2770,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - - + + @@ -1610,8 +2939,13 @@ + + + + + + - @@ -1638,21 +2972,59 @@ - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1663,6 +3035,10 @@ + + + + @@ -1671,6 +3047,14 @@ + + + + + + + + @@ -1683,10 +3067,6 @@ - - - - @@ -1707,6 +3087,22 @@ + + + + + + + + + + + + + + + + @@ -1719,6 +3115,22 @@ + + + + + + + + + + + + + + + + @@ -1735,6 +3147,10 @@ + + + + @@ -1747,10 +3163,18 @@ + + + + + + + + @@ -1759,6 +3183,10 @@ + + + + @@ -1767,14 +3195,6 @@ - - - - - - - - @@ -1783,10 +3203,22 @@ + + + + + + + + + + + + @@ -1799,6 +3231,22 @@ + + + + + + + + + + + + + + + + @@ -1815,18 +3263,14 @@ + + + + - - - - - - - - @@ -1835,14 +3279,30 @@ + + + + + + + + + + + + + + + + @@ -1862,58 +3322,46 @@ - + + + - - - - - - - - - - - + + + + - - - - + + + + + + + - - - - - - - - - + + + + + - - - - - - - - + + @@ -1924,105 +3372,96 @@ - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + + - + + - - - - - - - + + + + + + + + + - - - + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + @@ -2038,6 +3477,11 @@ + + + + + @@ -2057,23 +3501,44 @@ + + + + + - + - + + + + + + + + + + + + + + + + + @@ -2084,13 +3549,15 @@ - + + + @@ -2147,9 +3614,8 @@ - - + @@ -2171,7 +3637,41 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2192,12 +3692,54 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2205,10 +3747,19 @@ + + + + + + + + + @@ -2221,18 +3772,38 @@ + + + + + + + + + + + + + + + + + + - + + + @@ -2260,21 +3831,36 @@ - - - - - - - - - + + + + + + + + + - + + + + + + + + + + + + + + + + @@ -2323,57 +3909,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2406,7 +3941,14 @@ - + + + + + + + + @@ -2434,6 +3976,23 @@ + + + + + + + + + + + + + + + + + diff --git a/audio/sku_lahaina/sound_trigger_mixer_paths.xml b/audio/sku_lahaina/sound_trigger_mixer_paths.xml deleted file mode 100644 index bc5fa5d..0000000 --- a/audio/sku_lahaina/sound_trigger_mixer_paths.xml +++ /dev/null @@ -1,337 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/sku_lahaina/sound_trigger_platform_info.xml b/audio/sku_lahaina/sound_trigger_platform_info.xml deleted file mode 100644 index 6335847..0000000 --- a/audio/sku_lahaina/sound_trigger_platform_info.xml +++ /dev/null @@ -1,471 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/idc/uinput-egis.idc b/configs/idc/uinput-egis.idc deleted file mode 100644 index edebe3d..0000000 --- a/configs/idc/uinput-egis.idc +++ /dev/null @@ -1,9 +0,0 @@ -# -# Egis Touch sensor driver -# -# - -device.internal = 1 -keyboard.layout = uinput-egis -keyboard.builtIn = 1 -keyboard.orientationAware = 1 diff --git a/configs/idc/uinput-fpc.idc b/configs/idc/uinput-fpc.idc index b63eb7e..0faed28 100644 --- a/configs/idc/uinput-fpc.idc +++ b/configs/idc/uinput-fpc.idc @@ -1,9 +1,20 @@ +#Copyright (c) 2021 Fingerprint Cards AB # -# FPC1020 Touch sensor driver +#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. device.internal = 1 keyboard.layout = uinput-fpc keyboard.builtIn = 1 keyboard.orientationAware = 1 + diff --git a/configs/idc/uinput_nav.idc b/configs/idc/uinput_nav.idc index 9f16d76..b7eb5b3 100644 --- a/configs/idc/uinput_nav.idc +++ b/configs/idc/uinput_nav.idc @@ -1,8 +1,21 @@ +# Copyright (C) 2010 The Android Open Source Project # -# GF3626_Z9 gesture sensor driver +# 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 + + device.internal = 1 keyboard.layout = uinput_nav keyboard.builtIn = 1 keyboard.orientationAware = 1 + diff --git a/configs/keylayout/uinput-egis.kl b/configs/keylayout/uinput-egis.kl deleted file mode 100644 index 51beab5..0000000 --- a/configs/keylayout/uinput-egis.kl +++ /dev/null @@ -1,9 +0,0 @@ -# -# ETS320 Touch sensor driver -# - - -# ets320 "finger present" -key 618 SYSTEM_NAVIGATION_UP -key 619 SYSTEM_NAVIGATION_DOWN -key 622 SYSTEM_NAVIGATION_LEFT diff --git a/configs/keylayout/uinput-fpc.kl b/configs/keylayout/uinput-fpc.kl index b759909..0464d4f 100644 --- a/configs/keylayout/uinput-fpc.kl +++ b/configs/keylayout/uinput-fpc.kl @@ -1,9 +1,21 @@ # # FPC1020 Touch sensor driver # +# Copyright (c) 2021 Fingerprint Cards AB # +# 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. # fpc1020 "finger present" -key 618 SYSTEM_NAVIGATION_UP -key 619 SYSTEM_NAVIGATION_DOWN +# key 618 SYSTEM_NAVIGATION_UP +# key 619 SYSTEM_NAVIGATION_DOWN key 622 SYSTEM_NAVIGATION_LEFT diff --git a/configs/keylayout/uinput_nav.kl b/configs/keylayout/uinput_nav.kl index 2995801..b774e2a 100644 --- a/configs/keylayout/uinput_nav.kl +++ b/configs/keylayout/uinput_nav.kl @@ -1,8 +1,16 @@ +# Copyright (C) 2010 The Android Open Source Project # -# GF3626_Z9 gesture sensor driver +# 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. -key 618 SYSTEM_NAVIGATION_UP -key 619 SYSTEM_NAVIGATION_DOWN -# double tap -key 622 SYSTEM_NAVIGATION_LEFT +key 618 SYSTEM_NAVIGATION_UP +key 619 SYSTEM_NAVIGATION_DOWN diff --git a/configs/thermal-engine-xpeng-game-perf.conf b/configs/thermal-engine-xpeng-game-perf.conf deleted file mode 100644 index 1f73652..0000000 --- a/configs/thermal-engine-xpeng-game-perf.conf +++ /dev/null @@ -1,185 +0,0 @@ -[FRONT_TEMP] -algo_type virtual -trip_sensor skin-msm-therm-usr -thresholds -18000 -thresholds_clr -20000 -sensors camera-therm-usr pmb8350b_therm quiet_therm usb_therm -weights 3 39 5 53 -offsets -1000 0 0 0 -sampling 1000 -math 0 -sys_temp - -[REPORT-FRONT-TEMP] -algo_type monitor -sampling 300000 -sensor FRONT_TEMP -thresholds 42000 -thresholds_clr 40000 -actions report -action_info 1 - -[BACK_TEMP] -algo_type virtual -trip_sensor skin-msm-therm-usr -thresholds -18000 -thresholds_clr -20000 -sensors camera-therm-usr quiet_therm usb_therm -weights 42 37 21 -offsets 0 0 0 -sampling 1000 -math 0 -sys_temp - -[BACK_PATEMP1] -algo_type virtual -trip_sensor modem-mmw-pa1-usr -thresholds 53000 -thresholds_clr 40000 -sensors camera-therm-usr quiet_therm usb_therm -weights 42 37 21 -offsets 0 0 0 -sampling 1000 -math 0 - -[BACK_PATEMP2] -algo_type virtual -trip_sensor modem-mmw-pa2-usr -thresholds 53000 -thresholds_clr 40000 -sensors camera-therm-usr quiet_therm usb_therm -weights 42 37 21 -offsets 0 0 0 -sampling 1000 -math 0 - -[REPORT-BACK-TEMP] -algo_type monitor -sampling 300000 -sensor BACK_TEMP -thresholds 42000 -thresholds_clr 40000 -actions report -action_info 1 - -[DETECT-STANDBY] -algo_type virtual -trip_sensor skin-msm-therm-usr -thresholds -18000 -thersholds_clr -20000 -sensors cpu_utilization lcd_brightness_value -weights 16 50 -sampling 1000 -less_than -math 7 - -[OVERRIDE-CHG] -algo_type monitor -sampling 1000 -sensor DETECT-STANDBY -thresholds 1 -thresholds_clr 0 -actions internal_override -action_info 1 - -[FREEZE-CHG] -algo_type monitor -sampling 1000 -descending -sensor DETECT-STANDBY -thresholds 0 -thresholds_clr 1 -actions freeze_rule -action_info 1 - -[MON-MSM-STB] -algo_type monitor -sampling 1000 -sensor skin-msm-therm-usr -thresholds 38000 42000 49000 -thresholds_clr 35000 38000 42000 -actions battery battery battery -action_info 6 5 4 -freezing - -[MON-MSM-COMB1] -algo_type monitor -sampling 1000 -sensor BACK_TEMP -thresholds 35000 37000 38000 41000 43000 -thresholds_clr 32000 35000 37000 38000 41000 -actions battery battery battery battery battery -action_info 5 4 3 2 1 -override_c 10000 - -[MON-MSM-CPU0] -algo_type monitor -sampling 1000 -sensor BACK_TEMP -thresholds 43500 46000 49000 -thresholds_clr 42000 43500 46000 -actions cpu0 cpu0 cpu0 -action_info 1708800 1497600 1305600 - -[MON-MSM-CPU4] -algo_type monitor -sampling 1000 -sensor BACK_TEMP -thresholds 44000 45000 46000 48000 53000 -thresholds_clr 42000 44000 45000 47000 50000 -actions cpu4 cpu4 cpu4 cpu4 cpu4 -action_info 2227200 1996800 1881600 1766400 1440000 - -[MON-MSM-CPU7] -algo_type monitor -sampling 1000 -sensor BACK_TEMP -thresholds 40000 41000 42000 43000 44000 -thresholds_clr 38000 40000 41000 42000 43000 -actions cpu7 cpu7 cpu7 cpu7 cpu7 -action_info 2150400 1785600 1555200 1305600 1075200 - -[MON-MSM-GPU] -algo_type monitor -sampling 1000 -sensor BACK_TEMP -thresholds 42000 44000 47000 52000 -thresholds_clr 40000 42000 44000 48000 -actions gpu gpu gpu gpu -action_info 676000000 608000000 540000000 491000000 - -[MON-MODEM1] -algo_type monitor -sampling 5000 -sensor BACK_TEMP -thresholds 44500 -thresholds_clr 42000 -actions modem_skin -action_info 1 - -[MON-MODEM2] -algo_type monitor -sampling 5000 -sensor BACK_PATEMP1 -thresholds 49000 -thresholds_clr 47000 -actions modem_skin -action_info 2 - -[MON-MODEM3] -algo_type monitor -sampling 5000 -sensor BACK_PATEMP2 -thresholds 49000 -thresholds_clr 47000 -actions modem_skin -action_info 2 - -[MON-PA-FR1] -algo_type monitor -sampling 5000 -sensor BACK_TEMP -thresholds 46000 -thresholds_clr 44000 -actions modem_pa_fr1 -action_info 1 diff --git a/device.mk b/device.mk index f842ae1..4c5aa4f 100644 --- a/device.mk +++ b/device.mk @@ -10,38 +10,34 @@ TARGET_IS_VAB := true # Boot animation -TARGET_SCREEN_HEIGHT := 2400 -TARGET_SCREEN_WIDTH := 1080 +TARGET_SCREEN_HEIGHT := 1600 +TARGET_SCREEN_WIDTH := 720 # Screen -TARGET_SCREEN_DENSITY := 400 +TARGET_SCREEN_DENSITY := 280 # AAPT PRODUCT_AAPT_CONFIG := normal -PRODUCT_AAPT_PREF_CONFIG := 400dpi +PRODUCT_AAPT_PREF_CONFIG := 420dpi PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi PRODUCT_SHIPPING_API_LEVEL := 30 -# Inherit from motorola sm7325-common -$(call inherit-product, device/motorola/sm7325-common/common.mk) +# Inherit from motorola sm6375-common +$(call inherit-product, device/motorola/sm6375-common/common.mk) # Overlays PRODUCT_PACKAGES += \ - FrameworksResXpeng \ - LineageApertureAppXpeng \ - LineagePlatformXpeng \ - LineageSystemUIXpeng \ - SettingsProviderResXpeng \ - SystemUIResXpeng + FrameworksResFogos \ + LineageSystemUIFogos \ + SettingsProviderResFogos \ + SystemUIResFogos \ + WifiResFogos # Audio PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/sku_lahaina/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_lahaina/audio_io_policy.conf \ - $(LOCAL_PATH)/audio/sku_lahaina/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_lahaina/audio_platform_info.xml \ - $(LOCAL_PATH)/audio/sku_lahaina/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_lahaina/mixer_paths.xml \ - $(LOCAL_PATH)/audio/sku_lahaina/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_lahaina/sound_trigger_mixer_paths.xml \ - $(LOCAL_PATH)/audio/sku_lahaina/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_lahaina/sound_trigger_platform_info.xml \ + $(LOCAL_PATH)/audio/sku_holi/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/audio_platform_info.xml \ + $(LOCAL_PATH)/audio/sku_holi/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/mixer_paths.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 \ @@ -50,7 +46,7 @@ PRODUCT_COPY_FILES += \ # Fingerprint PRODUCT_PACKAGES += \ - android.hardware.biometrics.fingerprint@2.1-service.xpeng \ + android.hardware.biometrics.fingerprint@2.1-service.fogos \ com.motorola.hardware.biometric.fingerprint@1.0.vendor $(foreach f,$(wildcard $(LOCAL_PATH)/configs/idc/*.idc),\ @@ -66,44 +62,42 @@ $(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))) -# Init (recovery) -PRODUCT_PACKAGES += \ - init.recovery.xpeng.rc \ - load_touch.sh +# Keylayout +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/idc/uinput-fpc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-fpc.idc \ + $(LOCAL_PATH)/configs/idc/uinput_nav.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput_nav.idc \ + $(LOCAL_PATH)/configs/keylayout/uinput-fpc.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-fpc.kl \ + $(LOCAL_PATH)/configs/keylayout/uinput_nav.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput_nav.kl # Lineage Touch PRODUCT_PACKAGES += \ - vendor.lineage.touch@1.0-service.xpeng - -# Lights -PRODUCT_PACKAGES += \ - android.hardware.lights-service.xpeng + vendor.lineage.touch@1.0-service.fogos # NFC PRODUCT_PACKAGES += \ android.hardware.nfc@1.2.vendor \ - android.hardware.nfc@1.2-service.st \ + android.hardware.nfc@1.2-service.samsung \ + nfc_nci_samsung \ + SecureElement \ android.hardware.secure_element@1.2.vendor \ com.android.nfc_extras \ libchrome.vendor \ - Tag \ - nfc_nci.st21nfc.default + Tag # Permissions PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \ frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ + frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \ + frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml # Sensors PRODUCT_PACKAGES += \ - sensors.xpeng + sensors.fogos PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf -# Thermal -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/thermal-engine-xpeng-game-perf.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-xpeng.conf - # Inherit from vendor blobs -$(call inherit-product, vendor/motorola/xpeng/xpeng-vendor.mk) +$(call inherit-product, vendor/motorola/fogos/fogos-vendor.mk) diff --git a/extract-files.sh b/extract-files.sh index 53542e0..3d364be 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -14,8 +14,8 @@ fi set -e -export DEVICE=xpeng -export DEVICE_COMMON=sm7325-common +export DEVICE=fogos +export DEVICE_COMMON=sm6375-common export VENDOR=motorola "./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@" diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp index be4e566..49ecc3c 100644 --- a/fingerprint/Android.bp +++ b/fingerprint/Android.bp @@ -4,9 +4,9 @@ // SPDX-License-Identifier: Apache-2.0 // cc_binary { - name: "android.hardware.biometrics.fingerprint@2.1-service.xpeng", - vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.xpeng.xml"], - init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xpeng.rc"], + name: "android.hardware.biometrics.fingerprint@2.1-service.fogos", + vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.fogos.xml"], + init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.fogos.rc"], defaults: ["hidl_defaults"], relative_install_path: "hw", srcs: ["service.cpp", "BiometricsFingerprint.cpp"], diff --git a/fingerprint/BiometricsFingerprint.cpp b/fingerprint/BiometricsFingerprint.cpp index 4a8de31..3a06cef 100644 --- a/fingerprint/BiometricsFingerprint.cpp +++ b/fingerprint/BiometricsFingerprint.cpp @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xpeng" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.fogos" #include "BiometricsFingerprint.h" diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xpeng.rc b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.fogos.rc similarity index 92% rename from fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xpeng.rc rename to fingerprint/android.hardware.biometrics.fingerprint@2.1-service.fogos.rc index 63b1774..c4cec11 100644 --- a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xpeng.rc +++ b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.fogos.rc @@ -1,4 +1,4 @@ -service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xpeng +service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.fogos interface android.hardware.biometrics.fingerprint@2.1::IBiometricsFingerprint default oneshot # "class hal" causes a race condition on some devices due to files created diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xpeng.xml b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.fogos.xml similarity index 100% rename from fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xpeng.xml rename to fingerprint/android.hardware.biometrics.fingerprint@2.1-service.fogos.xml diff --git a/fingerprint/service.cpp b/fingerprint/service.cpp index 5760589..97b9fc0 100644 --- a/fingerprint/service.cpp +++ b/fingerprint/service.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xpeng" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.fogos" #include #include diff --git a/lights/Android.bp b/lights/Android.bp deleted file mode 100644 index 197080f..0000000 --- a/lights/Android.bp +++ /dev/null @@ -1,33 +0,0 @@ -// -// Copyright (C) 2019-2020 The LineageOS Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -cc_binary { - name: "android.hardware.lights-service.xpeng", - relative_install_path: "hw", - init_rc: ["android.hardware.lights.xpeng.rc"], - vintf_fragments: ["android.hardware.lights.xpeng.xml"], - vendor: true, - shared_libs: [ - "libbase", - "liblog", - "libhardware", - "libbinder_ndk", - "android.hardware.light-V1-ndk", - ], - srcs: [ - "Lights.cpp", - "main.cpp", - ], -} diff --git a/lights/Lights.cpp b/lights/Lights.cpp deleted file mode 100644 index 71678ab..0000000 --- a/lights/Lights.cpp +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * Copyright (C) 2020-2022 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "android.hardware.lights-service.xpeng" - -#include "Lights.h" -#include -#include - -/* clang-format off */ -#define PPCAT_NX(A, B) A/B -#define PPCAT(A, B) PPCAT_NX(A, B) -#define STRINGIFY_INNER(x) #x -#define STRINGIFY(x) STRINGIFY_INNER(x) - -#define CHARGING_ATTR(x) STRINGIFY(PPCAT(/sys/class/leds/charging, x)) -/* clang-format on */ - -namespace aidl { -namespace android { -namespace hardware { -namespace light { - -namespace { - -// Write value to path and close file. -template -inline bool WriteToFile(const std::string& path, T content) { - return ::android::base::WriteStringToFile(std::to_string(content), path); -} - -uint32_t RgbaToBrightness(uint32_t color) { - // Extract brightness from AARRGGBB. - uint32_t alpha = (color >> 24) & 0xFF; - - // Retrieve each of the RGB colors - uint32_t red = (color >> 16) & 0xFF; - uint32_t green = (color >> 8) & 0xFF; - uint32_t blue = color & 0xFF; - - // Scale RGB colors if a brightness has been applied by the user - if (alpha != 0xFF && alpha != 0) { - red = red * alpha / 0xFF; - green = green * alpha / 0xFF; - blue = blue * alpha / 0xFF; - } - - return (77 * red + 150 * green + 29 * blue) >> 8; -} - -inline bool IsLit(uint32_t color) { - return color & 0x00ffffff; -} - -void ApplyNotificationState(const HwLightState& state) { - bool blink = state.flashOnMs > 0 && state.flashOffMs > 0; - bool ok = false; - - switch (state.flashMode) { - case FlashMode::HARDWARE: - ok = WriteToFile(CHARGING_ATTR(breath), blink); - // fallback to timed blinking if breath is not supported - if (ok) break; - FALLTHROUGH_INTENDED; - case FlashMode::TIMED: - ok = WriteToFile(CHARGING_ATTR(delay_off), state.flashOffMs); - ok &= WriteToFile(CHARGING_ATTR(delay_on), state.flashOnMs); - // fallback to constant on if timed blinking is not supported - if (ok) break; - FALLTHROUGH_INTENDED; - case FlashMode::NONE: - default: - ok = WriteToFile(CHARGING_ATTR(brightness), RgbaToBrightness(state.color)); - break; - } - - LOG(DEBUG) << __func__ << ": mode=" << toString(state.flashMode) << ", colorRGB=" << std::hex - << state.color << std::dec << ", onMS=" << state.flashOnMs - << ", offMS=" << state.flashOffMs << ", ok=" << ok; -} - -} // anonymous namespace - -ndk::ScopedAStatus Lights::setLightState(int id, const HwLightState& state) { - static_assert(kAvailableLights.size() == std::tuple_size_v); - - if (id == static_cast(LightType::BACKLIGHT)) { - // Stub backlight handling - return ndk::ScopedAStatus::ok(); - } - - // Update saved state first - bool found = false; - for (size_t i = 0; i < notif_states_.size(); ++i) { - if (kAvailableLights[i].id == id) { - notif_states_[i] = state; - LOG(DEBUG) << __func__ << ": updating id=" << id - << ", type=" << toString(kAvailableLights[i].type); - found = true; - break; - } - } - if (!found) { - LOG(ERROR) << "Light not supported"; - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); - } - - // Lit up in order or fallback to battery light if others are dim - for (size_t i = 0; i < notif_states_.size(); ++i) { - auto&& cur_state = notif_states_[i]; - auto&& cur_light = kAvailableLights[i]; - if (IsLit(cur_state.color) || cur_light.type == LightType::BATTERY) { - LOG(DEBUG) << __func__ << ": applying id=" << cur_light.id - << ", type=" << toString(cur_light.type); - ApplyNotificationState(cur_state); - break; - } - } - - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus Lights::getLights(std::vector* lights) { - lights->insert(lights->end(), kAvailableLights.begin(), kAvailableLights.end()); - // We don't handle backlight but still need to report as supported. - lights->push_back({static_cast(LightType::BACKLIGHT), 0, LightType::BACKLIGHT}); - return ndk::ScopedAStatus::ok(); -} - -} // namespace light -} // namespace hardware -} // namespace android -} // namespace aidl diff --git a/lights/Lights.h b/lights/Lights.h deleted file mode 100644 index 323b878..0000000 --- a/lights/Lights.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * Copyright (C) 2020-2022 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include -#include - -namespace aidl { -namespace android { -namespace hardware { -namespace light { - -// Keep sorted in the order of priority. -constexpr std::array kAvailableLights = { - // id, ordinal, type - HwLight{static_cast(LightType::NOTIFICATIONS), 0, LightType::NOTIFICATIONS}, - HwLight{static_cast(LightType::BATTERY), 0, LightType::BATTERY}, -}; - -class Lights : public BnLights { - public: - ndk::ScopedAStatus setLightState(int id, const HwLightState& state) override; - ndk::ScopedAStatus getLights(std::vector* types) override; - - private: - std::array notif_states_; -}; - -} // namespace light -} // namespace hardware -} // namespace android -} // namespace aidl diff --git a/lights/android.hardware.lights.xpeng.rc b/lights/android.hardware.lights.xpeng.rc deleted file mode 100644 index e754bfc..0000000 --- a/lights/android.hardware.lights.xpeng.rc +++ /dev/null @@ -1,20 +0,0 @@ -service vendor.light /vendor/bin/hw/android.hardware.lights-service.xpeng - class hal - user system - group system - shutdown critical - -on boot - # Change ownership and permission for leds backlight - chown system system /sys/class/leds/charging/breath - chmod 0664 /sys/class/leds/charging/breath - chown system system /sys/class/leds/charging/brightness - chmod 0664 /sys/class/leds/charging/brightness - chown system system /sys/class/leds/charging/delay_off - chmod 0664 /sys/class/leds/charging/delay_off - chown system system /sys/class/leds/charging/delay_on - chmod 0664 /sys/class/leds/charging/delay_on - - # change permission of red leds - chown system system /sys/class/leds/red/brightness - chmod 0664 /sys/class/leds/red/brightness diff --git a/lights/android.hardware.lights.xpeng.xml b/lights/android.hardware.lights.xpeng.xml deleted file mode 100644 index db604d6..0000000 --- a/lights/android.hardware.lights.xpeng.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - android.hardware.light - ILights/default - - diff --git a/lights/main.cpp b/lights/main.cpp deleted file mode 100644 index 8509bfb..0000000 --- a/lights/main.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include "Lights.h" - -using ::aidl::android::hardware::light::Lights; - -int main() { - ABinderProcess_setThreadPoolMaxThreadCount(0); - std::shared_ptr lights = ndk::SharedRefBase::make(); - if (!lights) { - return EXIT_FAILURE; - } - - const std::string instance = std::string() + Lights::descriptor + "/default"; - binder_status_t status = AServiceManager_addService(lights->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); - - ABinderProcess_joinThreadPool(); - return EXIT_FAILURE; // should not reached -} diff --git a/lineage.dependencies b/lineage.dependencies index 76799e5..46ea689 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_sm6375-common", + "target_path": "device/motorola/sm6375-common" } ] diff --git a/lineage_xpeng.mk b/lineage_fogos.mk similarity index 58% rename from lineage_xpeng.mk rename to lineage_fogos.mk index 8c9bdd4..deb3ded 100644 --- a/lineage_xpeng.mk +++ b/lineage_fogos.mk @@ -8,22 +8,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 xpeng device -$(call inherit-product, device/motorola/xpeng/device.mk) +# Inherit from fogos device +$(call inherit-product, device/motorola/fogos/device.mk) # Inherit some common Lineage stuff. $(call inherit-product, vendor/lineage/config/common_full_phone.mk) -PRODUCT_NAME := lineage_xpeng -PRODUCT_DEVICE := xpeng +PRODUCT_NAME := lineage_fogos +PRODUCT_DEVICE := fogos PRODUCT_MANUFACTURER := motorola PRODUCT_BRAND := motorola -PRODUCT_MODEL := moto g200 5G +PRODUCT_MODEL := moto g34 5G PRODUCT_GMS_CLIENTID_BASE := android-motorola PRODUCT_BUILD_PROP_OVERRIDES += \ - TARGET_PRODUCT=xpeng_retail \ - PRIVATE_BUILD_DESC="xpeng_g-user 12 S1RXS32.50-13-25 5fb68-c44485 release-keys" + TARGET_PRODUCT=fogos_g \ + PRIVATE_BUILD_DESC="fogos_g-user 14 U1UG34M.23-82-2 e82316 release-keys" -BUILD_FINGERPRINT := motorola/xpeng_g/xpeng:12/S1RXS32.50-13-25/5fb68-c44485:user/release-keys +BUILD_FINGERPRINT := motorola/fogos_g/fogos:14/U1UG34M.23-82-2/e82316:user/release-keys diff --git a/manifest_xpeng.xml b/manifest_fogos.xml similarity index 100% rename from manifest_xpeng.xml rename to manifest_fogos.xml diff --git a/modules.blocklist b/modules.blocklist index c76dcbb..a5615ce 100644 --- a/modules.blocklist +++ b/modules.blocklist @@ -84,9 +84,6 @@ blocklist vmw_vsock_virtio_transport blocklist vmw_vsock_virtio_transport_common blocklist vsock_diag blocklist vsock -blocklist qca_cld3_wlan -blocklist qca_cld3_qca6390 -blocklist wlan blocklist torture blocklist locktorture blocklist rcutorture @@ -94,16 +91,21 @@ blocklist rcutorture # # Motorola platform module block list # - blocklist utags +blocklist watchdogtest +blocklist moto_f_usbnet # Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. # # Motorola product module block list +# + blocklist goodix_fod_mmi blocklist fpc1020_mmi -blocklist rbs_fps_mmi -blocklist watchdogtest -blocklist moto_f_usbnet +blocklist qpnp_adaptive_charge +blocklist nova_0flash_mmi blocklist leds_aw99703 blocklist leds_lm3697 -# +blocklist focaltech_0flash_v2_mmi +blocklist mmi_smbcharger_iio +blocklist chipone_tddi_v2_mmi +blocklist ilitek_v3_mmi diff --git a/modules.load b/modules.load index 1529893..e9a2a0e 100644 --- a/modules.load +++ b/modules.load @@ -1,106 +1,66 @@ -qm1d1b0004.ko +sec_nfc.ko +lzo_decompress.ko wcd9xxx_dlkm.ko -tuner-simple.ko -fc2580.ko q6_pdr_dlkm.ko -tuner-xc2028.ko apr_dlkm.ko -slimbus.ko -mc44s803.ko adsp_loader_dlkm.ko bolero_cdc_dlkm.ko -swr_dmic_dlkm.ko -tuner-types.ko wcd937x_dlkm.ko btpower.ko -llcc_perfmon.ko -hdmi_dlkm.ko +lzo.ko tx_macro_dlkm.ko -tea5761.ko native_dlkm.ko -radio-i2c-rtc6226-qca.ko -tea5767.ko q6_dlkm.ko -r820t.ko wcd937x_slave_dlkm.ko mbhc_dlkm.ko bt_fm_slim.ko camera.ko q6_notifier_dlkm.ko -mxl5005s.ko wcd938x_dlkm.ko -m88rs6000t.ko -tda18218.ko -mt2063.ko +wsa881x_analog_dlkm.ko +lzo_compress.ko rdbg.ko -mt2060.ko -fc0013.ko -xc4000.ko stub_dlkm.ko -qm1d1c0042.ko -qt1010.ko -tda18250.ko -e4000.ko -it913x.ko -hid-aksys.ko -wsa883x_dlkm.ko -pinctrl_wcd_dlkm.ko -fc0012.ko -max2165.ko -xc5000.ko -aw882xx_k504.ko +lzo-rle.ko +zram.ko +aw882xx_acf.ko swr_dlkm.ko rx_macro_dlkm.ko pinctrl_lpi_dlkm.ko wcd938x_slave_dlkm.ko -wsa_macro_dlkm.ko machine_dlkm.ko wcd_core_dlkm.ko va_macro_dlkm.ko +aw882xx_k419.ko swr_ctrl_dlkm.ko -tua9001.ko platform_dlkm.ko -msm_drm.ko -fc0011.ko -tda9887.ko -si2157.ko -swr_haptics_dlkm.ko -msi001.ko -mxl301rf.ko -qcom_edac.ko +fs1815_dlkm.ko snd_event_dlkm.ko -mt2266.ko -mt20xx.ko -tda18212.ko -mxl5007t.ko -slimbus-ngd.ko -mt2131.ko +wlan.ko rmnet_core.ko rmnet_ctl.ko rmnet_offload.ko rmnet_shs.ko utags.ko +mmi_relay.ko mmi_info.ko mmi_annotate.ko sensors_class.ko -watchdogtest.ko exfat.ko -bm_adsp_ulog.ko -mmi_charger.ko -qti_glink_charger.ko -qpnp_adaptive_charge.ko -mmi_relay.ko -wl2866d.ko -cci_intf.ko -leds_aw99703.ko -leds_lm3697.ko -touchscreen_mmi.ko -nova_0flash_mmi.ko -st21nfc.ko moto_f_usbnet.ko -sx937x_sar.ko -mmi_sys_temp.ko -aw37501.ko -fpc1020_mmi.ko +watchdogtest.ko +qpnp_adaptive_charge.ko goodix_fod_mmi.ko -rbs_fps_mmi.ko +fpc1020_mmi.ko +sensors_class.ko +mmi_relay.ko +sx937x_sar.ko +awinic_sar.ko +mmi_sys_temp.ko +ldo_vibrator_mmi.ko +cci_intf.ko +mmi-smbcharger-iio.ko +chipone_tddi_v2_mmi.ko +ilitek_v3_mmi.ko +moto_mm.ko +moto_swap.ko diff --git a/modules.load.recovery b/modules.load.recovery index 4e2dacc..2eb6a15 100644 --- a/modules.load.recovery +++ b/modules.load.recovery @@ -1,7 +1,12 @@ -msm_drm.ko +utags.ko mmi_relay.ko -sensors_class.ko -touchscreen_mmi.ko -mmi_annotate.ko mmi_info.ko -nova_0flash_mmi.ko +mmi_annotate.ko +sensors_class.ko +moto_f_usbnet.ko +watchdogtest.ko +qpnp_adaptive_charge.ko +sensors_class.ko +ilitek_v3_mmi.ko +mmi_sys_temp.ko +mmi-smbcharger-iio.ko diff --git a/proprietary-files.txt b/proprietary-files.txt index 28b9c1f..9c5bde6 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,6 +1,15 @@ -# All unpinned blobs below are extracted from xpeng_g-user 12 S1RXS32.50-13-25 5fb68-c44485 release-keys - RETEU variant. +# All unpinned blobs are extracted from fogos_g-user 14 U1UG34M.23-82-2 e82316 release-keys -# ACDB Data +# ACDB-data +vendor/etc/acdbdata/nn_ns_models/candidate__2.7.1.31__3.0.0__eai_1.10_enpu1.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.0.0_0.1__3.0.0_0.0__eai_1.00.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.2.0_0.1__3.0.0_0.0__eai_1.00.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.6.1_0.0__eai_v1.10.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.6.3_0.0__3.0.0_0.0__eai_1.10.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.6.3_0.0__3.0.0_0.0__eai_1.10_enpu1.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.6.3_0.0__3.0.0_0.0__eai_1.36_enpu2.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.7.4_0.0__3.0.0_0.0__eai_1.10_enpu1.pmd +vendor/etc/acdbdata/nn_vad_models/fai_3.0.0_0.0_eai_1.00.pmd vendor/etc/acdbdata/Bluetooth_cal.acdb vendor/etc/acdbdata/General_cal.acdb vendor/etc/acdbdata/Global_cal.acdb @@ -9,144 +18,46 @@ vendor/etc/acdbdata/Hdmi_cal.acdb vendor/etc/acdbdata/Headset_cal.acdb vendor/etc/acdbdata/Speaker_cal.acdb vendor/etc/acdbdata/adsp_avs_config.acdb -vendor/etc/acdbdata/nn_ns_models/candidate__2.7.1.31__3.0.0__eai_1.10_enpu1.pmd -vendor/etc/acdbdata/nn_ns_models/fai__2.0.0_0.1__3.0.0_0.0__eai_1.00.pmd -vendor/etc/acdbdata/nn_ns_models/fai__2.2.0_0.1__3.0.0_0.0__eai_1.00.pmd -vendor/etc/acdbdata/nn_ns_models/fai__2.6.1_0.0__eai_v1.10.pmd -vendor/etc/acdbdata/nn_ns_models/fai__2.6.3_0.0__3.0.0_0.0__eai_1.10_enpu1.pmd -vendor/etc/acdbdata/nn_ns_models/fai__2.7.4_0.0__3.0.0_0.0__eai_1.10_enpu1.pmd -vendor/etc/acdbdata/nn_vad_models/fai_3.0.0_0.0_eai_1.00.pmd - -# Audio firmware -vendor/firmware/aw882xx_afe_params.bin -vendor/firmware/aw882xx_mono.bin -vendor/firmware/aw882xx_pid_1852_acf.bin -vendor/firmware/aw882xx_pid_2113_acf.bin -vendor/firmware/aw882xx_spk_reg.bin # Audio libraries vendor/lib/libacdbloader.so vendor/lib64/libacdbloader.so # Camera +vendor/etc/bst_3ddns_1.cfg +vendor/etc/bst_3ddns_2.cfg +vendor/etc/bst_3ddns_3.cfg +vendor/etc/bstconfig/hdrcfg.cfg vendor/etc/pwr/PowerFeatureConfig.xml vendor/etc/pwr/VideoPowerOptFeature.xml -vendor/lib/camera/fdconfigpreview.bin -vendor/lib/camera/fdconfigpreviewlite.bin -vendor/lib/camera/fdconfigvideo.bin -vendor/lib/camera/fdconfigvideolite.bin -vendor/lib/com.qti.chiusecaseselector.so -vendor/lib/com.qti.settings.kamorta.so -vendor/lib/com.qti.settings.kodiak.so -vendor/lib/com.qti.settings.mannar.so -vendor/lib/com.qti.settings.sdm865.so -vendor/lib/com.qti.settings.sm8350.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.policy.mfl.so -vendor/lib/com.qualcomm.qti.mcx.usecase.extension.so -vendor/lib/hw/camera.qcom.so -vendor/lib/hw/com.qti.chi.override.so -vendor/lib/libFace3DTA.so -vendor/lib/libFace3D_hlos.so -vendor/lib/libQ6MSFR_manager_stub.so -vendor/lib/libaidenoiser.so -vendor/lib/libaidenoiserv2.so -vendor/lib/libarcsoft_distortion_correction.so -vendor/lib/libarcsoft_dualcam_refocus_image.so -vendor/lib/libarcsoft_dualcam_refocus_video.so -vendor/lib/libarcsoft_portrait_distortion_correction.so +vendor/lib/libcamxexternalformatutils.so +vendor/lib64/libC2D2.so +vendor/lib64/libc2d_helper.so vendor/lib/libbitmlengine.so vendor/lib/libbitmlenginev2.so -vendor/lib/libc2d_helper.so -vendor/lib/libcamera_nn_stub.so -vendor/lib/libcamerapostproc.so +vendor/lib64/libhdr_impl.so vendor/lib/libcamxexternalformatutils.so -vendor/lib/libcamxfacialfeatures.so -vendor/lib/libcamxfdalgo.so -vendor/lib/libcamxfdengine.so -vendor/lib/libcamxifestriping.so -vendor/lib/libcamximageformatutils.so -vendor/lib/libcamxqsatalgo.so -vendor/lib/libcamxstatscore.so -vendor/lib/libcamxswispiqmodule.so -vendor/lib/libcamxswprocessalgo.so -vendor/lib/libcamxtintlessalgo.so -vendor/lib/libchilog.so -vendor/lib/libcom.qti.chinodeutils.so -vendor/lib/libface3d_dev.so -vendor/lib/libipebpsstriping.so -vendor/lib/libipebpsstriping170.so -vendor/lib/libjpege.so -vendor/lib/libmfec.so -vendor/lib/libmmcamera_bestats.so -vendor/lib/libmmcamera_cac3.so -vendor/lib/libmmcamera_faceproc.so -vendor/lib/libmmcamera_faceproc2.so -vendor/lib/libmmcamera_lscv35.so -vendor/lib/libmmcamera_mfnr.so -vendor/lib/libmmcamera_mfnr_t4.so -vendor/lib/libmmcamera_pdpc.so -vendor/lib/libmot_afd.so -vendor/lib/libmot_chi_desktop_helper.so -vendor/lib/libmot_engine_settings.so -vendor/lib/libmotext_inf.so -vendor/lib/libmpbase.so -vendor/lib/libofflinedump.so -vendor/lib/libofflinelog.so -vendor/lib/libopencv.so -vendor/lib/libopestriping.so -vendor/lib/libos.so -vendor/lib/libpowercore.so -vendor/lib/libqll10.so -vendor/lib/libqllengine.so -vendor/lib/libswregistrationalgo.so -vendor/lib/libsynx.so -vendor/lib/libtfestriping.so -vendor/lib/libthreadutils.so -vendor/lib/libvideooptfeature.so -vendor/lib/libvideoutils.so -vendor/lib/libvidhance.so -vendor/lib/libvidhance_active_ois.so -vendor/lib/libvidhance_dmbr.so -vendor/lib/libvidhance_face_stabilizer.so -vendor/lib/libvidhance_fbc.so -vendor/lib/libvidhance_horizon_correction.so -vendor/lib/libvidhance_stabilizer.so -vendor/lib/libvidhance_zoom_stabilization.so -vendor/lib/vendor.qti.hardware.camera.postproc@1.0-service-impl.so vendor/lib64/camera/fdconfigpreview.bin vendor/lib64/camera/fdconfigpreviewlite.bin vendor/lib64/camera/fdconfigvideo.bin vendor/lib64/camera/fdconfigvideolite.bin +vendor/lib64/hw/camera.qcom.so +vendor/lib64/hw/com.qti.chi.override.so vendor/lib64/com.qti.chiusecaseselector.so -vendor/lib64/com.qti.settings.kamorta.so -vendor/lib64/com.qti.settings.kodiak.so vendor/lib64/com.qti.settings.mannar.so -vendor/lib64/com.qti.settings.sdm865.so -vendor/lib64/com.qti.settings.sm8350.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.policy.mfl.so vendor/lib64/com.qualcomm.qti.mcx.usecase.extension.so -vendor/lib64/hw/camera.qcom.so -vendor/lib64/hw/com.qti.chi.override.so -vendor/lib64/libFace3DTA.so -vendor/lib64/libFace3D_hlos.so -vendor/lib64/libQ6MSFR_manager_stub.so vendor/lib64/libaidenoiser.so vendor/lib64/libaidenoiserv2.so -vendor/lib64/libarcsoft_distortion_correction.so -vendor/lib64/libarcsoft_dual_sat.so -vendor/lib64/libarcsoft_dual_zoomtranslator.so -vendor/lib64/libarcsoft_dualcam_refocus_image.so -vendor/lib64/libarcsoft_dualcam_refocus_video.so -vendor/lib64/libarcsoft_portrait_distortion_correction.so vendor/lib64/libbitmlengine.so vendor/lib64/libbitmlenginev2.so -vendor/lib64/libc2d_helper.so +vendor/lib64/libBST3DDNS.so +vendor/lib64/libBSTHDRDETECT.so +vendor/lib64/libBSTMultiExpoGainHDR.so +vendor/lib64/libBSTNodeUtils.so vendor/lib64/libcamera_nn_stub.so vendor/lib64/libcamerapostproc.so vendor/lib64/libcamxexternalformatutils.so @@ -162,12 +73,18 @@ vendor/lib64/libcamxswprocessalgo.so vendor/lib64/libcamxtintlessalgo.so vendor/lib64/libchilog.so vendor/lib64/libcom.qti.chinodeutils.so -vendor/lib64/libdualcam_optical_zoom_control.so -vendor/lib64/libdualcam_video_optical_zoom.so -vendor/lib64/libface3d_dev.so vendor/lib64/libipebpsstriping.so vendor/lib64/libipebpsstriping170.so vendor/lib64/libjpege.so +vendor/lib64/libarcsoft_chi_utils.so +vendor/lib64/libarcsoft_portrait_super_night_se_raw.so +vendor/lib64/libarcsoft_super_night_raw.so +vendor/lib64/libarcsoft_super_night_se_raw.so +vendor/lib64/libportrait_repair_ppl3_ocl.so +vendor/lib64/libmot_chi_desktop_helper.so +vendor/lib64/libmot_engine_settings.so +vendor/lib64/liblowlight_ai_portrait.arcsoft.so +vendor/lib64/libmctfengine_stub.so vendor/lib64/libmfec.so vendor/lib64/libmmcamera_bestats.so vendor/lib64/libmmcamera_cac3.so @@ -178,9 +95,6 @@ vendor/lib64/libmmcamera_mfnr.so vendor/lib64/libmmcamera_mfnr_t4.so vendor/lib64/libmmcamera_pdpc.so vendor/lib64/libmot_afd.so -vendor/lib64/libmot_chi_desktop_helper.so -vendor/lib64/libmot_engine_settings.so -vendor/lib64/libmotext_inf.so vendor/lib64/libmotohid.so vendor/lib64/libmpbase.so vendor/lib64/libofflinedump.so @@ -191,86 +105,30 @@ vendor/lib64/libos.so vendor/lib64/libpowercore.so vendor/lib64/libqll10.so vendor/lib64/libqllengine.so +vendor/lib64/libremosaic_wrapper.so vendor/lib64/libswregistrationalgo.so vendor/lib64/libsynx.so vendor/lib64/libtfestriping.so vendor/lib64/libthreadutils.so -vendor/lib64/libvideooptfeature.so vendor/lib64/libvidhance.so -vendor/lib64/libvidhance_active_ois.so -vendor/lib64/libvidhance_dmbr.so -vendor/lib64/libvidhance_face_stabilizer.so -vendor/lib64/libvidhance_fbc.so -vendor/lib64/libvidhance_horizon_correction.so -vendor/lib64/libvidhance_stabilizer.so -vendor/lib64/libvidhance_zoom_stabilization.so vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so +vendor/lib64/vendor.qti.hardware.scve.objecttracker@1.0.so +vendor/lib64/vendor.qti.hardware.scve.panorama@1.0.so + +# Camera - Motorola +vendor/etc/init/motorola.hardware.camera.imgtuner@2.0-service.rc +vendor/lib64/hw/motorola.hardware.camera.imgtuner@2.0-impl.so +vendor/lib64/motorola.hardware.camera.imgtuner@1.0.so +vendor/lib64/motorola.hardware.camera.imgtuner@2.0.so +vendor/lib64/motorola.hardware.camera.desktop@1.0.so +vendor/lib64/motorola.hardware.camera.desktop@2.0.so # Camera - Components -vendor/lib/camera/components/com.arcsoft.node.capturebokeh.so -vendor/lib/camera/components/com.arcsoft.node.realtimebokeh.so -vendor/lib/camera/components/com.mot.node.c2d.so -vendor/lib/camera/components/com.mot.node.dc_capture.so -vendor/lib/camera/components/com.mot.node.dc_preview.so -vendor/lib/camera/components/com.qti.camx.chiiqutils.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 -vendor/lib/camera/components/com.qti.hvx.binning.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.dewarp.so -vendor/lib/camera/components/com.qti.node.dummyrtb.so -vendor/lib/camera/components/com.qti.node.dummysat.so -vendor/lib/camera/components/com.qti.node.eisv2.so -vendor/lib/camera/components/com.qti.node.eisv3.so -vendor/lib/camera/components/com.qti.node.fcv.so -vendor/lib/camera/components/com.qti.node.formatconversion.so -vendor/lib/camera/components/com.qti.node.gpu.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.remosaic.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 -vendor/lib/camera/components/com.qti.node.swcac.so -vendor/lib/camera/components/com.qti.node.swec.so -vendor/lib/camera/components/com.qti.node.swfusion.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.stats.aec.so -vendor/lib/camera/components/com.qti.stats.aecwrapper.so -vendor/lib/camera/components/com.qti.stats.aecxcore.so -vendor/lib/camera/components/com.qti.stats.af.so -vendor/lib/camera/components/com.qti.stats.afd.so -vendor/lib/camera/components/com.qti.stats.afwrapper.so -vendor/lib/camera/components/com.qti.stats.asd.so -vendor/lib/camera/components/com.qti.stats.awb.so -vendor/lib/camera/components/com.qti.stats.awbwrapper.so -vendor/lib/camera/components/com.qti.stats.cnndriver.so -vendor/lib/camera/components/com.qti.stats.haf.so -vendor/lib/camera/components/com.qti.stats.hafoverride.so -vendor/lib/camera/components/com.qti.stats.pdlib.so -vendor/lib/camera/components/com.qti.stats.pdlibsony.so -vendor/lib/camera/components/com.qti.stats.pdlibwrapper.so -vendor/lib/camera/components/com.qti.stats.tracker.so -vendor/lib/camera/components/com.qtistatic.stats.aec.so -vendor/lib/camera/components/com.qtistatic.stats.af.so -vendor/lib/camera/components/com.qtistatic.stats.awb.so -vendor/lib/camera/components/com.qtistatic.stats.pdlib.so -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.capturebokeh.so -vendor/lib64/camera/components/com.arcsoft.node.realtimebokeh.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.bst.node.hdrdetect.so +vendor/lib64/camera/components/com.bst.node.mfnr.so +vendor/lib64/camera/components/com.bst.node.yuvhdr.so vendor/lib64/camera/components/com.mot.node.c2d.so -vendor/lib64/camera/components/com.mot.node.dc_capture.so -vendor/lib64/camera/components/com.mot.node.dc_preview.so vendor/lib64/camera/components/com.qti.camx.chiiqutils.so vendor/lib64/camera/components/com.qti.eisv2.so vendor/lib64/camera/components/com.qti.eisv3.so @@ -293,8 +151,6 @@ 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 vendor/lib64/camera/components/com.qti.node.swcac.so -vendor/lib64/camera/components/com.qti.node.swec.so -vendor/lib64/camera/components/com.qti.node.swfusion.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 @@ -316,187 +172,120 @@ vendor/lib64/camera/components/com.qti.stats.hafoverride.so vendor/lib64/camera/components/com.qti.stats.pdlib.so vendor/lib64/camera/components/com.qti.stats.pdlibsony.so vendor/lib64/camera/components/com.qti.stats.pdlibwrapper.so -vendor/lib64/camera/components/com.qti.stats.tracker.so vendor/lib64/camera/components/com.qtistatic.stats.aec.so vendor/lib64/camera/components/com.qtistatic.stats.af.so vendor/lib64/camera/components/com.qtistatic.stats.awb.so vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so vendor/lib64/camera/components/com.vidhance.node.ica.so vendor/lib64/camera/components/com.vidhance.node.processing.so -vendor/lib64/camera/components/com.vidhance.stats.aec_dmbr.so vendor/lib64/camera/components/libdepthmapwrapper_secure.so -# Camera - eeprom -vendor/lib/camera/com.mot.eeprom.mot_gt24p64b_hi1336_eeprom.so -vendor/lib/camera/com.mot.eeprom.mot_gt24p64b_ov16a1q_eeprom.so -vendor/lib/camera/com.mot.eeprom.mot_gt24p64e_s5khm2_eeprom.so -vendor/lib/camera/com.mot.eeprom.mot_ov02b1b_otp.so -vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_hi1336_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_ov16a1q_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_gt24p64e_s5khm2_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_ov02b1b_otp.so - -# Camera - etc -vendor/etc/camera/aec_golden_depth.bin -vendor/etc/camera/aec_golden_wide.bin -vendor/etc/camera/arcsoft_calibration_u_dc.bin -vendor/etc/camera/dual_golden_depth.bin -vendor/etc/camera/dual_golden_wide.bin -vendor/etc/camera/mot_engine_config.bin -vendor/etc/camera/vidhance_calibration -vendor/etc/camera/vidhance_calibration_2rd - # Camera - feature2 -vendor/lib/com.qti.feature2.anchorsync.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.kamorta.so -vendor/lib/com.qti.feature2.gs.kodiak.so -vendor/lib/com.qti.feature2.gs.mannar.so -vendor/lib/com.qti.feature2.gs.sdm865.so -vendor/lib/com.qti.feature2.gs.sm8350.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.so -vendor/lib/com.qti.feature2.ml.so -vendor/lib/com.qti.feature2.mux.so -vendor/lib/com.qti.feature2.qcfa.so -vendor/lib/com.qti.feature2.rawhdr.so -vendor/lib/com.qti.feature2.realtimeserializer.so -vendor/lib/com.qti.feature2.rt.so -vendor/lib/com.qti.feature2.rtmcx.so -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.anchorsync.so +vendor/lib64/com.qti.feature2.arcrawpro.so vendor/lib64/com.qti.feature2.demux.so -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.kamorta.so -vendor/lib64/com.qti.feature2.gs.kodiak.so vendor/lib64/com.qti.feature2.gs.mannar.so -vendor/lib64/com.qti.feature2.gs.sdm865.so -vendor/lib64/com.qti.feature2.gs.sm8350.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.so -vendor/lib64/com.qti.feature2.ml.so vendor/lib64/com.qti.feature2.mux.so -vendor/lib64/com.qti.feature2.qcfa.so vendor/lib64/com.qti.feature2.rawhdr.so vendor/lib64/com.qti.feature2.realtimeserializer.so vendor/lib64/com.qti.feature2.rt.so vendor/lib64/com.qti.feature2.rtmcx.so vendor/lib64/com.qti.feature2.serializer.so -vendor/lib64/com.qti.feature2.statsregeneration.so -vendor/lib64/com.qti.feature2.stub.so vendor/lib64/com.qti.feature2.swmf.so -# Camera - ICP -vendor/firmware/CAMERA_ICP.elf -vendor/firmware/CAMERA_ICP_170.elf +# Camera - etc +vendor/etc/camera/anc_detect_model +vendor/etc/camera/anc_track_model +vendor/etc/camera/mot_engine_config.bin +vendor/etc/camera/vidhance.lic +vendor/etc/camera/vidhance_calibration +vendor/etc/camera/vidhance_calibration_2rd -# Camera - Motorola -vendor/bin/hw/motorola.hardware.camera.desktop@2.0-service -vendor/etc/init/motorola.hardware.camera.desktop@2.0-service.rc -vendor/etc/init/motorola.hardware.camera.imgtuner@1.0-service.rc -vendor/lib/motorola.hardware.camera.desktop@1.0.so -vendor/lib/motorola.hardware.camera.desktop@2.0.so -vendor/lib64/motorola.hardware.camera.desktop@1.0.so -vendor/lib64/motorola.hardware.camera.desktop@2.0.so +# Camera - eeprom +vendor/lib64/camera/com.mot.eeprom.mot_gt24p256c_s5kjns_eeprom.so +vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_ov16a1q_eeprom.so +vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_s5k3p9_eeprom.so +vendor/lib64/camera/com.mot.eeprom.mot_sc202acs_otp.so # Camera - sensor -vendor/lib/camera/com.qti.sensor.mot_hi1336.so -vendor/lib/camera/com.qti.sensor.mot_ov02b1b.so -vendor/lib/camera/com.qti.sensor.mot_ov16a1q.so -vendor/lib/camera/com.qti.sensor.mot_s5khm2.so -vendor/lib64/camera/com.qti.sensor.mot_hi1336.so -vendor/lib64/camera/com.qti.sensor.mot_ov02b1b.so +vendor/lib64/camera/com.qti.flash.aw36514.so +vendor/lib64/camera/com.qti.flash.ocp81375.so vendor/lib64/camera/com.qti.sensor.mot_ov16a1q.so -vendor/lib64/camera/com.qti.sensor.mot_s5khm2.so - -# Camera - sensormodule -vendor/lib/camera/com.qti.sensormodule.mot_xpeng_hi1336_qtech.bin -vendor/lib/camera/com.qti.sensormodule.mot_xpeng_ov02b1b_sunwin.bin -vendor/lib/camera/com.qti.sensormodule.mot_xpeng_ov16a1q_qtech.bin -vendor/lib/camera/com.qti.sensormodule.mot_xpeng_s5khm2_qtech.bin -vendor/lib/camera/com.qti.sensormodule.mot_xpeng_s5khm2sd03_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_xpeng_hi1336_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_xpeng_ov02b1b_sunwin.bin -vendor/lib64/camera/com.qti.sensormodule.mot_xpeng_ov16a1q_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_xpeng_s5khm2_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_xpeng_s5khm2sd03_qtech.bin +vendor/lib64/camera/com.qti.sensor.mot_s5k3p9.so +vendor/lib64/camera/com.qti.sensor.mot_s5kjns.so +vendor/lib64/camera/com.qti.sensor.mot_sc202acs.so +vendor/lib64/camera/com.qti.sensormodule.mot_fogor_s5kjns_qtech.bin +vendor/lib64/camera/com.qti.sensormodule.mot_fogor_sc202acs_sunny.bin +vendor/lib64/camera/com.qti.sensormodule.mot_fogos_ov16a1q_ofilm.bin +vendor/lib64/camera/com.qti.sensormodule.mot_fogos_s5k3p9_qtech.bin # Camera - tuned -vendor/lib/camera/com.qti.tuned.default.bin -vendor/lib/camera/com.qti.tuned.mot_xpeng_hi1336.bin -vendor/lib/camera/com.qti.tuned.mot_xpeng_ov02b1b.bin -vendor/lib/camera/com.qti.tuned.mot_xpeng_ov16a1q.bin -vendor/lib/camera/com.qti.tuned.mot_xpeng_s5khm2.bin -vendor/lib/camera/com.qti.tuned.mot_xpeng_s5khm2sd03.bin vendor/lib64/camera/com.qti.tuned.default.bin -vendor/lib64/camera/com.qti.tuned.mot_xpeng_hi1336.bin -vendor/lib64/camera/com.qti.tuned.mot_xpeng_ov02b1b.bin -vendor/lib64/camera/com.qti.tuned.mot_xpeng_ov16a1q.bin -vendor/lib64/camera/com.qti.tuned.mot_xpeng_s5khm2.bin -vendor/lib64/camera/com.qti.tuned.mot_xpeng_s5khm2sd03.bin +vendor/lib64/camera/com.qti.tuned.mot_fogo_sc202acs.bin +vendor/lib64/camera/com.qti.tuned.mot_fogor_s5kjns.bin +vendor/lib64/camera/com.qti.tuned.mot_fogos_ov16a1q.bin +vendor/lib64/camera/com.qti.tuned.mot_fogos_s5k3p9.bin # Display calibration data -vendor/etc/qdcm_calib_data_mipi_mot_vid_tianma_1080p_dsc_678.xml -vendor/etc/qdcm_calib_data_nt36672e_60_Hz_fhd_plus_video_mode_panel_without_DSC.xml -vendor/etc/qdcm_calib_data_nt36672e_fhd_plus_120Hz_Video_panel.xml -vendor/etc/qdcm_calib_data_nt36672e_fhd_plus_144Hz_video_panel.xml +vendor/etc/qdcm_calib_data_mipi_mot_vid_tm_icnl9916c_hdp_652_120.xml +vendor/etc/qdcm_calib_data_mipi_mot_vid_txd_ili9883c_hdp_652_120.xml -# Fingerprint (goodix) +# Display config +vendor/etc/SVIConfig.xml + +# Fingerprint +vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-goodixservice +vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-fpc +vendor/bin/hw/fpc_ident:vendor/bin/fpc_ident vendor/bin/hw/goodix_ident:vendor/bin/goodix_ident +vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-goodixservice.rc +vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-fpc2.rc +vendor/firmware/tm_goodix_cfg_group.bin +vendor/lib64/com.fingerprints.extension@1.0.so vendor/lib64/hw/fingerprint.goodix.default.so vendor/lib64/libgf_ca.so vendor/lib64/libgf_hal.so vendor/lib64/libgoodixhwfingerprint.so vendor/lib64/vendor.goodix.hardware.biometrics.fingerprint@3.0.so - -# Fingerprint (egistec) -vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-ets -vendor/bin/hw/egis_ident:vendor/bin/egis_ident -vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-ets2.rc -vendor/lib64/libRbsFlow.so -vendor/lib64/libets_teeclient_v2.so -vendor/lib64/vendor.egistec.hardware.fingerprint@4.0.so - -# Fingerprint (fpc) -vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-fpc -vendor/bin/hw/fpc_ident:vendor/bin/fpc_ident -vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-fpc2.rc vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so +# Firmware +vendor/etc/motorola/12m/chipone-icnl9916c_120hz_hd_plus_vid-primary-fogos.ini +vendor/firmware/aw963xx_reg_0.bin +vendor/firmware/chipone_firmware.bin +vendor/firmware/csot_focal_test_limits.ini +vendor/firmware/focaltech-csot-ft3681-22-0000-fogos.bin +vendor/firmware/fs1815.fsm +vendor/firmware/goodix-tm-gt9916S-23051702-646483c4-fogos.bin +vendor/firmware/ILITEK_FW +vendor/firmware/sec_s3nrn4v_firmware.bin + # 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 # NFC -vendor/bin/STFlashTool - -# NFC - configs -vendor/etc/libnfc-hal-st.conf -vendor/etc/libnfc-nci-st.conf -vendor/etc/st21nfc_conf_ds.txt -vendor/etc/st21nfc_conf_ss.txt - -# NFC firmware -vendor/firmware/st21nfc_fw.bin -vendor/firmware/st21nfc_fw7.bin +vendor/etc/libnfc-PN557.conf +vendor/etc/libnfc-SN220-UICC.conf +vendor/etc/libnfc-SN220.conf +vendor/etc/libnfc-mtp-SN100-UICC.conf +vendor/etc/libnfc-mtp-SN100.conf +vendor/etc/libnfc-mtp-SN100_38_4MHZ.conf +vendor/etc/libnfc-nxp-pnscr.conf +vendor/etc/libnfc-qrd-SN100.conf +vendor/etc/libnfc-qrd-SN100_38_4MHZ.conf +vendor/etc/libnfc-sec-nci.conf +vendor/etc/libnfc-sec-vendor.conf +vendor/etc/nfc_calibration.txt # OEM vendor/etc/vhw.xml @@ -505,60 +294,36 @@ vendor/etc/vhw.xml vendor/lib64/sensors.moto.so vendor/lib64/sensors.ssc.so -# Sensor - configs -vendor/etc/sensors/config/lahaina_ak991x_0.json -vendor/etc/sensors/config/lahaina_default_sensors.json -vendor/etc/sensors/config/lahaina_dynamic_sensors.json -vendor/etc/sensors/config/lahaina_icm4x6xa_0.json -vendor/etc/sensors/config/lahaina_irq.json -vendor/etc/sensors/config/lahaina_lsm6dso.json -vendor/etc/sensors/config/lahaina_mmc56x3x.json -vendor/etc/sensors/config/lahaina_power_0.json -vendor/etc/sensors/config/lahaina_stk3a5x_0.json +# Sensors Configs +vendor/etc/sensors/config/icm4x6xa.json vendor/etc/sensors/config/mot_camgest.json -vendor/etc/sensors/config/mot_chopchop.json -vendor/etc/sensors/config/mot_chopchop_closed.json -vendor/etc/sensors/config/mot_devorient.json -vendor/etc/sensors/config/mot_ftm.json -vendor/etc/sensors/config/mot_gpio_flip.json -vendor/etc/sensors/config/mot_ltv.json -vendor/etc/sensors/config/mot_offbody.json vendor/etc/sensors/config/mot_tap.json vendor/etc/sensors/config/sns_amd.json vendor/etc/sensors/config/sns_amd_sw_disabled.json vendor/etc/sensors/config/sns_amd_sw_enabled.json -vendor/etc/sensors/config/sns_aont.json -vendor/etc/sensors/config/sns_basic_gestures.json -vendor/etc/sensors/config/sns_bring_to_ear.json -vendor/etc/sensors/config/sns_ccd.json -vendor/etc/sensors/config/sns_ccd_v2_walk.json -vendor/etc/sensors/config/sns_ccd_v3_1_walk.json -vendor/etc/sensors/config/sns_ccd_v3_walk.json vendor/etc/sensors/config/sns_cm.json -vendor/etc/sensors/config/sns_dae.json -vendor/etc/sensors/config/sns_device_orient.json vendor/etc/sensors/config/sns_diag_filter.json -vendor/etc/sensors/config/sns_distance_bound.json -vendor/etc/sensors/config/sns_dpc.json -vendor/etc/sensors/config/sns_facing.json 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_pedometer.json vendor/etc/sensors/config/sns_rmd.json vendor/etc/sensors/config/sns_rotv.json vendor/etc/sensors/config/sns_smd.json -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/proto/als_mastercal.proto +vendor/etc/sensors/config/strait_bmi3x0_0.json +vendor/etc/sensors/config/strait_default_sensors.json +vendor/etc/sensors/config/strait_dynamic_sensors.json +vendor/etc/sensors/config/strait_ltr569_0.json +vendor/etc/sensors/config/strait_mmc56x3x_0_with_nfc.json +vendor/etc/sensors/config/strait_mmc56x3x_0_without_nfc.json +vendor/etc/sensors/config/strait_power_0.json +vendor/etc/sensors/config/strait_qmc6308_0_with_nfc.json +vendor/etc/sensors/config/strait_qmc6308_0_without_nfc.json +vendor/etc/sensors/config/strait_qmi8658_0.json vendor/etc/sensors/proto/descriptor.proto vendor/etc/sensors/proto/mot_barocal.proto vendor/etc/sensors/proto/mot_camgest.proto @@ -602,6 +367,7 @@ vendor/etc/sensors/proto/sns_ext_svc.proto vendor/etc/sensors/proto/sns_facing.proto vendor/etc/sensors/proto/sns_fmv.proto vendor/etc/sensors/proto/sns_formatter.proto +vendor/etc/sensors/proto/sns_formatter_notify.proto vendor/etc/sensors/proto/sns_fw.proto vendor/etc/sensors/proto/sns_game_rv.proto vendor/etc/sensors/proto/sns_geomag_rv.proto @@ -619,7 +385,6 @@ vendor/etc/sensors/proto/sns_mag_cal.proto vendor/etc/sensors/proto/sns_mot_factory_cal.proto vendor/etc/sensors/proto/sns_oem1.proto vendor/etc/sensors/proto/sns_offbody_detect.proto -vendor/etc/sensors/proto/sns_panel_status.proto vendor/etc/sensors/proto/sns_pedometer.proto vendor/etc/sensors/proto/sns_pedometer_wrist.proto vendor/etc/sensors/proto/sns_physical_sensor_test.proto @@ -646,19 +411,14 @@ vendor/etc/sensors/proto/sns_thermopile.proto vendor/etc/sensors/proto/sns_threshold.proto vendor/etc/sensors/proto/sns_tilt.proto vendor/etc/sensors/proto/sns_tilt_to_wake.proto -vendor/etc/sensors/proto/sns_trimag.proto vendor/etc/sensors/proto/sns_ultra_violet.proto vendor/etc/sensors/proto/sns_wrist_tilt_gesture.proto +vendor/etc/sensors/proto/tcs3708.proto vendor/etc/sensors/sns_reg_config -# Thermal engine - configs +# Thermal configs +vendor/etc/thermal-engine-fogos-camera.conf +vendor/etc/thermal-engine-fogos-game-normal.conf +vendor/etc/thermal-engine-fogos-game-perf.conf +vendor/etc/thermal-engine-fogos.conf vendor/etc/thermal-engine.conf - -# Touchscreen firmware -vendor/firmware/NT36xxx_MP_Setting_Criteria_6044.csv -vendor/firmware/mp_novatek_ts-NT36675-21101302-6044-xpeng.bin -vendor/firmware/novatek_ts-NT36675-21101302-6044-xpeng.bin - -# Touchscreen firmware (for recovery) -vendor/firmware/mp_novatek_ts-NT36675-21101302-6044-xpeng.bin:recovery/root/vendor/firmware/mp_novatek_ts-NT36675-21101302-6044-xpeng.bin -vendor/firmware/novatek_ts-NT36675-21101302-6044-xpeng.bin:recovery/root/vendor/firmware/novatek_ts-NT36675-21101302-6044-xpeng.bin diff --git a/recovery/Android.mk b/recovery/Android.mk deleted file mode 100644 index ae26448..0000000 --- a/recovery/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -# Recovery-Stuffs - -include $(CLEAR_VARS) -LOCAL_MODULE := init.recovery.xpeng.rc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.recovery.xpeng.rc -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/ -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := load_touch.sh -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := bin/load_touch.sh -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/vendor/bin/ -include $(BUILD_PREBUILT) diff --git a/recovery/bin/load_touch.sh b/recovery/bin/load_touch.sh deleted file mode 100644 index 7747bdc..0000000 --- a/recovery/bin/load_touch.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/system/bin/sh - -firmware_path=/vendor/firmware -touch_class_path=/sys/class/touchscreen -touch_path= -firmware_file= - -wait_for_poweron() -{ - local wait_nomore - local readiness - local count - echo "wait until driver reports ..." - wait_nomore=60 - count=0 - while true; do - readiness=$(cat $touch_path/poweron) - if [ "$readiness" == "1" ]; then - echo "ready to flash!!!" - break; - fi - count=$((count+1)) - [ $count -eq $wait_nomore ] && break - sleep 1 - echo "not ready; keep waiting..." - done - if [ $count -eq $wait_nomore ]; then - return 1 - fi - return 0 -} - -load_touch() -{ - panel_supplier="" - panel_supplier=$(cat /sys/class/touchscreen/*/panel_supplier) - echo "panel supplier vendor is: [$panel_supplier]" - cd $firmware_path - case $panel_supplier in - tianma) - firmware_file="novatek_ts-NT36675-21101302-6044-xpeng.bin" - ;; - esac - echo "Firmware file for upgrade $firmware_file" - touch_path=/sys/class/touchscreen/$(ls /sys/class/touchscreen/) - wait_for_poweron - wait - echo "forcing firmware upgrade" - echo 1 > $touch_path/forcereflash - wait - echo "sending reflash command" - echo $firmware_file > $touch_path/doreflash - sleep 1.5 - echo "Resetting Touch" - echo 1 > $touch_path/reset -} - -load_touch - -exit 0 diff --git a/recovery/etc/init.recovery.xpeng.rc b/recovery/etc/init.recovery.xpeng.rc deleted file mode 100644 index 01c8f97..0000000 --- a/recovery/etc/init.recovery.xpeng.rc +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of The Linux Foundation nor -# the names of its contributors may be used to endorse or promote -# products derived from this software without specific prior written -# permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -on boot - start load_touch - -on property:sys.usb.config=fastboot - start load_touch - -service load_touch vendor/bin/load_touch.sh - oneshot - disabled - user root - group root - seclabel u:r:recovery:s0 diff --git a/resource-overlay/xpeng/Frameworks/Android.bp b/resource-overlay/fogos/Frameworks/Android.bp similarity index 69% rename from resource-overlay/xpeng/Frameworks/Android.bp rename to resource-overlay/fogos/Frameworks/Android.bp index bbc615c..2ded500 100644 --- a/resource-overlay/xpeng/Frameworks/Android.bp +++ b/resource-overlay/fogos/Frameworks/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "FrameworksResXpeng", + name: "FrameworksResFogos", sdk_version: "current", vendor: true } diff --git a/resource-overlay/xpeng/Frameworks/AndroidManifest.xml b/resource-overlay/fogos/Frameworks/AndroidManifest.xml similarity index 89% rename from resource-overlay/xpeng/Frameworks/AndroidManifest.xml rename to resource-overlay/fogos/Frameworks/AndroidManifest.xml index 48e80d6..4fbec7b 100644 --- a/resource-overlay/xpeng/Frameworks/AndroidManifest.xml +++ b/resource-overlay/fogos/Frameworks/AndroidManifest.xml @@ -4,6 +4,6 @@ SPDX-License-Identifier: Apache-2.0 --> + package="android.overlay.fogos"> diff --git a/resource-overlay/xpeng/Frameworks/res/values-land/dimens.xml b/resource-overlay/fogos/Frameworks/res/values-land/dimens.xml similarity index 100% rename from resource-overlay/xpeng/Frameworks/res/values-land/dimens.xml rename to resource-overlay/fogos/Frameworks/res/values-land/dimens.xml diff --git a/resource-overlay/xpeng/Frameworks/res/values/config.xml b/resource-overlay/fogos/Frameworks/res/values/config.xml similarity index 93% rename from resource-overlay/xpeng/Frameworks/res/values/config.xml rename to resource-overlay/fogos/Frameworks/res/values/config.xml index 9f50fb9..565e666 100644 --- a/resource-overlay/xpeng/Frameworks/res/values/config.xml +++ b/resource-overlay/fogos/Frameworks/res/values/config.xml @@ -96,24 +96,31 @@ This array should be equal in size to config_screenBrightnessBacklight. --> 0 - 1 + 2 6 - 11 - 28 + 13 + 32 + 45 + 54 + 70 + 83 + 96 + 115 + 134 + 140 + 143 + 223 + 255 + + + + 10 + 20 40 - 48 - 62 - 74 - 85 - 102 - 128 - 153 - 170 - 179 - 187 - 198 - 215 - 238 + 70 + 110 + 160 + 200 255 @@ -126,7 +133,7 @@ This array should be equal in size to config_screenBrightnessBacklight --> 0 - 2 + 3 10 20 50 @@ -136,15 +143,11 @@ 130 150 180 + 210 + 220 225 - 270 - 300 - 315 - 330 350 - 380 - 420 - 450 + 400 - M -50,0 - L 50,0 - L 50,115 - L -50,115 - Z + M -28,0 + L 28,0 + L 28,77 + L -28,77 + Z - - true - @@ -299,10 +299,10 @@ - local:4630946747577212034 - 1080 - 800 - 50 + local:4630946747577212033 + 720 + 600 + 200 @@ -325,7 +325,7 @@ 120 - motorolag2005G + motog345G http://uaprof.motorola.com/phoneconfig/motov1/Profile/motov1.rdf diff --git a/resource-overlay/xpeng/Frameworks/res/values/dimens.xml b/resource-overlay/fogos/Frameworks/res/values/dimens.xml similarity index 61% rename from resource-overlay/xpeng/Frameworks/res/values/dimens.xml rename to resource-overlay/fogos/Frameworks/res/values/dimens.xml index f784591..b273676 100644 --- a/resource-overlay/xpeng/Frameworks/res/values/dimens.xml +++ b/resource-overlay/fogos/Frameworks/res/values/dimens.xml @@ -5,11 +5,12 @@ --> - 85.0px + 60.0px + 66.0px - 115px + 77.0px - 19.0px + 10.0px diff --git a/resource-overlay/fogos/Frameworks/res/xml/power_profile.xml b/resource-overlay/fogos/Frameworks/res/xml/power_profile.xml new file mode 100644 index 0000000..fc63724 --- /dev/null +++ b/resource-overlay/fogos/Frameworks/res/xml/power_profile.xml @@ -0,0 +1,82 @@ + + + 0 + 120.12 + 370.48 + 1.78 + 110.2 + 83.35 + 607.96 + 158.81 + 50.69 + 149.95 + 74.8 + + 51 + 43 + 36 + 29 + 22 + 16 + 10 + 4.54 + + + 6 + 2 + + + 300000 + 576000 + 691200 + 940800 + 1113600 + 1324800 + 1516800 + 1651200 + 1708800 + 1804800 + + + 691200 + 940800 + 1228800 + 1401600 + 1516800 + 1651200 + 1804800 + 1900800 + 2054400 + 2208000 + + + 22.8 + 24.7 + 25.6 + 31.1 + 33.9 + 39.3 + 43.8 + 52.3 + 53.7 + 57.2 + + + 53.3 + 68.5 + 91.2 + 114.4 + 130.6 + 155.6 + 173.7 + 184.6 + 197.3 + 220.5 + + 13.5 + 43.3 + 6.34 + 8.606 + 10.72 + 5000 + \ No newline at end of file diff --git a/resource-overlay/xpeng/LineagePlatform/Android.bp b/resource-overlay/fogos/LineageSystemUI/Android.bp similarity index 80% rename from resource-overlay/xpeng/LineagePlatform/Android.bp rename to resource-overlay/fogos/LineageSystemUI/Android.bp index e1cd2e2..7cda598 100644 --- a/resource-overlay/xpeng/LineagePlatform/Android.bp +++ b/resource-overlay/fogos/LineageSystemUI/Android.bp @@ -4,6 +4,6 @@ // runtime_resource_overlay { - name: "LineagePlatformXpeng", + name: "LineageSystemUIFogos", vendor: true, } diff --git a/resource-overlay/xpeng/LineageSystemUI/AndroidManifest.xml b/resource-overlay/fogos/LineageSystemUI/AndroidManifest.xml similarity index 87% rename from resource-overlay/xpeng/LineageSystemUI/AndroidManifest.xml rename to resource-overlay/fogos/LineageSystemUI/AndroidManifest.xml index 7004daa..88a3ab4 100644 --- a/resource-overlay/xpeng/LineageSystemUI/AndroidManifest.xml +++ b/resource-overlay/fogos/LineageSystemUI/AndroidManifest.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0 --> + package="com.android.systemui.fogos.lineage"> + package="com.android.providers.settings.overlay.fogos"> diff --git a/resource-overlay/xpeng/SettingsProvider/res/values/config.xml b/resource-overlay/fogos/SettingsProvider/res/values/config.xml similarity index 76% rename from resource-overlay/xpeng/SettingsProvider/res/values/config.xml rename to resource-overlay/fogos/SettingsProvider/res/values/config.xml index b676f2c..99a6bfe 100644 --- a/resource-overlay/xpeng/SettingsProvider/res/values/config.xml +++ b/resource-overlay/fogos/SettingsProvider/res/values/config.xml @@ -5,5 +5,5 @@ --> - Motorola g200 5G + moto g34 5G diff --git a/resource-overlay/xpeng/SystemUI/Android.bp b/resource-overlay/fogos/SystemUI/Android.bp similarity index 71% rename from resource-overlay/xpeng/SystemUI/Android.bp rename to resource-overlay/fogos/SystemUI/Android.bp index f65bcac..d35929e 100644 --- a/resource-overlay/xpeng/SystemUI/Android.bp +++ b/resource-overlay/fogos/SystemUI/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "SystemUIResXpeng", + name: "SystemUIResFogos", sdk_version: "current", vendor: true } diff --git a/resource-overlay/xpeng/SystemUI/AndroidManifest.xml b/resource-overlay/fogos/SystemUI/AndroidManifest.xml similarity index 86% rename from resource-overlay/xpeng/SystemUI/AndroidManifest.xml rename to resource-overlay/fogos/SystemUI/AndroidManifest.xml index 7b80e99..87d741b 100644 --- a/resource-overlay/xpeng/SystemUI/AndroidManifest.xml +++ b/resource-overlay/fogos/SystemUI/AndroidManifest.xml @@ -5,6 +5,6 @@ --> + package="com.android.systemui.overlay.fogos"> diff --git a/resource-overlay/xpeng/SystemUI/res/values-land/dimens.xml b/resource-overlay/fogos/SystemUI/res/values-land/dimens.xml similarity index 100% rename from resource-overlay/xpeng/SystemUI/res/values-land/dimens.xml rename to resource-overlay/fogos/SystemUI/res/values-land/dimens.xml diff --git a/resource-overlay/xpeng/SystemUI/res/values/dimens.xml b/resource-overlay/fogos/SystemUI/res/values/dimens.xml similarity index 84% rename from resource-overlay/xpeng/SystemUI/res/values/dimens.xml rename to resource-overlay/fogos/SystemUI/res/values/dimens.xml index dac4e80..adef661 100644 --- a/resource-overlay/xpeng/SystemUI/res/values/dimens.xml +++ b/resource-overlay/fogos/SystemUI/res/values/dimens.xml @@ -5,12 +5,12 @@ --> - 24dp + 8dp - 19.0px + 10.0px - 5.0px + 11.0px @*android:dimen/status_bar_height @@ -18,23 +18,24 @@ @dimen/status_bar_padding_start - 9.0px + 10.0px - 810px + 700px - 1080px + 700px - 810px + screen directly in front of the sensor. + By default, this is set to @null to use the horizontal center of the screen. --> + 720px 300px diff --git a/resource-overlay/xpeng/SystemUI/res/values/integers.xml b/resource-overlay/fogos/SystemUI/res/values/integers.xml similarity index 100% rename from resource-overlay/xpeng/SystemUI/res/values/integers.xml rename to resource-overlay/fogos/SystemUI/res/values/integers.xml diff --git a/resource-overlay/fogos/Wifi/Android.bp b/resource-overlay/fogos/Wifi/Android.bp new file mode 100644 index 0000000..b10e0d2 --- /dev/null +++ b/resource-overlay/fogos/Wifi/Android.bp @@ -0,0 +1,10 @@ +// +// Copyright (C) 2021 The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +runtime_resource_overlay { + name: "WifiResFogos", + sdk_version: "current", + vendor: true, +} diff --git a/resource-overlay/fogos/Wifi/AndroidManifest.xml b/resource-overlay/fogos/Wifi/AndroidManifest.xml new file mode 100644 index 0000000..d7ff2bf --- /dev/null +++ b/resource-overlay/fogos/Wifi/AndroidManifest.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/resource-overlay/fogos/Wifi/res/values/config.xml b/resource-overlay/fogos/Wifi/res/values/config.xml new file mode 100644 index 0000000..38949b0 --- /dev/null +++ b/resource-overlay/fogos/Wifi/res/values/config.xml @@ -0,0 +1,24 @@ + + + + + + moto g34 5G + + diff --git a/resource-overlay/xpeng/Frameworks/res/xml/power_profile.xml b/resource-overlay/xpeng/Frameworks/res/xml/power_profile.xml deleted file mode 100644 index 19cc580..0000000 --- a/resource-overlay/xpeng/Frameworks/res/xml/power_profile.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - 0 - 79.683 - 393.32 - 1.293 - 34.36 - 4.73 - 523.93 - 200.75 - 171 - 86.278 - 33.2 - - 33.079 - 30 - 25 - 20 - 15 - 10 - 5 - 1.463 - - - 4 - 3 - 1 - - - 300000 - 691200 - 806400 - 940800 - 1152000 - 1324800 - 1516800 - 1651200 - 1804800 - - - 691200 - 940800 - 1228800 - 1344000 - 1516800 - 1651200 - 1900800 - 2054400 - 2131200 - 2400000 - - - 806400 - 1056000 - 1324800 - 1516800 - 1766400 - 1862400 - 2035200 - 2208000 - 2380800 - 2400000 - - - 4.13 - 6.9 - 7.26 - 8.88 - 12.17 - 15.7 - 20.06 - 25.76 - 30.9 - - - 26.93 - 20.23 - 57.22 - 71.71 - 91.77 - 108.31 - 158.29 - 182.69 - 186.79 - 230.89 - - - 34.69 - 49.4 - 70.56 - 89.92 - 117.81 - 129.49 - 185.7 - 184.51 - 218.2 - 233.16 - - 1.13 - 1.13 - 1.13 - 5.5 - 22.71 - 6.9 - 5000 - diff --git a/resource-overlay/xpeng/LineageApertureApp/Android.bp b/resource-overlay/xpeng/LineageApertureApp/Android.bp deleted file mode 100644 index 1f19de5..0000000 --- a/resource-overlay/xpeng/LineageApertureApp/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -// -// Copyright (C) 2022-2023 The LineageOS Project -// SPDX-License-Identifier: Apache-2.0 -// - -runtime_resource_overlay { - name: "LineageApertureAppXpeng", - vendor: true, -} diff --git a/resource-overlay/xpeng/LineageApertureApp/AndroidManifest.xml b/resource-overlay/xpeng/LineageApertureApp/AndroidManifest.xml deleted file mode 100644 index 761bc45..0000000 --- a/resource-overlay/xpeng/LineageApertureApp/AndroidManifest.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/resource-overlay/xpeng/LineageApertureApp/res/values/config.xml b/resource-overlay/xpeng/LineageApertureApp/res/values/config.xml deleted file mode 100644 index 15cb3d8..0000000 --- a/resource-overlay/xpeng/LineageApertureApp/res/values/config.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - 2 - 4 - 5 - 6 - 7 - - diff --git a/resource-overlay/xpeng/LineagePlatform/AndroidManifest.xml b/resource-overlay/xpeng/LineagePlatform/AndroidManifest.xml deleted file mode 100644 index 28438d2..0000000 --- a/resource-overlay/xpeng/LineagePlatform/AndroidManifest.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/resource-overlay/xpeng/LineagePlatform/res/values/config.xml b/resource-overlay/xpeng/LineagePlatform/res/values/config.xml deleted file mode 100644 index 269150b..0000000 --- a/resource-overlay/xpeng/LineagePlatform/res/values/config.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - 248 - - diff --git a/resource-overlay/xpeng/LineageSystemUI/Android.bp b/resource-overlay/xpeng/LineageSystemUI/Android.bp deleted file mode 100644 index f3fbf71..0000000 --- a/resource-overlay/xpeng/LineageSystemUI/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -// -// Copyright (C) 2022-2023 The LineageOS Project -// SPDX-License-Identifier: Apache-2.0 -// - -runtime_resource_overlay { - name: "LineageSystemUIXpeng", - vendor: true, -} diff --git a/rootdir/bin/init.oem.fingerprint2.sh b/rootdir/bin/init.oem.fingerprint2.sh index 83bf314..9a61ec6 100644 --- a/rootdir/bin/init.oem.fingerprint2.sh +++ b/rootdir/bin/init.oem.fingerprint2.sh @@ -24,10 +24,11 @@ function log { # hal_list: the array contains the hal service name. # # note: all arrays should have the same size. -vendor_list=('egis' 'fpc' 'goodix') -kernel_so_list=("/vendor/lib/modules/rbs_fps_mmi.ko" "/vendor/lib/modules/fpc1020_mmi.ko" "/vendor/lib/modules/goodix_fod_mmi.ko") -kernel_so_name_list=("rbs_fps_mmi.ko" "fpc1020_mmi.ko" "goodix_fod_mmi.ko") -hal_list=('ets_hal' 'fps_hal' 'vendor.fps_hal') +vendor_list=('goodix' 'fpc') +kernel_so_list=("/vendor/lib/modules/goodix_fod_mmi.ko" "/vendor/lib/modules/fpc1020_mmi.ko") +kernel_so_name_list=("goodix_fod_mmi.ko" "fpc1020_mmi.ko") +dev_node_list=("/dev/goodix_fp" "/sys/class/fingerprint/fpc1020/irq") +hal_list=('goodix_hal' 'fps_hal') last_vendor_index=`expr ${#vendor_list[@]} - 1` vendor_list_size=${#vendor_list[@]} @@ -53,7 +54,7 @@ persist_fps_id=/mnt/vendor/persist/fps/vendor_id persist_fps_id2=/mnt/vendor/persist/fps/last_vendor_id FPS_VENDOR_NONE=none -MAX_TIMES=20 +MAX_TIMES=50 # this property store FPS_STATUS_NONE or FPS_STATUS_OK # after start fingerprint hal service, the hal service will set this property. @@ -87,9 +88,23 @@ function start_hal_service(){ setprop $prop_fps_ident $FPS_STATUS_NONE insmod ${kernel_so_list[$1]} + log "${kernel_so_list[$1]} insmod" sleep 1 setprop $prop_fps_ident ${vendor_list[$1]} + retry=1 + while [ $retry -lt 5 ] + do + if [ -e "${dev_node_list[$1]}" ]; then + log "dev node : ${dev_node_list[$1]} is ready" + break + else + log "driver is not ready, $retry times wait 1s to retry" + sleep 1 + fi + let retry++ + done + log "start ${hal_list[$1]}" start ${hal_list[$1]} diff --git a/rootdir/etc/init/hw/init.mmi.overlay.rc b/rootdir/etc/init/hw/init.mmi.overlay.rc index e086336..f29a8ef 100644 --- a/rootdir/etc/init/hw/init.mmi.overlay.rc +++ b/rootdir/etc/init/hw/init.mmi.overlay.rc @@ -1,67 +1,20 @@ -import /vendor/etc/init/hw/init.vendor.st21nfc.rc - -on early-init && property:ro.bootmode=mot-factory - insmod /vendor/lib/modules/moto_f_usbnet.ko - -on early-init - exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/${ro.vendor.mot.gki.path} mmi_annotate mmi_info mmi_relay - -on early-init - insmod /vendor/lib/modules/aw882xx_k504.ko - insmod /vendor/lib/modules/bm_adsp_ulog.ko - insmod /vendor/lib/modules/camera.ko - insmod /vendor/lib/modules/cci_intf.ko - insmod /vendor/lib/modules/leds_aw99703.ko - insmod /vendor/lib/modules/leds_lm3697.ko - insmod /vendor/lib/modules/mmi_charger.ko - insmod /vendor/lib/modules/mmi_sys_temp.ko - insmod /vendor/lib/modules/qpnp_adaptive_charge.ko - insmod /vendor/lib/modules/qti_glink_charger.ko - insmod /vendor/lib/modules/wl2866d.ko +# sec_nfc +import /vendor/etc/init/hw/init.nfc.sec.rc on post-fs - # Sensors - chown system system /sys/devices/platform/soc/998000.spi/spi_master/spi0/spi0.0/touchscreen/NVT-ts/double_tap_enabled - chown system system /sys/devices/platform/soc/998000.spi/spi_master/spi0/spi0.0/touchscreen/NVT-ts/double_tap_pressed + # "Tap to wake" gesture + chown root input /sys/class/sensors/dt-gesture/enable + chmod 0660 /sys/class/sensors/dt-gesture/enable + chown root input /sys/class/sensors/dt-gesture/poll_delay + chmod 0660 /sys/class/sensors/dt-gesture/poll_delay + +on post-fs + chown system system /sys/devices/platform/soc/4804000.ufshc/clkgate_enable + chown system system /sys/devices/platform/soc/4804000.ufshc/devfreq/4804000.ufshc/min_freq on post-fs-data - mkdir /mnt/vendor/persist/tof 0755 vendor_tcmd camera - chown vendor_tcmd camera /mnt/vendor/persist/tof/refspad_cal - chown vendor_tcmd camera /mnt/vendor/persist/tof/xtalk_g1_cal - chown vendor_tcmd camera /mnt/vendor/persist/tof/xtalk_shape_cal - chown vendor_tcmd camera /mnt/vendor/persist/tof/xtalk_production_cal - chown vendor_tcmd camera /mnt/vendor/persist/tof/offset_cal - chmod 0640 /mnt/vendor/persist/tof/refspad_cal - chmod 0640 /mnt/vendor/persist/tof/xtalk_g1_cal - chmod 0640 /mnt/vendor/persist/tof/xtalk_shape_cal - chmod 0640 /mnt/vendor/persist/tof/xtalk_production_cal - chmod 0640 /mnt/vendor/persist/tof/offset_cal - # Param updater data for various modules - mkdir /data/vendor/param 0775 system system - mkdir /data/vendor/tzstorage/goodix 0770 system system - exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules wlan -on early-boot - # Goodix fingerprint - chown system system /dev/goodix_fp - chmod 0664 /dev/goodix_fp - -on boot - chmod 0664 /mnt/vendor/persist/factory/audio/aw_cali.bin - mkdir /data/vendor/gf_data 0770 system system - mkdir /mnt/vendor/persist/goodix 0770 system system - - #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 - # 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 - # allow TCMD to access cci - chmod 0660 /dev/cci_intf - chown system camera /dev/cci_intf + chown system system /sys/devices/platform/soc/soc:fm_wcn39x0/elna_en # touch api chown system system /sys/class/touchscreen/primary/interpolation chmod 0660 /sys/class/touchscreen/primary/interpolation @@ -69,37 +22,137 @@ on boot chmod 0660 /sys/class/touchscreen/primary/first_filter chown system system /sys/class/touchscreen/primary/edge chmod 0660 /sys/class/touchscreen/primary/edge - # touch screen calibration file - mkdir /mnt/vendor/persist/touch - chown vendor_tcmd system /mnt/vendor/persist/touch - chmod 0775 /mnt/vendor/persist/touch + # change permission for stylus + chown system system /sys/class/touchscreen/primary/palm_settings -service capsense_reset /system/vendor/bin/capsense_reset + # Change ownership and permission for bq25960-standalone factory testing + chown system system /sys/class/power_supply/bq25960-standalone/voltage_now + chown system system /sys/bus/iio/devices/iio:device6/in_index_bq25980_cp_enabled_input + chmod 0644 /sys/class/power_supply/bq25960-standalone/voltage_now + chmod 0664 /sys/bus/iio/devices/iio:device6/in_index_bq25980_cp_enabled_input + + # Add for Egis Fod fingerprint + 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 after-sale ois gyro cal + mkdir /mnt/vendor/persist/camera/gyro_compat 0770 vendor_tcmd camera + + # Add for OIS hall test result + mkdir /mnt/vendor/persist/camera/ois_hall 0770 vendor_tcmd camera + + # 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 + + #bluetooth sar + write /data/vendor/radio/bluetooth_sar disable + chmod 0644 /data/vendor/radio/bluetooth_sar + chown radio /data/vendor/radio/bluetooth_sar + +on early-init + insmod /vendor/lib/modules/leds_aw99703.ko + insmod /vendor/lib/modules/leds_lm3697.ko + exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -r -d /vendor/lib/modules/${ro.vendor.mot.gki.path} zram + +on boot + # vibrator hal need to access this sysfs node for AF noise issue + chown system system /sys/devices/platform/soc/soc:mot,cam-actuator/onekey_actuator + chmod 0660 /sys/devices/platform/soc/soc:mot,cam-actuator/onekey_actuator + # change permission for capsensor + chown system system /sys/class/capsense/reset + chown system system /sys/class/capsense/int_state + chown radio system /sys/class/capsense/reg + chown radio system /sys/class/capsense/fw_download_status + chown system system /sys/class/capsense/mode + chmod 0660 /sys/class/capsense/reset + chmod 0660 /sys/class/capsense/int_state + chmod 0660 /sys/class/capsense/reg + chmod 0660 /sys/class/capsense/fw_download_status + # touch + chown system system /sys/class/touchscreen/primary/interpolation + chmod 0660 /sys/class/touchscreen/primary/interpolation + chown system system /sys/class/touchscreen/primary/sample + chmod 0660 /sys/class/touchscreen/primary/sample + chown system system /sys/class/touchscreen/primary/edge + chmod 0660 /sys/class/touchscreen/primary/edge + chown system system /sys/class/touchscreen/primary/gesture + chmod 0660 /sys/class/touchscreen/primary/gesture + chmod 0660 /sys/class/capsense/mode + chmod 0666 /dev/gtp_tools + + chmod 0662 /sys/class/leds/vibrator/state + chmod 0666 /sys/class/leds/vibrator/activate + chmod 0662 /sys/class/leds/vibrator/duration + write /proc/sys/vm/dirty_background_bytes 26214400 + write /proc/sys/vm/dirty_bytes 104857600 + +on fs + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/rbs_fod_mmi.ko + +on boot && property:ro.vendor.mot.gki.path=5.4-gki + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/nfc_i2c.ko + +on late-init + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/qpnp_adaptive_charge.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi-smbcharger-iio.ko + exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/${ro.vendor.mot.gki.path} moto_mm moto_swap + +on early-boot + # Add for egis fingerprint + chown system system /dev/esfp0 + chmod 0664 /dev/esfp0 + + chown system camera /dev/cci_intf + chmod 0660 /dev/cci_intf + +on charger + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/qpnp_adaptive_charge.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi-smbcharger-iio.ko + +on post-fs-data && property:ro.boot.mode=charger + setprop persist.vendor.hvdcp_opti.start 1 + +service capsense_reset /vendor/bin/capsense_reset class core user system group system input disabled +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 + on property:sys.boot_completed=1 start capsense_reset + chown system system /sys/class/touchscreen/primary/stowed + chmod 0660 /sys/class/touchscreen/primary/stowed -service egis_ident /vendor/bin/egis_ident - class late_start - user system - group system - oneshot - disabled +on init + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/chipone_tddi_v2_mmi.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/ilitek_v3_mmi.ko -service fpc_ident /vendor/bin/fpc_ident - class late_start - user system - group system - oneshot - disabled +on property:dev.bootcomplete=1 && property:ro.vendor.hw.ram=4GB + write /sys/block/dm-0/queue/read_ahead_kb 128 + write /sys/block/dm-1/queue/read_ahead_kb 128 + write /sys/block/dm-2/queue/read_ahead_kb 128 + write /sys/block/dm-3/queue/read_ahead_kb 128 + write /sys/block/dm-4/queue/read_ahead_kb 128 + write /sys/block/dm-5/queue/read_ahead_kb 128 + write /sys/block/${dev.mnt.dev.root}/queue/read_ahead_kb 128 + write /sys/block/${dev.mnt.dev.system_ext}/queue/read_ahead_kb 128 + write /sys/block/${dev.mnt.dev.product}/queue/read_ahead_kb 128 + write /sys/block/${dev.mnt.dev.vendor}/queue/read_ahead_kb 128 + write /sys/block/${dev.mnt.dev.data}/queue/read_ahead_kb 128 + write /sys/block/${dev.mnt.rootdisk.data}/queue/read_ahead_kb 128 -service gf_ident /vendor/bin/goodix_ident - class late_start - user system - group system input uhid - oneshot - disabled diff --git a/rootdir/etc/init/hw/init.nfc.sec.rc b/rootdir/etc/init/hw/init.nfc.sec.rc new file mode 100644 index 0000000..5baddfc --- /dev/null +++ b/rootdir/etc/init/hw/init.nfc.sec.rc @@ -0,0 +1,12 @@ +on boot + +on post-fs-data +# NFC storage +# mkdir /data/nfc + +# NFC permission + chown nfc nfc /dev/sec-nfc + chmod 0770 /dev/sec-nfc + +# chown nfc nfc /data/nfc +# chmod 0770 /data/nfc 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 354b95e..0000000 --- a/rootdir/etc/init/hw/init.vendor.st21nfc.rc +++ /dev/null @@ -1,23 +0,0 @@ - -# This file needs to be executed by vendor_init at boot of the device, -# both in normal and factory mode. - -on post-fs - # Change ownership and permision of st nfc device - chown nfc nfc /dev/st21nfc - chmod 0660 /dev/st21nfc - -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/rootdir/etc/init/init.ets.rc b/rootdir/etc/init/init.ets.rc deleted file mode 100644 index c21ff02..0000000 --- a/rootdir/etc/init/init.ets.rc +++ /dev/null @@ -1,22 +0,0 @@ -# Egistec fingerprint feature -on post-fs-data - mkdir /persist/egis 0770 system system - chmod 0660 /sys/devices/platform/egis_input/navigation_event - chmod 0660 /sys/devices/platform/egis_input/navigation_enable - chmod 0660 /sys/devices/soc/0.et320/etspi_enable - chown system system /sys/devices/platform/egis_input/navigation_enable - chown system system /sys/devices/platform/egis_input/navigation_event - chown system system /sys/devices/soc/0.et320/etspi_enable - restorecon /sys/devices/platform/egis_input/navigation_enable - restorecon /sys/devices/platform/egis_input/navigation_event - restorecon /sys/devices/soc/0.et320/etspi_enable -# Egistec fingerprint fp daemon start -# service etsd /system/bin/etsd -# user system -# group system input -# class late_start - -on post-fs-data -# service-ets -on property:ro.vendor.hw.fps=false - stop ets_hal diff --git a/sensors/Android.bp b/sensors/Android.bp index 156254a..974f1da 100644 --- a/sensors/Android.bp +++ b/sensors/Android.bp @@ -5,7 +5,7 @@ // cc_library_shared { - name: "sensors.xpeng", + name: "sensors.fogos", defaults: ["hidl_defaults"], srcs: [ "Sensor.cpp", @@ -29,7 +29,7 @@ cc_library_shared { "android.hardware.sensors@2.X-multihal", ], cflags: [ - "-DLOG_TAG=\"sensors.xpeng\"", + "-DLOG_TAG=\"sensors.fogos\"", ], vendor: true, } diff --git a/sensors/hals.conf b/sensors/hals.conf index bc13bff..d7a3266 100644 --- a/sensors/hals.conf +++ b/sensors/hals.conf @@ -1,3 +1,2 @@ -sensors.ssc.so sensors.moto.so -sensors.xpeng.so +sensors.ssc.so diff --git a/setup-makefiles.sh b/setup-makefiles.sh index f751947..7728052 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -8,8 +8,8 @@ set -e -export DEVICE=xpeng -export DEVICE_COMMON=sm7325-common +export DEVICE=fogos +export DEVICE_COMMON=sm6375-common export VENDOR=motorola "./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@" diff --git a/system.prop b/system.prop index 4b8c159..215cfb5 100644 --- a/system.prop +++ b/system.prop @@ -1,3 +1,3 @@ # Google -ro.opa.device_model_id=motorola-xpeng +ro.opa.device_model_id=motorola-fogos ro.opa.eligible_device=true diff --git a/touch/Android.bp b/touch/Android.bp index 48bf2c0..72432ff 100644 --- a/touch/Android.bp +++ b/touch/Android.bp @@ -4,9 +4,9 @@ // SPDX-License-Identifier: Apache-2.0 cc_binary { - name: "vendor.lineage.touch@1.0-service.xpeng", - vintf_fragments: ["vendor.lineage.touch@1.0-service.xpeng.xml"], - init_rc: ["vendor.lineage.touch@1.0-service.xpeng.rc"], + name: "vendor.lineage.touch@1.0-service.fogos", + vintf_fragments: ["vendor.lineage.touch@1.0-service.fogos.xml"], + init_rc: ["vendor.lineage.touch@1.0-service.fogos.rc"], defaults: ["hidl_defaults"], relative_install_path: "hw", proprietary: true, diff --git a/touch/service.cpp b/touch/service.cpp index ab717a3..1d43add 100644 --- a/touch/service.cpp +++ b/touch/service.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_TAG "lineage.touch@1.0-service.xpeng" +#define LOG_TAG "lineage.touch@1.0-service.fogos" #include #include diff --git a/touch/vendor.lineage.touch@1.0-service.xpeng.rc b/touch/vendor.lineage.touch@1.0-service.fogos.rc similarity index 90% rename from touch/vendor.lineage.touch@1.0-service.xpeng.rc rename to touch/vendor.lineage.touch@1.0-service.fogos.rc index 473236c..2910bd3 100644 --- a/touch/vendor.lineage.touch@1.0-service.xpeng.rc +++ b/touch/vendor.lineage.touch@1.0-service.fogos.rc @@ -1,4 +1,4 @@ -service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.xpeng +service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.fogos interface vendor.lineage.touch@1.0::IHighTouchPollingRate default class hal user system diff --git a/touch/vendor.lineage.touch@1.0-service.xpeng.xml b/touch/vendor.lineage.touch@1.0-service.fogos.xml similarity index 100% rename from touch/vendor.lineage.touch@1.0-service.xpeng.xml rename to touch/vendor.lineage.touch@1.0-service.fogos.xml diff --git a/update-sha1sums.py b/update-sha1sums.py index b9b7bf8..b916063 100755 --- a/update-sha1sums.py +++ b/update-sha1sums.py @@ -20,7 +20,7 @@ import os import sys from hashlib import sha1 -device='xpeng' +device='fogos' vendor='motorola' with open('proprietary-files.txt', 'r') as f: diff --git a/vendor.prop b/vendor.prop index 9007637..a4422cd 100644 --- a/vendor.prop +++ b/vendor.prop @@ -1,11 +1,11 @@ # Bluetooth -bluetooth.device.default_name=Motorola g200 5G +bluetooth.device.default_name=moto g34 5G # Camera -persist.vendor.camera.physical.num=4 +persist.vendor.camera.physical.num=3 # Motorola ro.mot.build.customerid=global # NFC -ro.vendor.hw.nfc=st +persist.vendor.nfc.config_secfile_name=libnfc-sec-nci.conf