diff --git a/Android.mk b/Android.mk index 83fe925..9dbe5ab 100644 --- a/Android.mk +++ b/Android.mk @@ -1,21 +1,11 @@ # -# Copyright (C) 2022 The LineageOS Project +# Copyright (C) 2022-2023 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. +# SPDX-License-Identifier: Apache-2.0 # LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),berlna) +ifeq ($(TARGET_DEVICE),xpeng) include $(call all-makefiles-under,$(LOCAL_PATH)) endif diff --git a/AndroidBoard.mk b/AndroidBoard.mk index a171408..fa77ca9 100644 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -1,28 +1,15 @@ # -# Copyright (C) 2017-2021 The LineageOS Project +# Copyright (C) 2017-2023 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. +# SPDX-License-Identifier: Apache-2.0 # INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel recovery_uncompressed_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.cpio RECOVERY_FIRMWARE_TARGETS := \ - aw8695_haptic.bin \ - aw8695_rtp.bin \ - mp-novatek_ts-NT36675-21061805-603a-berlna.bin \ - novatek_ts-NT36675-21042101-603a-berlna-evt.bin \ - novatek_ts-NT36675-21061805-603a-berlna.bin + mp_novatek_ts-NT36675-21101302-6044-xpeng.bin \ + novatek_ts-NT36675-21101302-6044-xpeng.bin INSTALLED_RECOVERY_FIRMWARE_TARGETS := $(RECOVERY_FIRMWARE_TARGETS:%=$(TARGET_RECOVERY_ROOT_OUT)/vendor/firmware/%) $(INSTALLED_RECOVERY_FIRMWARE_TARGETS): $(INSTALLED_KERNEL_TARGET) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 10e2856..2280fbe 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -1,23 +1,13 @@ # -# Copyright (C) 2022 The LineageOS Project +# Copyright (C) 2022-2023 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. +# SPDX-License-Identifier: Apache-2.0 # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_berlna.mk + $(LOCAL_DIR)/lineage_xpeng.mk COMMON_LUNCH_CHOICES := \ - lineage_berlna-user \ - lineage_berlna-userdebug \ - lineage_berlna-eng + lineage_xpeng-user \ + lineage_xpeng-userdebug \ + lineage_xpeng-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index 2d822c0..232d1c6 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -1,33 +1,23 @@ # -# Copyright (C) 2022 The LineageOS Project +# Copyright (C) 2022-2023 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. +# SPDX-License-Identifier: Apache-2.0 # -DEVICE_PATH := device/motorola/berlna +DEVICE_PATH := device/motorola/xpeng # Inherit from motorola sm7325-common include device/motorola/sm7325-common/BoardConfigCommon.mk # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := berlna +TARGET_BOOTLOADER_BOARD_NAME := xpeng # HIDL -DEVICE_MANIFEST_YUPIK_FILES += $(DEVICE_PATH)/manifest_berlna.xml +DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest_xpeng.xml # Kernel -BOARD_KERNEL_CMDLINE += androidboot.hab.product=berlna -TARGET_KERNEL_CONFIG += vendor/lineage_berlna.config +BOARD_KERNEL_CMDLINE += androidboot.hab.product=xpeng +TARGET_KERNEL_CONFIG += vendor/lineage_xpeng.config # Kernel Modules BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load)) @@ -35,19 +25,15 @@ BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.recovery)) BOOT_KERNEL_MODULES := $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD) -# Kernel modules - WLAN -TARGET_MODULE_ALIASES += \ - wlan.ko:qca_cld3_qca6750.ko - # Partitions -BOARD_USERDATAIMAGE_PARTITION_SIZE := 237371371520 +BOARD_USERDATAIMAGE_PARTITION_SIZE := 116674899968 ifneq ($(WITH_GMS),true) -BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 1073741824 -BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 898367488 -BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE := 1073741824 +BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 3195027456 +BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 872398848 +BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE := 914399232 endif -BOARD_MOT_DP_GROUP_SIZE := 7916748800 -BOARD_SUPER_PARTITION_SIZE := 15854469120 +BOARD_MOT_DP_GROUP_SIZE := 8585740288 # ( BOARD_SUPER_PARTITION_SIZE - 4MB ) +BOARD_SUPER_PARTITION_SIZE := 8589934592 # Properties TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop @@ -57,10 +43,10 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90 # Security -VENDOR_SECURITY_PATCH := 2023-01-01 +VENDOR_SECURITY_PATCH := 2022-11-01 # SELinux BOARD_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor # inherit from the proprietary version -include vendor/motorola/berlna/BoardConfigVendor.mk +include vendor/motorola/xpeng/BoardConfigVendor.mk diff --git a/README.md b/README.md index c33971c..c4cdf6f 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,30 @@ -# Device configuration for Motorola Edge (2021) +# 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.4 GHz Cortex-A78 & 3x2.2 GHz Cortex-A78 & 4x1.9 GHz Cortex-A55) -CHIPSET | Qualcomm SM7325 Snapdragon 778G -GPU | Adreno 642L +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 -Memory | 8GB -Storage | 256GB +Storage | 256/512 Battery | 5000 mAh -Dimensions | 169 x 75.6 x 9 mm -Display | 1080 x 2460 pixels, 6.8" TFT IPS LCD, 144Hz, HDR10 -Rear Camera | 108 MP (f/1.9) + 8 MP (f/2.2) + 2 MP (f/2.4) -Front Camera | 32 MP (f/2.3) +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](https://fdn2.gsmarena.com/vv/pics/motorola/motorola-edge-2021-00.jpg) +## Device picture + +![Device Picture](https://i.imgur.com/04lu80E.png) diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml index 60c5b5c..82dd738 100644 --- a/audio/audio_effects.xml +++ b/audio/audio_effects.xml @@ -10,8 +10,6 @@ - - @@ -29,8 +27,6 @@ - - diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index d9e49a4..a4dc59a 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -44,6 +44,10 @@ + + + + sources="primary output,haptics output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> - 0,-3000 - 33,-2300 - 66,-1600 + 0,-3300 + 33,-2100 + 66,-1000 100,0 - - 1,-5800 - 34,-3200 - 67,-1600 - 100,0 - + - + + 1,-3500 + 33,-2100 + 66,-1300 + 100,-500 + - 1,-4800 - 34,-3200 - 67,-1600 + 1,-5400 + 34,-3600 + 67,-1800 100,0 @@ -62,12 +62,12 @@ - 1,-6400 - 30,-4300 - 43,-2600 - 65,-1400 - 85,-750 - 93,-500 + 1,-6500 + 30,-4500 + 43,-3300 + 65,-2200 + 85,-1200 + 93,-600 100,0 diff --git a/audio/sku_lahaina/audio_io_policy.conf b/audio/sku_lahaina/audio_io_policy.conf new file mode 100644 index 0000000..2c3df01 --- /dev/null +++ b/audio/sku_lahaina/audio_io_policy.conf @@ -0,0 +1,73 @@ +# List of profiles for the output device session where stream is routed. +# A stream opened with the inputs attributes which match the "flags" and +# "formats" as specified in the profile is routed to a device at +# sample rate specified under "sampling_rates" and bit width under +# "bit_width" and the topology extracted from the acdb data against +# the "app_type". +# +# the flags and formats are specified using the strings corresponding to +# enums in audio.h and audio_policy.h. They are concatenated with "|" +# without space or "\n". +# the flags and formats should match the ones in "audio_policy.conf" + +outputs { + default { + flags AUDIO_OUTPUT_FLAG_PRIMARY + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69937 + } + voip_rx { + flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69946 + } + 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 + bit_width 16 + app_type 69936 + } + 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 + 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 + bit_width 32 + app_type 69942 + } + 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 + bit_width 16 + app_type 69936 + } + 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 + bit_width 24 + app_type 69940 + } +} + +inputs { + voip_tx { + flags AUDIO_INPUT_FLAG_VOIP_TX + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69946 + } +} diff --git a/audio/sku_yupik/audio_platform_info.xml b/audio/sku_lahaina/audio_platform_info.xml similarity index 96% rename from audio/sku_yupik/audio_platform_info.xml rename to audio/sku_lahaina/audio_platform_info.xml index e61ad5b..ac8d143 100644 --- a/audio/sku_yupik/audio_platform_info.xml +++ b/audio/sku_lahaina/audio_platform_info.xml @@ -79,12 +79,11 @@ - + - @@ -101,6 +100,8 @@ + + @@ -156,7 +157,8 @@ - + + @@ -170,7 +172,7 @@ - + @@ -214,15 +216,13 @@ - + - - @@ -240,10 +240,10 @@ - - - - + + + + @@ -258,16 +258,16 @@ - - - - + + + + - + @@ -298,8 +298,6 @@ - - @@ -343,9 +341,9 @@ - - - + + + @@ -353,7 +351,6 @@ - @@ -365,12 +362,11 @@ - - - - - - + + + + + diff --git a/audio/sku_yupik/mixer_paths.xml b/audio/sku_lahaina/mixer_paths.xml similarity index 82% rename from audio/sku_yupik/mixer_paths.xml rename to audio/sku_lahaina/mixer_paths.xml index 074103b..bc42c57 100644 --- a/audio/sku_yupik/mixer_paths.xml +++ b/audio/sku_lahaina/mixer_paths.xml @@ -103,20 +103,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -191,7 +191,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -254,7 +254,7 @@ - + @@ -279,6 +279,7 @@ + @@ -291,6 +292,7 @@ + @@ -442,6 +444,7 @@ + @@ -451,8 +454,8 @@ - - + + @@ -464,7 +467,12 @@ - + + + + + + @@ -477,6 +485,11 @@ + + + + + @@ -495,23 +508,8 @@ - - - - - - - - - - - - - - - - + @@ -538,7 +536,7 @@ - + @@ -546,6 +544,7 @@ + @@ -603,12 +602,20 @@ + + + + - + + + + + @@ -616,6 +623,7 @@ + @@ -678,7 +686,7 @@ - + @@ -694,11 +702,16 @@ + + + + + @@ -738,12 +751,16 @@ + + + + - + @@ -755,6 +772,7 @@ + @@ -779,6 +797,14 @@ + + + + + + + + @@ -825,7 +851,7 @@ - + @@ -906,6 +932,7 @@ + @@ -930,6 +957,7 @@ + @@ -954,6 +982,7 @@ + @@ -978,6 +1007,7 @@ + @@ -1125,7 +1155,7 @@ - + @@ -1155,6 +1185,7 @@ + @@ -1164,7 +1195,7 @@ - + @@ -1183,7 +1214,7 @@ - + @@ -1213,6 +1244,7 @@ + @@ -1235,13 +1267,23 @@ + + + + + + + + + + - + @@ -1261,6 +1303,7 @@ + @@ -1283,6 +1326,16 @@ + + + + + + + + + + @@ -1299,7 +1352,7 @@ - + @@ -1315,6 +1368,7 @@ + @@ -1338,11 +1392,16 @@ - - - + + + + + + + + @@ -1361,6 +1420,7 @@ + @@ -1368,6 +1428,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1413,7 +1598,7 @@ - + @@ -1458,6 +1643,11 @@ + + + + + @@ -1493,6 +1683,10 @@ + + + + @@ -1573,6 +1767,14 @@ + + + + + + + + @@ -1581,18 +1783,10 @@ - - - - - - - - @@ -1605,10 +1799,6 @@ - - - - @@ -1629,6 +1819,14 @@ + + + + + + + + @@ -1641,10 +1839,6 @@ - - - - @@ -1668,7 +1862,7 @@ - + @@ -1676,8 +1870,9 @@ - - + + + @@ -1685,12 +1880,14 @@ - - + + + - - - + + + + @@ -1698,27 +1895,33 @@ - - + + + + + - - - - + + + + + + + - + - + @@ -1728,18 +1931,22 @@ - + - - - + + + - + - + + + + + @@ -1747,33 +1954,37 @@ - + - - - + + - + - - - + + + + + + + + - + - + @@ -1781,7 +1992,7 @@ - + @@ -1797,6 +2008,10 @@ + + + + @@ -1846,7 +2061,7 @@ - + @@ -1856,11 +2071,7 @@ - - - - - + @@ -1873,21 +2084,21 @@ + - - + - + @@ -2007,11 +2218,19 @@ + + + + + + + + @@ -2044,13 +2263,13 @@ - + - - + + @@ -2071,10 +2290,6 @@ - - - - @@ -2108,6 +2323,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/sku_lahaina/sound_trigger_mixer_paths.xml b/audio/sku_lahaina/sound_trigger_mixer_paths.xml new file mode 100644 index 0000000..bc5fa5d --- /dev/null +++ b/audio/sku_lahaina/sound_trigger_mixer_paths.xml @@ -0,0 +1,337 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/sku_lahaina/sound_trigger_platform_info.xml b/audio/sku_lahaina/sound_trigger_platform_info.xml new file mode 100644 index 0000000..6335847 --- /dev/null +++ b/audio/sku_lahaina/sound_trigger_platform_info.xml @@ -0,0 +1,471 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/idc/uinput-fpc.idc b/configs/idc/uinput-fpc.idc new file mode 100644 index 0000000..b63eb7e --- /dev/null +++ b/configs/idc/uinput-fpc.idc @@ -0,0 +1,9 @@ +# +# FPC1020 Touch sensor driver +# + +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 76641fb..9f16d76 100644 --- a/configs/idc/uinput_nav.idc +++ b/configs/idc/uinput_nav.idc @@ -1,5 +1,8 @@ -# Goodix side-type fingerprint sensor +# +# GF3626_Z9 gesture sensor driver +# device.internal = 1 + keyboard.layout = uinput_nav keyboard.builtIn = 1 keyboard.orientationAware = 1 diff --git a/configs/keylayout/uinput-fpc.kl b/configs/keylayout/uinput-fpc.kl new file mode 100644 index 0000000..b759909 --- /dev/null +++ b/configs/keylayout/uinput-fpc.kl @@ -0,0 +1,9 @@ +# +# FPC1020 Touch sensor driver +# +# + +# fpc1020 "finger present" +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 9a92198..2995801 100644 --- a/configs/keylayout/uinput_nav.kl +++ b/configs/keylayout/uinput_nav.kl @@ -1,7 +1,8 @@ -# Goodix side-type fingerprint sensor +# +# GF3626_Z9 gesture sensor driver +# -key 103 SYSTEM_NAVIGATION_UP -key 108 SYSTEM_NAVIGATION_DOWN - -# use SYSTEM_NAVIGATION_LEFT for double-tap gesture -key 115 SYSTEM_NAVIGATION_LEFT +key 618 SYSTEM_NAVIGATION_UP +key 619 SYSTEM_NAVIGATION_DOWN +# double tap +key 622 SYSTEM_NAVIGATION_LEFT diff --git a/device.mk b/device.mk index efd0eb1..e81a6af 100644 --- a/device.mk +++ b/device.mk @@ -1,18 +1,13 @@ # -# Copyright (C) 2022 The LineageOS Project +# Copyright (C) 2022-2023 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. -# + +# A/B +TARGET_IS_VAB := true # Boot animation TARGET_SCREEN_HEIGHT := 2400 @@ -36,15 +31,18 @@ DEVICE_PACKAGE_OVERLAYS += \ $(LOCAL_PATH)/overlay-lineage PRODUCT_PACKAGES += \ - FrameworksResBerlna \ - LineageSystemUIBerlna \ - SettingsProviderResBerlna \ - SystemUIResBerlna + FrameworksResXpeng \ + LineageSystemUIXpeng \ + SettingsProviderResXpeng \ + SystemUIResXpeng # Audio PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/sku_yupik/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/audio_platform_info.xml \ - $(LOCAL_PATH)/audio/sku_yupik/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/mixer_paths.xml \ + $(LOCAL_PATH)/audio/sku_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/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ $(LOCAL_PATH)/audio/audio_ext_spkr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_ext_spkr.conf \ @@ -53,7 +51,7 @@ PRODUCT_COPY_FILES += \ # Fingerprint PRODUCT_PACKAGES += \ - android.hardware.biometrics.fingerprint@2.1-service.berlna \ + android.hardware.biometrics.fingerprint@2.1-service.xpeng \ com.motorola.hardware.biometric.fingerprint@1.0.vendor $(foreach f,$(wildcard $(LOCAL_PATH)/configs/idc/*.idc),\ @@ -71,22 +69,20 @@ $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/bin/*.sh),\ # Init (recovery) PRODUCT_PACKAGES += \ - init.recovery.berlna.rc \ + init.recovery.xpeng.rc \ load_touch.sh # Lineage Touch PRODUCT_PACKAGES += \ - vendor.lineage.touch@1.0-service.berlna + vendor.lineage.touch@1.0-service.xpeng # Media PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \ - $(LOCAL_PATH)/media/media_profiles_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v0.xml \ - $(LOCAL_PATH)/media/media_profiles_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v1.xml + $(LOCAL_PATH)/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml # Lights PRODUCT_PACKAGES += \ - android.hardware.lights-service.berlna + android.hardware.lights-service.xpeng # NFC PRODUCT_PACKAGES += \ @@ -106,10 +102,10 @@ PRODUCT_COPY_FILES += \ # Sensors PRODUCT_PACKAGES += \ - sensors.berlna + sensors.xpeng PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf # Inherit from vendor blobs -$(call inherit-product, vendor/motorola/berlna/berlna-vendor.mk) +$(call inherit-product, vendor/motorola/xpeng/xpeng-vendor.mk) diff --git a/extract-files.sh b/extract-files.sh index 57b1a6d..53542e0 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -1,7 +1,7 @@ #!/bin/bash # # Copyright (C) 2016 The CyanogenMod Project -# Copyright (C) 2017-2020 The LineageOS Project +# Copyright (C) 2017-2023 The LineageOS Project # # SPDX-License-Identifier: Apache-2.0 # @@ -14,7 +14,7 @@ fi set -e -export DEVICE=berlna +export DEVICE=xpeng export DEVICE_COMMON=sm7325-common export VENDOR=motorola diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp index c9a8a1c..be4e566 100644 --- a/fingerprint/Android.bp +++ b/fingerprint/Android.bp @@ -1,21 +1,12 @@ // -// Copyright (C) 2017-2018 The LineageOS Project +// Copyright (C) 2017-2023 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 +// SPDX-License-Identifier: Apache-2.0 // -// 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.biometrics.fingerprint@2.1-service.berlna", - vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.berlna.xml"], - init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.berlna.rc"], + 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"], defaults: ["hidl_defaults"], relative_install_path: "hw", srcs: ["service.cpp", "BiometricsFingerprint.cpp"], diff --git a/fingerprint/BiometricsFingerprint.cpp b/fingerprint/BiometricsFingerprint.cpp index 4cd2b65..4a8de31 100644 --- a/fingerprint/BiometricsFingerprint.cpp +++ b/fingerprint/BiometricsFingerprint.cpp @@ -1,21 +1,11 @@ /* * Copyright (C) 2017 The Android Open Source Project - * Copyright (C) 2018-2020 The LineageOS Project + * Copyright (C) 2018-2023 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. + * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.berlna" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xpeng" #include "BiometricsFingerprint.h" diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.berlna.rc b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xpeng.rc similarity index 92% rename from fingerprint/android.hardware.biometrics.fingerprint@2.1-service.berlna.rc rename to fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xpeng.rc index 6a10422..63b1774 100644 --- a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.berlna.rc +++ b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xpeng.rc @@ -1,4 +1,4 @@ -service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.berlna +service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xpeng 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.berlna.xml b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xpeng.xml similarity index 100% rename from fingerprint/android.hardware.biometrics.fingerprint@2.1-service.berlna.xml rename to fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xpeng.xml diff --git a/fingerprint/service.cpp b/fingerprint/service.cpp index a547f63..5760589 100644 --- a/fingerprint/service.cpp +++ b/fingerprint/service.cpp @@ -1,20 +1,10 @@ /* * Copyright (C) 2017 The Android Open Source Project * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.berlna" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xpeng" #include #include diff --git a/lights/Android.bp b/lights/Android.bp index 86aba1f..197080f 100644 --- a/lights/Android.bp +++ b/lights/Android.bp @@ -14,10 +14,10 @@ // limitations under the License. cc_binary { - name: "android.hardware.lights-service.berlna", + name: "android.hardware.lights-service.xpeng", relative_install_path: "hw", - init_rc: ["android.hardware.lights.berlna.rc"], - vintf_fragments: ["android.hardware.lights.berlna.xml"], + init_rc: ["android.hardware.lights.xpeng.rc"], + vintf_fragments: ["android.hardware.lights.xpeng.xml"], vendor: true, shared_libs: [ "libbase", diff --git a/lights/Lights.cpp b/lights/Lights.cpp index d6a4489..71678ab 100644 --- a/lights/Lights.cpp +++ b/lights/Lights.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#define LOG_TAG "android.hardware.lights-service.berlna" +#define LOG_TAG "android.hardware.lights-service.xpeng" #include "Lights.h" #include diff --git a/lights/android.hardware.lights.berlna.rc b/lights/android.hardware.lights.xpeng.rc similarity index 98% rename from lights/android.hardware.lights.berlna.rc rename to lights/android.hardware.lights.xpeng.rc index fe48cb6..e754bfc 100644 --- a/lights/android.hardware.lights.berlna.rc +++ b/lights/android.hardware.lights.xpeng.rc @@ -1,4 +1,4 @@ -service vendor.light /vendor/bin/hw/android.hardware.lights-service.berlna +service vendor.light /vendor/bin/hw/android.hardware.lights-service.xpeng class hal user system group system diff --git a/lights/android.hardware.lights.berlna.xml b/lights/android.hardware.lights.xpeng.xml similarity index 100% rename from lights/android.hardware.lights.berlna.xml rename to lights/android.hardware.lights.xpeng.xml diff --git a/lineage_berlna.mk b/lineage_berlna.mk deleted file mode 100644 index d165e6e..0000000 --- a/lineage_berlna.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 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. -# - -# Inherit from those products. Most specific first. -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) - -# Inherit from berlna device -$(call inherit-product, device/motorola/berlna/device.mk) - -# Inherit some common Lineage stuff. -$(call inherit-product, vendor/lineage/config/common_full_phone.mk) - -PRODUCT_NAME := lineage_berlna -PRODUCT_DEVICE := berlna -PRODUCT_MANUFACTURER := motorola -PRODUCT_BRAND := motorola -PRODUCT_MODEL := motorola edge (2021) - -PRODUCT_GMS_CLIENTID_BASE := android-motorola - -PRODUCT_BUILD_PROP_OVERRIDES += \ - TARGET_PRODUCT=berlna_global \ - PRIVATE_BUILD_DESC="berlna_global-user 12 S1RMS32.48-18-11-2-19 5e5bb-394ae release-keys" - -BUILD_FINGERPRINT := motorola/berlna_global/berlna:12/S1RMS32M.68-43-16-3/394ae:user/release-keys diff --git a/lineage_xpeng.mk b/lineage_xpeng.mk new file mode 100644 index 0000000..c94e596 --- /dev/null +++ b/lineage_xpeng.mk @@ -0,0 +1,29 @@ +# +# Copyright (C) 2022-2023 The LineageOS Project +# +# SPDX-License-Identifier: Apache-2.0 +# + +# Inherit from those products. Most specific first. +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) + +# Inherit from xpeng device +$(call inherit-product, device/motorola/xpeng/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_MANUFACTURER := motorola +PRODUCT_BRAND := motorola +PRODUCT_MODEL := moto g200 5G + +PRODUCT_GMS_CLIENTID_BASE := android-motorola + +PRODUCT_BUILD_PROP_OVERRIDES += \ + TARGET_PRODUCT=xpeng_retail \ + PRIVATE_BUILD_DESC="xpeng_global-user 12 S1RXS32M.50-13-10 366f1 release-keys" + +BUILD_FINGERPRINT := motorola/xpeng_g/xpeng:12/S1RXS32M.50-13-10/366f1:user/release-keys diff --git a/manifest_berlna.xml b/manifest_xpeng.xml similarity index 100% rename from manifest_berlna.xml rename to manifest_xpeng.xml diff --git a/media/media_profiles_yupik_v0.xml b/media/media_profiles_yupik_v0.xml deleted file mode 100644 index 35dd969..0000000 --- a/media/media_profiles_yupik_v0.xml +++ /dev/null @@ -1,1814 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/media_profiles_yupik_v1.xml b/media/media_profiles_yupik_v1.xml deleted file mode 100644 index 35dd969..0000000 --- a/media/media_profiles_yupik_v1.xml +++ /dev/null @@ -1,1814 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules.blocklist b/modules.blocklist index 76c5af0..35e6664 100644 --- a/modules.blocklist +++ b/modules.blocklist @@ -98,9 +98,11 @@ blocklist utags # Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. # # Motorola product module block list -# - blocklist goodix_fod_mmi -blocklist ets_fps_mmi -blocklist camera -blocklist aw8695 +blocklist fpc1020_mmi +blocklist rbs_fps_mmi +blocklist watchdogtest +blocklist moto_f_usbnet +blocklist leds_aw99703 +blocklist leds_lm3697 +# diff --git a/modules.load b/modules.load index 46c4978..0b342fa 100644 --- a/modules.load +++ b/modules.load @@ -1,81 +1,81 @@ -mt2060.ko -adsp_loader_dlkm.ko -tua9001.ko -mc44s803.ko -fc0012.ko -mbhc_dlkm.ko -mt2063.ko -tx_macro_dlkm.ko -wcd937x_dlkm.ko -tuner-xc2028.ko -q6_notifier_dlkm.ko -xc5000.ko -snd_event_dlkm.ko -r820t.ko -wsa_macro_dlkm.ko -hid-aksys.ko -mt20xx.ko -wcd938x_dlkm.ko -xc4000.ko -tea5767.ko -swr_ctrl_dlkm.ko -tda18250.ko -tda18218.ko +qm1d1b0004.ko +wcd9xxx_dlkm.ko tuner-simple.ko fc2580.ko -mxl301rf.ko -msm_drm.ko -q6_dlkm.ko -tea5761.ko -swr_dmic_dlkm.ko -stub_dlkm.ko -rdbg.ko -pinctrl_wcd_dlkm.ko -platform_dlkm.ko -mxl5005s.ko -qt1010.ko -msi001.ko -mxl5007t.ko -llcc_perfmon.ko -wsa883x_dlkm.ko -native_dlkm.ko -qcom_edac.ko -swr_haptics_dlkm.ko -aw882xx_k504.ko -btpower.ko -bolero_cdc_dlkm.ko -hdmi_dlkm.ko -swr_dlkm.ko -bt_fm_slim.ko q6_pdr_dlkm.ko -rx_macro_dlkm.ko -slimbus-ngd.ko -wcd938x_slave_dlkm.ko -it913x.ko -tda18212.ko -mt2131.ko +tuner-xc2028.ko apr_dlkm.ko -va_macro_dlkm.ko -m88rs6000t.ko -camera.ko -wcd9xxx_dlkm.ko -si2157.ko -max2165.ko slimbus.ko -radio-i2c-rtc6226-qca.ko -machine_dlkm.ko +mc44s803.ko +adsp_loader_dlkm.ko +bolero_cdc_dlkm.ko +swr_dmic_dlkm.ko tuner-types.ko -fc0013.ko -e4000.ko -mt2266.ko -wcd_core_dlkm.ko -pinctrl_lpi_dlkm.ko -qm1d1c0042.ko +wcd937x_dlkm.ko +btpower.ko +llcc_perfmon.ko +hdmi_dlkm.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 +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 +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 +swr_ctrl_dlkm.ko +tua9001.ko +platform_dlkm.ko +msm_drm.ko fc0011.ko -qm1d1b0004.ko tda9887.ko -qca_cld3_qca6750.ko +si2157.ko +swr_haptics_dlkm.ko +msi001.ko +mxl301rf.ko +qcom_edac.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 @@ -90,15 +90,18 @@ bm_adsp_ulog.ko mmi_charger.ko qti_glink_charger.ko qpnp_adaptive_charge.ko -aw8695.ko mmi_relay.ko -goodix_fod_mmi.ko -ets_fps_mmi.ko -wl2864c.ko +wl2866d.ko cci_intf.ko -st21nfc.ko -sx937x_sar.ko -moto_f_usbnet.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 +goodix_fod_mmi.ko +rbs_fps_mmi.ko diff --git a/modules.load.recovery b/modules.load.recovery index 94584af..4e2dacc 100644 --- a/modules.load.recovery +++ b/modules.load.recovery @@ -1,9 +1,7 @@ -camera.ko msm_drm.ko -mmi_info.ko -mmi_annotate.ko -sensors_class.ko mmi_relay.ko +sensors_class.ko touchscreen_mmi.ko +mmi_annotate.ko +mmi_info.ko nova_0flash_mmi.ko -aw8695.ko diff --git a/proprietary-files.txt b/proprietary-files.txt index 29f87ea..75cda6f 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,10 +1,12 @@ -# All unpinned blobs below are extracted from RETUS - S1RMS32.48-18-11-2-19 5e5bb release-keys. +# All unpinned blobs below are extracted from xpeng_global-user 12 S1RXS32M.50-13-10 366f1 release-keys. # 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_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 vendor/etc/acdbdata/Bluetooth_cal.acdb vendor/etc/acdbdata/General_cal.acdb @@ -17,22 +19,15 @@ vendor/etc/acdbdata/adsp_avs_config.acdb # 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/etc/maxx_conf.ini -vendor/etc/maxx_default.mps -vendor/lib/libAndroidAlgSys.so vendor/lib/libacdbloader.so -vendor/lib/libc++_shared.so -vendor/lib/libMAM2_3-AlgFX-Coretex_A9.so vendor/lib64/libacdbloader.so -# Audio - soundfx -vendor/lib/soundfx/libmaxxeffect-cembedded.so -vendor/lib/soundfx/libbc360.so -vendor/lib64/soundfx/libbc360.so - # Camera vendor/etc/pwr/PowerFeatureConfig.xml vendor/etc/pwr/VideoPowerOptFeature.xml @@ -53,7 +48,14 @@ 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/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/libbitmlengine.so vendor/lib/libbitmlenginev2.so @@ -73,8 +75,15 @@ vendor/lib/libcamxswprocessalgo.so vendor/lib/libcamxtintlessalgo.so vendor/lib/libchilog.so vendor/lib/libcom.qti.chinodeutils.so +vendor/lib/libcvp2_1.so +vendor/lib/libcvp_common.so +vendor/lib/libcvp_util.so +vendor/lib/libcvpcpuRev_skel.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 @@ -86,14 +95,19 @@ 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 @@ -106,6 +120,7 @@ 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/lib/vendor.qti.hardware.cvp@1.0.so vendor/lib64/camera/fdconfigpreview.bin vendor/lib64/camera/fdconfigpreviewlite.bin vendor/lib64/camera/fdconfigvideo.bin @@ -123,9 +138,16 @@ 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/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 @@ -145,10 +167,17 @@ vendor/lib64/libcamxswprocessalgo.so vendor/lib64/libcamxtintlessalgo.so vendor/lib64/libchilog.so vendor/lib64/libcom.qti.chinodeutils.so +vendor/lib64/libcvp2_1.so +vendor/lib64/libcvp_common.so +vendor/lib64/libcvp_util.so +vendor/lib64/libcvpcpuRev_skel.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/libmfec.so vendor/lib64/libmmcamera_bestats.so vendor/lib64/libmmcamera_cac3.so vendor/lib64/libmmcamera_faceproc.so @@ -160,14 +189,20 @@ 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 vendor/lib64/libofflinelog.so vendor/lib64/libopencv.so +vendor/lib64/libopestriping.so vendor/lib64/libos.so vendor/lib64/libpowercore.so +vendor/lib64/libqll10.so +vendor/lib64/libqllengine.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 @@ -179,11 +214,14 @@ 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.cvp@1.0.so # Camera - Components -vendor/lib/camera/components/com.arcsoft.node.dc_capture.so -vendor/lib/camera/components/com.arcsoft.node.dc_preview.so +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 @@ -237,10 +275,12 @@ 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.dc_capture.so -vendor/lib64/camera/components/com.arcsoft.node.dc_preview.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.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 @@ -297,14 +337,14 @@ 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_gt24p64e_ov32b40_eeprom.so +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/lib/camera/com.mot.eeprom.mot_s5k4h7_otp.so -vendor/lib64/camera/com.mot.eeprom.mot_gt24p64e_ov32b40_eeprom.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 -vendor/lib64/camera/com.mot.eeprom.mot_s5k4h7_otp.so # Camera - etc vendor/etc/camera/aec_golden_depth.bin @@ -314,6 +354,7 @@ 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 @@ -385,36 +426,40 @@ vendor/lib64/motorola.hardware.camera.desktop@1.0.so vendor/lib64/motorola.hardware.camera.desktop@2.0.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_ov32b40.so -vendor/lib/camera/com.qti.sensor.mot_s5k4h7.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.sensor.mot_ov32b40.so -vendor/lib64/camera/com.qti.sensor.mot_s5k4h7.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_berlna_ov02b1b_sunwin.bin -vendor/lib/camera/com.qti.sensormodule.mot_berlna_ov32b40_qtech.bin -vendor/lib/camera/com.qti.sensormodule.mot_berlna_s5k4h7_qtech.bin -vendor/lib/camera/com.qti.sensormodule.mot_berlna_s5khm2_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_berlna_ov02b1b_sunwin.bin -vendor/lib64/camera/com.qti.sensormodule.mot_berlna_ov32b40_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_berlna_s5k4h7_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_berlna_s5khm2_qtech.bin +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 # Camera - tuned vendor/lib/camera/com.qti.tuned.default.bin -vendor/lib/camera/com.qti.tuned.mot_berlna_ov02b1b.bin -vendor/lib/camera/com.qti.tuned.mot_berlna_ov32b40.bin -vendor/lib/camera/com.qti.tuned.mot_berlna_s5k4h7.bin -vendor/lib/camera/com.qti.tuned.mot_berlna_s5khm2.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_berlna_ov02b1b.bin -vendor/lib64/camera/com.qti.tuned.mot_berlna_ov32b40.bin -vendor/lib64/camera/com.qti.tuned.mot_berlna_s5k4h7.bin -vendor/lib64/camera/com.qti.tuned.mot_berlna_s5khm2.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 # Display calibration data vendor/etc/qdcm_calib_data_mipi_mot_vid_tianma_1080p_dsc_678.xml @@ -423,6 +468,7 @@ vendor/etc/qdcm_calib_data_nt36672e_fhd_plus_120Hz_Video_panel.xml vendor/etc/qdcm_calib_data_nt36672e_fhd_plus_144Hz_video_panel.xml # Fingerprint (goodix) +vendor/bin/hw/goodix_ident vendor/lib64/hw/fingerprint.goodix.default.so vendor/lib64/libgf_ca.so vendor/lib64/libgf_hal.so @@ -432,82 +478,16 @@ vendor/lib64/vendor.goodix.hardware.biometrics.fingerprint@3.0.so # Fingerprint (egistec) vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-ets vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-ets2.rc -vendor/etc/init/init.ets.rc -vendor/lib64/libets_fp_et5.so -vendor/lib64/libets_teeclient.so -vendor/lib64/vendor.egistec.hardware.fingerprint@2.0.so +vendor/bin/hw/egis_ident +vendor/lib64/libRbsFlow.so +vendor/lib64/libets_teeclient_v2.so +vendor/lib64/vendor.egistec.hardware.fingerprint@4.0.so -# MotCamera3 -product/app/MotCamera3AI/MotCamera3AI.apk;PRESIGNED -product/priv-app/MotCamera3/MotCamera3.apk;OVERRIDES=Aperture|fe46dccdccfd08bc416fabc97662df3c15440aa6 -system_ext/etc/public.libraries-motocamera.txt -system_ext/framework/com.motorola.androidx.camera.extensions.jar -system_ext/lib/libmcf_native_window_helper.motocamera.so -system_ext/lib64/libmcf_native_window_helper.motocamera.so - -# MotCamera3 - Permissions -product/etc/permissions/com.motorola.camera3.xml -product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml -product/etc/permissions/privapp-permissions-com.motorola.camera3.xml -product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml -system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml - -# MotCamera3 - libs -product/lib64/libarcsoft_dualcam_refocus.so|cde6916a8b3c443e332c23e14229860a0e37aef0 -product/lib64/libarcsoft_frc.so|dab92e6bd066b44bb557f24c9cb2c587df2aab46 -product/lib64/libarcsoft_hdr_scbokeh_image.so|88391745e78f0234aa2514615ee8b3d76454d7e0 -product/lib64/libarcsoft_high_dynamic_range.so|a9e2790263c6ed369b643a363ab0ecf135002453 -product/lib64/libarcsoft_multiframe_bokeh_image.so|fcbb9c2f98b81f9462fa64ca8a79debcc64ac862 -product/lib64/libarcsoft_scbokeh_Generic.so|a79fe0b8febdb9b920782c15b345182251b7214d -product/lib64/libarcsoft_supernight.so|b5740dc9e0dceae9bdb89f3cc3b100222dc4bc4f -product/lib64/libarcsoft_superportrait.so|428f537e4995d8ef6138f118159b319c9cc8e918 -product/lib64/libas-super-slow-motion.so|1a822eb3a844d387f751fc60136c919f1d5289d0 -product/lib64/libbarhopper_v3.so|01401953109a122c281f7e625cd6099433b34bb7 -product/lib64/libbg-postproc-jni.so|2de65eaabd096ec5e0eac2dfb92158fe9878682c -product/lib64/libcamerax_extension_jni.so|484258aae91d462443bfc1627568522fc49a806c -product/lib64/libc++_shared.so|52beb16998338f6406e30a33b3066cd6cd457074 -product/lib64/libc++.so|e8707820517ab7713b8ca6ac4462361e00629c26 -product/lib64/libdoc-util.so|5cae17df39eed003f3b751b6ef3e1330faa0cea1 -product/lib64/libdynamic_depth.so|515f03132a086f15c565dd89b192ede5eeca7e29 -product/lib64/libfn-beauty-vfb-base.so|2116a9a2f2ff5e49e575e00985c3e18d295cdfbc -product/lib64/libFNVfbEngineHAL.so|a7365d9e7d728df8d4ad6ecfba07961fcf924d75 -product/lib64/libfoundation.so|ffb388c6c8876cebf4614a0e5ae31c482803dd91 -product/lib64/libgg-dynamic_depth.so|ae152e43f07bbd2b037d15b95d20c95451bfe5af -product/lib64/libgg-tensorflow-lite.so|08df2fdef345d48f8fecc5edc75c5e2bbb36bc08 -product/lib64/libgif.so|310d708f0c9b60c065514c1e3f1534c8ba347c7d -product/lib64/libjpeg.so|a51f6dde2a6d7eb11378a2575a5e6bf625a15bbb -product/lib64/liblenovo_panorama.so|31cc6042e0cdd661fa9ccd6472058d90dfde00d8 -product/lib64/libmcf-base.so|1dc98db1c8b7226bed72ec129fb5c3efa34f501f -product/lib64/libmcf-jni.so|991cb458d1a5ff8a43d83f7c5853dffee53e3da2 -product/lib64/libmcf-qc-fd-offline_local.so|99d2dbab152e22d6ae3d552cee3a172fc886ba24 -product/lib64/libmcf-stand-alone-sm.so|10a451062fa05ac259460f67dc7e06e50027372f -product/lib64/libmmcamera_faceproc2.so|1c732d58bf24c939f568cda340318e5b873dce3b -product/lib64/libmorpho_cinema_graph.so|c689a3734f6963b6ad4be3a9ddfae00c1c82acb0 -product/lib64/libmorpho_panorama_gp3.so|b8ef93fa1b2bcc7f3166bfe8783d650182299935 -product/lib64/libmorpho_sensor_fusion.so|eee6c344fc928d2c20a5e7a139d88d7cdbac7a73 -product/lib64/libmot-cinemagraph-engine.so|00bc323a7cc11d485ab1dc85403669b5b4313f8b -product/lib64/libmot-util.so|77ead032fb208a404da0072320ce399a16984ac2 -product/lib64/libmpbase.so|07021c39abbc5c8538f6df1876a3eb3015ff9c2a -product/lib64/libqc-snpe.so|3080e7127cf3fb3efc5e5da1ebe9715923d257e2 -product/lib64/libsmart_ppt.so|bc562289e07bb64095effd8ed473d822272b53b9 -product/lib64/libsmudge_detect.so|915e44b5013096b846b87c539d92200a0b048d23 -product/lib64/libSNPE.so|ddcec410b42f85808bb8b0d8359c7a6490a934de -product/lib64/libSuperSensorCPU_v05052021.so|22378fd888fc13dac8f46a250f101dbcdb6d44bc -product/lib64/libSuperSensorProcessorCWrapper_v2.so|7e66994ee9b8c7d637afb58e0e341e5c94cf23a2 -product/lib64/libSuperSensorProcessor_v05052021.so|2c9204b230bddd089070e5b9238c85b9fe6d94f8 -product/lib64/libSuperSensor_v05052021.so|dfbfc247087c8f9dfc86401918c8026b06eaf4a5 -product/lib64/libtensorflowlite_gpu_delegate.so|821bcbece27d47c49daac00a65fdf48213befad1 -product/lib64/libtensorflowlite.so|17f94dc427220788db8f10d658d3a330488ac7d6 - -# Moto Permissions -product/etc/permissions/com.motorola.camera3.berlna.xml:vendor/etc/permissions/com.motorola.camera3.berlna.xml -product/etc/permissions/com.motorola.camera3.content.ai.xml:vendor/etc/permissions/com.motorola.camera3.content.ai.xml -product/etc/permissions/com.motorola.camera3.lens.xml:vendor/etc/permissions/com.motorola.camera3.lens.xml -product/etc/permissions/com.motorola.camera3.xml:vendor/etc/permissions/com.motorola.camera3.xml -product/etc/permissions/com.motorola.moto-uirefresh.xml -product/etc/permissions/com.motorola.motodisplay.xml -product/etc/permissions/privapp-permissions-com.motorola.motodisplay.xml -system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml:vendor/etc/permissions/com.motorola.androidx.camera.extensions.xml +# Fingerprint (fpc) +vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-fpc +vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-fpc2.rc +vendor/bin/hw/fpc_ident +vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so # NFC vendor/bin/STFlashTool @@ -530,20 +510,24 @@ vendor/lib64/sensors.moto.so vendor/lib64/sensors.ssc.so # Sensor - configs -vendor/etc/sensors/config/ak991x_0.json -vendor/etc/sensors/config/bmp5_0.json -vendor/etc/sensors/config/icm4x6xx.json -vendor/etc/sensors/config/icp101xx.json -vendor/etc/sensors/config/icp201xx_0.json -vendor/etc/sensors/config/kodiak_default_sensors.json -vendor/etc/sensors/config/kodiak_dynamic_sensors.json -vendor/etc/sensors/config/kodiak_irq.json -vendor/etc/sensors/config/kodiak_power_0.json -vendor/etc/sensors/config/lps22hh_0.json -vendor/etc/sensors/config/lsm6dso_0.json -vendor/etc/sensors/config/mmc5603x_0.json +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 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 @@ -578,7 +562,6 @@ vendor/etc/sensors/config/sns_tilt_sw_disabled.json vendor/etc/sensors/config/sns_tilt_sw_enabled.json vendor/etc/sensors/config/sns_tilt_to_wake.json vendor/etc/sensors/config/sns_wrist_pedo.json -vendor/etc/sensors/config/stk3a5x_0.json vendor/etc/sensors/proto/als_mastercal.proto vendor/etc/sensors/proto/descriptor.proto vendor/etc/sensors/proto/mot_barocal.proto @@ -670,68 +653,13 @@ 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/hals.conf vendor/etc/sensors/sns_reg_config # Thermal engine - configs -vendor/etc/thermal-engine-berlna.conf +vendor/etc/thermal-engine-xpeng.conf vendor/etc/thermal-engine.conf # Touchscreen firmware -vendor/firmware/mp-novatek_ts-NT36675-21061805-603a-berlna.bin -vendor/firmware/novatek_ts-NT36675-21042101-603a-berlna-evt.bin -vendor/firmware/novatek_ts-NT36675-21061805-603a-berlna.bin -vendor/firmware/NT36xxx_MP_Setting_Criteria_603A.csv - -# Vibrator firmware -vendor/firmware/aw8695_haptic.bin -vendor/firmware/aw8695_rtp.bin -vendor/firmware/aw8695_rtp_Argo_Navis.bin -vendor/firmware/aw8695_rtp_Attentive.bin -vendor/firmware/aw8695_rtp_Awake.bin -vendor/firmware/aw8695_rtp_Bird_Loop.bin -vendor/firmware/aw8695_rtp_Brilliant_Times.bin -vendor/firmware/aw8695_rtp_Chimey_Phone.bin -vendor/firmware/aw8695_rtp_City_Lights.bin -vendor/firmware/aw8695_rtp_Complex.bin -vendor/firmware/aw8695_rtp_Crazy_Dream.bin -vendor/firmware/aw8695_rtp_Curve_Ball_Blend.bin -vendor/firmware/aw8695_rtp_Digital_Phone.bin -vendor/firmware/aw8695_rtp_Electrovision.bin -vendor/firmware/aw8695_rtp_Ether_Shake.bin -vendor/firmware/aw8695_rtp_Fateful_Words.bin -vendor/firmware/aw8695_rtp_Firefly.bin -vendor/firmware/aw8695_rtp_Flutey_Phone.bin -vendor/firmware/aw8695_rtp_Future_Funk.bin -vendor/firmware/aw8695_rtp_Future_Hi_Tech.bin -vendor/firmware/aw8695_rtp_Girtab.bin -vendor/firmware/aw8695_rtp_Hello.bin -vendor/firmware/aw8695_rtp_Hexagon.bin -vendor/firmware/aw8695_rtp_Hydra.bin -vendor/firmware/aw8695_rtp_Insert_Coin.bin -vendor/firmware/aw8695_rtp_Jumping_Dots.bin -vendor/firmware/aw8695_rtp_Keys.bin -vendor/firmware/aw8695_rtp_Loopy.bin -vendor/firmware/aw8695_rtp_Loopy_Lounge.bin -vendor/firmware/aw8695_rtp_Modular.bin -vendor/firmware/aw8695_rtp_Momentum.bin -vendor/firmware/aw8695_rtp_Morning.bin -vendor/firmware/aw8695_rtp_Moto.bin -vendor/firmware/aw8695_rtp_Natural.bin -vendor/firmware/aw8695_rtp_New_Player.bin -vendor/firmware/aw8695_rtp_Now_or_Never.bin -vendor/firmware/aw8695_rtp_Onward.bin -vendor/firmware/aw8695_rtp_Organ_Dub.bin -vendor/firmware/aw8695_rtp_Overclocked.bin -vendor/firmware/aw8695_rtp_Pegasus.bin -vendor/firmware/aw8695_rtp_Play.bin -vendor/firmware/aw8695_rtp_Pyxis.bin -vendor/firmware/aw8695_rtp_Regrade.bin -vendor/firmware/aw8695_rtp_Scarabaeus.bin -vendor/firmware/aw8695_rtp_Sceptrum.bin -vendor/firmware/aw8695_rtp_Simple.bin -vendor/firmware/aw8695_rtp_Solarium.bin -vendor/firmware/aw8695_rtp_Sparse.bin -vendor/firmware/aw8695_rtp_Terrabytes.bin -vendor/firmware/aw8695_rtp_Verizon_Airwaves.bin -vendor/firmware/aw8695_rtp_Zero_Hour.bin +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 diff --git a/recovery/Android.mk b/recovery/Android.mk index d302fe7..ae26448 100644 --- a/recovery/Android.mk +++ b/recovery/Android.mk @@ -3,10 +3,10 @@ LOCAL_PATH := $(call my-dir) # Recovery-Stuffs include $(CLEAR_VARS) -LOCAL_MODULE := init.recovery.berlna.rc +LOCAL_MODULE := init.recovery.xpeng.rc LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.recovery.berlna.rc +LOCAL_SRC_FILES := etc/init.recovery.xpeng.rc LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/ include $(BUILD_PREBUILT) diff --git a/recovery/bin/load_touch.sh b/recovery/bin/load_touch.sh index 1f872db..7747bdc 100644 --- a/recovery/bin/load_touch.sh +++ b/recovery/bin/load_touch.sh @@ -38,7 +38,7 @@ load_touch() cd $firmware_path case $panel_supplier in tianma) - firmware_file="novatek_ts-NT36675-21061805-603a-berlna.bin" + firmware_file="novatek_ts-NT36675-21101302-6044-xpeng.bin" ;; esac echo "Firmware file for upgrade $firmware_file" diff --git a/recovery/etc/init.recovery.berlna.rc b/recovery/etc/init.recovery.xpeng.rc similarity index 100% rename from recovery/etc/init.recovery.berlna.rc rename to recovery/etc/init.recovery.xpeng.rc diff --git a/resource-overlay/berlna/Frameworks/Android.bp b/resource-overlay/xpeng/Frameworks/Android.bp similarity index 69% rename from resource-overlay/berlna/Frameworks/Android.bp rename to resource-overlay/xpeng/Frameworks/Android.bp index 2085853..bbc615c 100644 --- a/resource-overlay/berlna/Frameworks/Android.bp +++ b/resource-overlay/xpeng/Frameworks/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "FrameworksResBerlna", + name: "FrameworksResXpeng", sdk_version: "current", vendor: true } diff --git a/resource-overlay/berlna/Frameworks/AndroidManifest.xml b/resource-overlay/xpeng/Frameworks/AndroidManifest.xml similarity index 89% rename from resource-overlay/berlna/Frameworks/AndroidManifest.xml rename to resource-overlay/xpeng/Frameworks/AndroidManifest.xml index 9a46ce5..48e80d6 100644 --- a/resource-overlay/berlna/Frameworks/AndroidManifest.xml +++ b/resource-overlay/xpeng/Frameworks/AndroidManifest.xml @@ -4,6 +4,6 @@ SPDX-License-Identifier: Apache-2.0 --> + package="android.overlay.xpeng"> diff --git a/resource-overlay/berlna/Frameworks/res/values-land/dimens.xml b/resource-overlay/xpeng/Frameworks/res/values-land/dimens.xml similarity index 100% rename from resource-overlay/berlna/Frameworks/res/values-land/dimens.xml rename to resource-overlay/xpeng/Frameworks/res/values-land/dimens.xml diff --git a/resource-overlay/berlna/Frameworks/res/values/config.xml b/resource-overlay/xpeng/Frameworks/res/values/config.xml similarity index 83% rename from resource-overlay/berlna/Frameworks/res/values/config.xml rename to resource-overlay/xpeng/Frameworks/res/values/config.xml index 60478a5..ab92e28 100644 --- a/resource-overlay/berlna/Frameworks/res/values/config.xml +++ b/resource-overlay/xpeng/Frameworks/res/values/config.xml @@ -1,6 +1,6 @@ @@ -24,16 +24,31 @@ backlight values for LUX levels between these control points. Must be overridden in platform specific overlays --> - + + 1 + 2 5 10 - 40 + 29 + 50 + 90 100 - 325 - 1250 - 3500 - 5500 - + 150 + 200 + 300 + 400 + 500 + 800 + 1000 + 1300 + 1500 + 1600 + 1800 + 2000 + 3000 + 4000 + 8000 + - 5 - 12 - 24 - 95 - 111 - 149 - 192 - 252 - 500 + 2 + 10 + 20 + 50 + 70 + 85 + 110 + 130 + 150 + 180 + 180 + 180 + 180 + 225 + 270 + 300 + 315 + 330 + 350 + 380 + 420 + 450 + 450 + 450 - + 0 - 4 - 7 - 13 - 51 - 59 - 82 + 1 + 6 + 11 + 28 + 40 + 48 + 62 + 74 + 85 102 - 138 + 128 + 153 + 170 + 179 + 187 + 198 + 215 + 238 255 - + 0 - 5 - 12 - 24 - 95 - 111 - 149 - 192 - 252 - 500 + 2 + 10 + 20 + 50 + 70 + 85 + 110 + 130 + 150 + 180 + 225 + 270 + 300 + 315 + 330 + 350 + 380 + 420 + 450 - 4 + 2 2 - + 0 67 - + - + 0 67 - + - + 0 30 - + - + 0 0 94 - + - + 0 15 30 15 - + true - - true - - - false - @@ -290,7 +331,7 @@ 120 - motorolaedge + motorolag2005G http://uaprof.motorola.com/phoneconfig/motov1/Profile/motov1.rdf diff --git a/resource-overlay/berlna/Frameworks/res/values/dimens.xml b/resource-overlay/xpeng/Frameworks/res/values/dimens.xml similarity index 80% rename from resource-overlay/berlna/Frameworks/res/values/dimens.xml rename to resource-overlay/xpeng/Frameworks/res/values/dimens.xml index 4b99404..f784591 100644 --- a/resource-overlay/berlna/Frameworks/res/values/dimens.xml +++ b/resource-overlay/xpeng/Frameworks/res/values/dimens.xml @@ -1,11 +1,11 @@ - 72px + 85.0px diff --git a/resource-overlay/berlna/Frameworks/res/xml/power_profile.xml b/resource-overlay/xpeng/Frameworks/res/xml/power_profile.xml similarity index 100% rename from resource-overlay/berlna/Frameworks/res/xml/power_profile.xml rename to resource-overlay/xpeng/Frameworks/res/xml/power_profile.xml diff --git a/resource-overlay/berlna/LineageSystemUI/Android.bp b/resource-overlay/xpeng/LineageSystemUI/Android.bp similarity index 52% rename from resource-overlay/berlna/LineageSystemUI/Android.bp rename to resource-overlay/xpeng/LineageSystemUI/Android.bp index c570fe8..f3fbf71 100644 --- a/resource-overlay/berlna/LineageSystemUI/Android.bp +++ b/resource-overlay/xpeng/LineageSystemUI/Android.bp @@ -1,9 +1,9 @@ // -// Copyright (C) 2022 The LineageOS Project +// Copyright (C) 2022-2023 The LineageOS Project // SPDX-License-Identifier: Apache-2.0 // runtime_resource_overlay { - name: "LineageSystemUIBerlna", + name: "LineageSystemUIXpeng", vendor: true, } diff --git a/resource-overlay/berlna/LineageSystemUI/AndroidManifest.xml b/resource-overlay/xpeng/LineageSystemUI/AndroidManifest.xml similarity index 75% rename from resource-overlay/berlna/LineageSystemUI/AndroidManifest.xml rename to resource-overlay/xpeng/LineageSystemUI/AndroidManifest.xml index c61812d..7004daa 100644 --- a/resource-overlay/berlna/LineageSystemUI/AndroidManifest.xml +++ b/resource-overlay/xpeng/LineageSystemUI/AndroidManifest.xml @@ -1,10 +1,10 @@ + package="com.android.systemui.xpeng.lineage"> + package="com.android.providers.settings.overlay.xpeng"> diff --git a/resource-overlay/berlna/SettingsProvider/res/values/config.xml b/resource-overlay/xpeng/SettingsProvider/res/values/config.xml similarity index 59% rename from resource-overlay/berlna/SettingsProvider/res/values/config.xml rename to resource-overlay/xpeng/SettingsProvider/res/values/config.xml index 8cdac02..b676f2c 100644 --- a/resource-overlay/berlna/SettingsProvider/res/values/config.xml +++ b/resource-overlay/xpeng/SettingsProvider/res/values/config.xml @@ -1,9 +1,9 @@ - motorola edge (2021) + Motorola g200 5G diff --git a/resource-overlay/berlna/SystemUI/Android.bp b/resource-overlay/xpeng/SystemUI/Android.bp similarity index 70% rename from resource-overlay/berlna/SystemUI/Android.bp rename to resource-overlay/xpeng/SystemUI/Android.bp index 73b2a33..f65bcac 100644 --- a/resource-overlay/berlna/SystemUI/Android.bp +++ b/resource-overlay/xpeng/SystemUI/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "SystemUIResBerlna", + name: "SystemUIResXpeng", sdk_version: "current", vendor: true } diff --git a/resource-overlay/berlna/SystemUI/AndroidManifest.xml b/resource-overlay/xpeng/SystemUI/AndroidManifest.xml similarity index 86% rename from resource-overlay/berlna/SystemUI/AndroidManifest.xml rename to resource-overlay/xpeng/SystemUI/AndroidManifest.xml index e1558b5..7b80e99 100644 --- a/resource-overlay/berlna/SystemUI/AndroidManifest.xml +++ b/resource-overlay/xpeng/SystemUI/AndroidManifest.xml @@ -5,6 +5,6 @@ --> + package="com.android.systemui.overlay.xpeng"> diff --git a/resource-overlay/berlna/SystemUI/res/values-land/dimens.xml b/resource-overlay/xpeng/SystemUI/res/values-land/dimens.xml similarity index 100% rename from resource-overlay/berlna/SystemUI/res/values-land/dimens.xml rename to resource-overlay/xpeng/SystemUI/res/values-land/dimens.xml diff --git a/resource-overlay/berlna/SystemUI/res/values/dimens.xml b/resource-overlay/xpeng/SystemUI/res/values/dimens.xml similarity index 92% rename from resource-overlay/berlna/SystemUI/res/values/dimens.xml rename to resource-overlay/xpeng/SystemUI/res/values/dimens.xml index efc717c..dac4e80 100644 --- a/resource-overlay/berlna/SystemUI/res/values/dimens.xml +++ b/resource-overlay/xpeng/SystemUI/res/values/dimens.xml @@ -8,9 +8,9 @@ 24dp - 10px + 19.0px - 6px + 5.0px @*android:dimen/status_bar_height @@ -18,8 +18,8 @@ @dimen/status_bar_padding_start - 10.0px - + 9.0px + 810px diff --git a/resource-overlay/berlna/SystemUI/res/values/integers.xml b/resource-overlay/xpeng/SystemUI/res/values/integers.xml similarity index 100% rename from resource-overlay/berlna/SystemUI/res/values/integers.xml rename to resource-overlay/xpeng/SystemUI/res/values/integers.xml diff --git a/rootdir/bin/init.oem.fingerprint.overlay.sh b/rootdir/bin/init.oem.fingerprint.overlay.sh deleted file mode 100644 index b44b0dc..0000000 --- a/rootdir/bin/init.oem.fingerprint.overlay.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/vendor/bin/sh -# -# Identify fingerprint sensor model -# -# Copyright (c) 2019 Lenovo -# All rights reserved. -# -# Changed Log: -# --------------------------------- -# April 15, 2019 chengql2@lenovo.com Initial version -# April 28, 2019 chengql2 Add fps_id creating step -# December 2, 2019 chengql2 Store fps_id into persist fs, and identify sensor -# again when secure unit boots as factory mode. - -script_name=${0##*/} -script_name=${script_name%.*} -function log { - echo "$script_name: $*" > /dev/kmsg -} - -persist_fps_id=/mnt/vendor/persist/fps/vendor_id - -FPS_VENDOR_GOODIX=goodix -FPS_VENDOR_EGIS=egis -FPS_VENDOR_NONE=none - -function is_file_ready { - if [ "$(ls $1)" != "" ]; then - return 0 - fi - log "$0 - wait for $1 ..." - for i in $(seq 1 100); do - if [ "$(ls $1)" == "" ]; then - continue - fi - return 0 - done - log "$0 - timeout" - return 1 -} - -function ident_fps { - log "- install Goodix FPS kernel module" - insmod /vendor/lib/modules/goodix_fod_mmi.ko - - log "- identify Goodix fingerprint sensor" - is_file_ready /dev/goodix_fp - is_file_ready /vendor/firmware_mnt/image/goodixfp.mdt - /vendor/bin/hw/goodix_ident - if [ $? -eq 0 ]; then - log "ok" - echo $FPS_VENDOR_GOODIX > $persist_fps_id - return 0 - fi - - log "- uninstall Goodix FPS kernel module" - rmmod goodix_fod_mmi - - log "- install Egis FPS kernel module" - insmod /vendor/lib/modules/ets_fps_mmi.ko - echo $FPS_VENDOR_EGIS > $persist_fps_id - return 0 -} - -if [ ! -f $persist_fps_id ]; then - ident_fps - return $? -fi - -fps_vendor=$(cat $persist_fps_id) -if [ -z $fps_vendor ]; then - fps_vendor=$FPS_VENDOR_NONE -fi -log "FPS vendor: $fps_vendor" - -if [ $fps_vendor == $FPS_VENDOR_EGIS ]; then - log "- install EgisTech FPS kernel module" - insmod /vendor/lib/modules/ets_fps_mmi.ko - return $? -fi - -if [ $fps_vendor == $FPS_VENDOR_GOODIX ]; then - log "- install Goodix FPS kernel module" - insmod /vendor/lib/modules/goodix_fod_mmi.ko - return $? -fi - -ident_fps -return $? diff --git a/rootdir/bin/init.oem.fingerprint2.sh b/rootdir/bin/init.oem.fingerprint2.sh index 8f6d37a..a663c1d 100644 --- a/rootdir/bin/init.oem.fingerprint2.sh +++ b/rootdir/bin/init.oem.fingerprint2.sh @@ -7,103 +7,172 @@ # # April 15, 2019 chengql2@lenovo.com Initial version # December 2, 2019 chengql2 Store fps_id into persist fs +# November 19, 2020 zengzm refactor the code, support more than 3 fingerprint sensors; support config. +# get the filename, contains the file postfix script_name=${0##*/} +# remove the file postfix script_name=${script_name%.*} function log { echo "$script_name: $*" > /dev/kmsg } -persist_fps_id=/mnt/vendor/persist/fps/vendor_id -persist_fps_id2=/mnt/vendor/persist/fps/last_vendor_id -MAX_TIMES=20 +PROP_GKI_PATH=ro.vendor.mot.gki.path +GKI_PATH=$(getprop $PROP_GKI_PATH) -if [ ! -f $persist_fps_id ]; then - log "warn: no associated persist file found" - return -1 +# for new projects, only need to config varible vendor_list,kernel_so_list,kernel_so_name_list,hal_list +# vendor_list: the array contains the sensor name, it will be used for system properties. +# kernel_so_list: the array contains the kernel so's absolute path. It will be used at insmod. +# kernel_so_name_list: the array contains the kernel so's name. It will be used at rmmod. +# 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/$GKI_PATH/rbs_fps_mmi.ko" "/vendor/lib/modules/$GKI_PATH/fpc1020_mmi.ko" "/vendor/lib/modules/$GKI_PATH/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') +last_vendor_index=`expr ${#vendor_list[@]} - 1` +vendor_list_size=${#vendor_list[@]} + +if [ $vendor_list_size != ${#kernel_so_list[@]} ]; then + log "error, vendor_list.size is not equal to kernel_so_list" + return 255 fi -FPS_VENDOR_NONE=none -FPS_VENDOR_EGIS=egis -FPS_VENDOR_GOODIX=goodix +if [ $vendor_list_size != ${#kernel_so_name_list[@]} ]; then + log "error, vendor_list.size is not equal to kernel_so_name_list" + return 255 +fi +if [ $vendor_list_size != ${#hal_list[@]} ]; then + log "error, vendor_list.size is not equal to hal_list" + return 255 +fi + +# At the current boot, what is the fingerprint sensor +persist_fps_id=/mnt/vendor/persist/fps/vendor_id + +# what is the fingerprint sensor successfully installed before. +persist_fps_id2=/mnt/vendor/persist/fps/last_vendor_id + +FPS_VENDOR_NONE=none +MAX_TIMES=20 + +# this property store FPS_STATUS_NONE or FPS_STATUS_OK +# after start fingerprint hal service, the hal service will set this property. prop_fps_status=vendor.hw.fingerprint.status + +# use this to trigger init.mmi.rc +prop_fps_ident=vendor.hw.fps.ident + +# if $prop_fps_status=$FPS_STATUS_OK, then will set prop_persist_fps to the specific vendor name. prop_persist_fps=persist.vendor.hardware.fingerprint FPS_STATUS_NONE=none FPS_STATUS_OK=ok +function find_vendor_index() { + # param1: the specific vendor name + # return: the vendor index in vendor_list. the valid index is from 0; if not found,return 255 + for temp_vendor_index in $(seq 0 $last_vendor_index) + do + if [ "${vendor_list[temp_vendor_index]}" = "$1" ]; then + return $temp_vendor_index + fi + done + return 255 +} + +function start_hal_service(){ + # param1: the vendor index + # return: 0 means success, will setprop $prop_persist_fps + setprop $prop_fps_status $FPS_STATUS_NONE + setprop $prop_fps_ident $FPS_STATUS_NONE + + insmod ${kernel_so_list[$1]} + sleep 1 + setprop $prop_fps_ident ${vendor_list[$1]} + + log "start ${hal_list[$1]}" + start ${hal_list[$1]} + + for ii in $(seq 1 $MAX_TIMES) + do + sleep 0.1 + fps_status=$(getprop $prop_fps_status) + # log "check fps vendor status: $fps_status" + if [ $fps_status != $FPS_STATUS_NONE ]; then + break + fi + done + + log "fingerprint HAL status: $fps_status" + if [ $fps_status == $FPS_STATUS_OK ]; then + log "start ${hal_list[$1]} hal success" + setprop $prop_persist_fps ${vendor_list[$1]} + return 0 + fi + + log "start ${hal_list[$1]} hal failed, remove kernel so: ${kernel_so_name_list[$1]} " + setprop ctl.stop ${hal_list[$1]} + rmmod ${kernel_so_name_list[$1]} + sleep 0.1 + # if failed,return 255 + return 255 +} + +# set last fingerprint sensor +fps_vendor=$(cat $persist_fps_id) +if [ -n "$fps_vendor" ] && [ "$fps_vendor" != $FPS_STATUS_NONE ]; then + echo $fps_vendor > $persist_fps_id2 +fi + +# get the identified fingerprint sensor fps_vendor2=$(cat $persist_fps_id2) if [ -z $fps_vendor2 ]; then fps_vendor2=$FPS_VENDOR_NONE fi log "FPS vendor (last): $fps_vendor2" + fps_vendor=$(cat $persist_fps_id) if [ -z $fps_vendor ]; then fps_vendor=$FPS_VENDOR_NONE fi -log "FPS vendor: $fps_vendor" +log "FPS vendor (current): $fps_vendor" -if [ $fps_vendor == $FPS_STATUS_NONE ]; then - log "warn: boot as the last FPS" - fps=$fps_vendor2 -else - fps=$fps_vendor -fi - -for i in $(seq 1 2); do - setprop $prop_fps_status $FPS_STATUS_NONE - if [ $fps == $FPS_VENDOR_GOODIX ]; then - log "- start service 'goodix_hal'" - start goodix_hal - else - log "- start service 'ets_hal'" - start ets_hal - fi - - sleep 1.2 - fps_status=$(getprop $prop_fps_status) - if [ $fps_status == $FPS_STATUS_NONE ]; then - log "- wait for fingerprint HAL service ..." - for j in $(seq 1 100); do - fps_status=$(getprop $prop_fps_status) - if [ $fps_status != $FPS_STATUS_NONE ]; then - break - fi - sleep 0.2 - done - fi - log "status: $fps_status" - if [ $fps_status == $FPS_STATUS_OK ]; then - log "HAL success" - setprop $prop_persist_fps $fps - if [ $fps_vendor2 == $fps ]; then +vendor_index=255 +# try to start the most recent success launched sensor. +if [ $fps_vendor != $FPS_STATUS_NONE ]; then + find_vendor_index $fps_vendor + vendor_index=$? + if [ $vendor_index != 255 ]; then + log "start $fps_vendor hal service" + start_hal_service $vendor_index + if [ $? != 255 ]; then return 0 fi - log "- update FPS vendor (last)" - echo $fps > $persist_fps_id2 - log "- done" - return 0 + fi +fi + +# try all the fingerprint sensors +for temp_vendor_index in $(seq 0 $last_vendor_index) +do + if [ $temp_vendor_index == $vendor_index ]; then + continue fi - if [ $fps == $fps_vendor2 ]; then - if [ $fps == $FPS_VENDOR_GOODIX ]; then - rmmod goodix_fod_mmi - insmod /vendor/lib/modules/ets_fps_mmi.ko - fps=$FPS_VENDOR_EGIS - else - rmmod ets_fps_mmi - insmod /vendor/lib/modules/goodix_fod_mmi.ko - fps=$FPS_VENDOR_GOODIX - fi - log "- update FPS vendor" - echo $fps > $persist_fps_id - sleep 1 - else - log "error: HAL fail again" - setprop $prop_persist_fps $FPS_VENDOR_NONE - echo $FPS_VENDOR_NONE > $persist_fps_id - log "- done" - return 1 + if [ ! -e ${kernel_so_list[$temp_vendor_index]} ]; then + log "does not exist ${kernel_so_list[$temp_vendor_index]},ignore this fingerprint sensor" + continue + fi + + start_hal_service $temp_vendor_index + if [ $? != 255 ]; then + echo ${vendor_list[$temp_vendor_index]} > $persist_fps_id + return 0 fi done + +log "error, no fingerprint sensor found" +setprop $prop_persist_fps $FPS_VENDOR_NONE +echo $FPS_VENDOR_NONE > $persist_fps_id diff --git a/rootdir/etc/init/hw/init.mmi.overlay.rc b/rootdir/etc/init/hw/init.mmi.overlay.rc index 60d1b28..dccdafe 100644 --- a/rootdir/etc/init/hw/init.mmi.overlay.rc +++ b/rootdir/etc/init/hw/init.mmi.overlay.rc @@ -4,28 +4,28 @@ 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 + 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/bm_adsp_ulog.ko - insmod /vendor/lib/modules/mmi_charger.ko - insmod /vendor/lib/modules/qti_glink_charger.ko - insmod /vendor/lib/modules/aw882xx_k504.ko - insmod /vendor/lib/modules/mmi_sys_temp.ko - insmod /vendor/lib/modules/wl2864c.ko - insmod /vendor/lib/modules/goodix_mmi.ko - insmod /vendor/lib/modules/camera.ko - insmod /vendor/lib/modules/aw8695.ko - insmod /vendor/lib/modules/cci_intf.ko - insmod /vendor/lib/modules/qpnp_adaptive_charge.ko - insmod /vendor/lib/modules/5.4-gki/camera.ko - insmod /vendor/lib/modules/5.4-gki/aw8695.ko - start vendor.mmi_modules + 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/fpc1020_mmi.ko + insmod /vendor/lib/modules/goodix_fod_mmi.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/rbs_fps_mmi.ko + insmod /vendor/lib/modules/wl2866d.ko on post-fs # Sensors - chown system system /sys/devices/platform/soc/a94000.spi/spi_master/spi0/spi0.0/touchscreen/NVT-ts/double_tap_enabled - chown system system /sys/devices/platform/soc/a94000.spi/spi_master/spi0/spi0.0/touchscreen/NVT-ts/double_tap_pressed + 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 on post-fs-data mkdir /mnt/vendor/persist/tof 0755 vendor_tcmd camera @@ -42,7 +42,6 @@ on post-fs-data # Param updater data for various modules mkdir /data/vendor/param 0775 system system mkdir /data/vendor/tzstorage/goodix 0770 system system - exec_start vendor.ident-fps-overlay-sh on early-boot # Goodix fingerprint @@ -50,52 +49,65 @@ on early-boot 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 - chown system system /sys/devices/platform/soc/a94000.i2c/i2c-2/2-0049/double_click - chmod 0660 /sys/devices/platform/soc/a94000.i2c/i2c-2/2-0049/double_click - chown system system /sys/devices/platform/soc/a94000.i2c/i2c-2/2-0049/single_click - chmod 0660 /sys/devices/platform/soc/a94000.i2c/i2c-2/2-0049/single_click - # Set adaptive charging perms for HAL + # 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 + # touch api + chown system system /sys/class/touchscreen/primary/interpolation + chmod 0660 /sys/class/touchscreen/primary/interpolation + chown system system /sys/class/touchscreen/primary/first_filter + 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 service capsense_reset /system/vendor/bin/capsense_reset - class core - user system - group system input - disabled + class core + user system + group system input + disabled on property:sys.boot_completed=1 start capsense_reset -on property:persist.vendor.paramfile.parse_panel=1 - write /sys/devices/platform/soc/soc:qcom,dsi-display-primary/dsi_display_parse_para "1" - -service vendor.ident-fps-overlay-sh /vendor/bin/init.oem.fingerprint.overlay.sh - class core - user root - group drmrpc system - oneshot - disabled - -service vendor.ident-fps-sh /vendor/bin/init.oem.fingerprint.sh - class core - user root - group drmrpc system - oneshot - disabled - -service egis_ident /vendor/bin/egis_ident +service egis_ident /vendor/bin/hw/egis_ident class late_start user system group system oneshot disabled + +service fpc_ident /vendor/bin/hw/fpc_ident + class late_start + user system + group system + oneshot + disabled + +service gf_ident /vendor/bin/hw/goodix_ident + class late_start + user system + group system input uhid + oneshot + disabled + +service vendor.hal-fps-sh /vendor/bin/init.oem.fingerprint2.sh + class late_start + user root + group system + oneshot diff --git a/rootdir/etc/init/init.ets.rc b/rootdir/etc/init/init.ets.rc new file mode 100644 index 0000000..c21ff02 --- /dev/null +++ b/rootdir/etc/init/init.ets.rc @@ -0,0 +1,22 @@ +# 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 faf18bf..156254a 100644 --- a/sensors/Android.bp +++ b/sensors/Android.bp @@ -1,11 +1,11 @@ // -// Copyright (C) 2022 The LineageOS Project +// Copyright (C) 2022-2023 The LineageOS Project // // SPDX-License-Identifier: Apache-2.0 // cc_library_shared { - name: "sensors.berlna", + name: "sensors.xpeng", defaults: ["hidl_defaults"], srcs: [ "Sensor.cpp", @@ -29,7 +29,7 @@ cc_library_shared { "android.hardware.sensors@2.X-multihal", ], cflags: [ - "-DLOG_TAG=\"sensors.berlna\"", + "-DLOG_TAG=\"sensors.xpeng\"", ], vendor: true, } diff --git a/sensors/hals.conf b/sensors/hals.conf index c5c2fc9..bc13bff 100644 --- a/sensors/hals.conf +++ b/sensors/hals.conf @@ -1,3 +1,3 @@ sensors.ssc.so sensors.moto.so -sensors.berlna.so +sensors.xpeng.so diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index e68be5d..a6e5891 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -1,8 +1,10 @@ # HAL Services -/(vendor|system/vendor)/bin/hw/android\.hardware\.lights-service\.berlna u:object_r:hal_light_default_exec:s0 -/(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.berlna u:object_r:hal_light_default_exec:s0 -/(vendor|system/vendor)/bin/init\.oem\.(fingerprint2|fingerprint\.overlay)\.sh u:object_r:vendor_init_fingerprint_exec:s0 -/(vendor|system/vendor)/bin/hw/egis_ident u:object_r:hal_fingerprint_default_exec:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.lights-service\.xpeng u:object_r:hal_light_default_exec:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.xpeng u:object_r:hal_light_default_exec:s0 +/(vendor|system/vendor)/bin/init\.oem\.(fingerprint2|fingerprint\.overlay)\.sh u:object_r:vendor_init_fingerprint_exec:s0 +/(vendor|system/vendor)/bin/hw/egis_ident u:object_r:hal_fingerprint_default_exec:s0 +/(vendor|system/vendor)/bin/hw/fpc_ident u:object_r:hal_fingerprint_default_exec:s0 +/(vendor|system/vendor)/bin/hw/goodix_ident u:object_r:hal_fingerprint_default_exec:s0 # Fingerprint /(mnt/vendor)/persist/egis(/.*)? u:object_r:fingerprint_vendor_data_file:s0 diff --git a/setup-makefiles.sh b/setup-makefiles.sh index c1d8c5b..f751947 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -1,14 +1,14 @@ #!/bin/bash # # Copyright (C) 2016 The CyanogenMod Project -# Copyright (C) 2017-2020 The LineageOS Project +# Copyright (C) 2017-2023 The LineageOS Project # # SPDX-License-Identifier: Apache-2.0 # set -e -export DEVICE=berlna +export DEVICE=xpeng export DEVICE_COMMON=sm7325-common export VENDOR=motorola diff --git a/system.prop b/system.prop index f4de379..4b8c159 100644 --- a/system.prop +++ b/system.prop @@ -1,3 +1,3 @@ # Google -ro.opa.device_model_id=motorola-berlna +ro.opa.device_model_id=motorola-xpeng ro.opa.eligible_device=true diff --git a/touch/Android.bp b/touch/Android.bp index d230e41..48bf2c0 100644 --- a/touch/Android.bp +++ b/touch/Android.bp @@ -1,22 +1,12 @@ // -// Copyright (C) 2020 The LineageOS Project +// Copyright (C) 2020-2023 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. +// SPDX-License-Identifier: Apache-2.0 cc_binary { - name: "vendor.lineage.touch@1.0-service.berlna", - vintf_fragments: ["vendor.lineage.touch@1.0-service.berlna.xml"], - init_rc: ["vendor.lineage.touch@1.0-service.berlna.rc"], + 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"], defaults: ["hidl_defaults"], relative_install_path: "hw", proprietary: true, diff --git a/touch/service.cpp b/touch/service.cpp index 05a30c5..ab717a3 100644 --- a/touch/service.cpp +++ b/touch/service.cpp @@ -1,20 +1,10 @@ /* - * Copyright (C) 2020 The LineageOS Project + * Copyright (C) 2020-2023 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. + * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_TAG "lineage.touch@1.0-service.berlna" +#define LOG_TAG "lineage.touch@1.0-service.xpeng" #include #include diff --git a/touch/vendor.lineage.touch@1.0-service.berlna.rc b/touch/vendor.lineage.touch@1.0-service.xpeng.rc similarity index 90% rename from touch/vendor.lineage.touch@1.0-service.berlna.rc rename to touch/vendor.lineage.touch@1.0-service.xpeng.rc index ba0c8d1..473236c 100644 --- a/touch/vendor.lineage.touch@1.0-service.berlna.rc +++ b/touch/vendor.lineage.touch@1.0-service.xpeng.rc @@ -1,4 +1,4 @@ -service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.berlna +service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.xpeng interface vendor.lineage.touch@1.0::IHighTouchPollingRate default class hal user system diff --git a/touch/vendor.lineage.touch@1.0-service.berlna.xml b/touch/vendor.lineage.touch@1.0-service.xpeng.xml similarity index 100% rename from touch/vendor.lineage.touch@1.0-service.berlna.xml rename to touch/vendor.lineage.touch@1.0-service.xpeng.xml diff --git a/update-sha1sums.py b/update-sha1sums.py index 2d18689..b9b7bf8 100755 --- a/update-sha1sums.py +++ b/update-sha1sums.py @@ -20,7 +20,7 @@ import os import sys from hashlib import sha1 -device='berlna' +device='xpeng' vendor='motorola' with open('proprietary-files.txt', 'r') as f: diff --git a/vendor.prop b/vendor.prop index a06c69e..9007637 100644 --- a/vendor.prop +++ b/vendor.prop @@ -1,5 +1,5 @@ # Bluetooth -bluetooth.device.default_name=motorola edge (2021) +bluetooth.device.default_name=Motorola g200 5G # Camera persist.vendor.camera.physical.num=4