From e4d777d6dd04bde8bb4d7ffb951ff07e5cdc3cfc Mon Sep 17 00:00:00 2001 From: Anand S Date: Sat, 5 Apr 2025 15:30:48 +0530 Subject: [PATCH] rhodep: Initial conversion to rhodep * All configs and files are from rhodep_g-user 13 T1SUS33.1-124-6-14 a15be release-keys. Change-Id: I003e30441fbff06a7551cdfe4358f6620cf3f67d --- AndroidProducts.mk | 2 +- BoardConfig.mk | 16 +- README.md | 2 +- audio/audio_ext_spkr.conf | 10 +- audio/audio_io_policy.conf | 115 +------ audio/audio_platform_info.xml | 113 ++++--- audio/audio_policy_configuration.xml | 53 ++-- audio/audio_policy_volumes.xml | 107 +++---- audio/default_volume_tables.xml | 30 +- audio/mixer_paths.xml | 287 +++++++----------- .../idc/{uinput_nav.idc => uinput-egis.idc} | 39 ++- configs/idc/uinput-focal.idc | 6 + configs/idc/uinput-fpc.idc | 20 -- .../{uinput_nav.kl => uinput-egis.kl} | 34 ++- configs/keylayout/uinput-focal.kl | 1 + configs/keylayout/uinput-fpc.kl | 21 -- device.mk | 35 +-- extract-files.py | 9 +- fingerprint/Android.bp | 6 +- fingerprint/BiometricsFingerprint.cpp | 2 +- ...metrics.fingerprint@2.1-service.rhodep.rc} | 2 +- ...etrics.fingerprint@2.1-service.rhodep.xml} | 0 fingerprint/service.cpp | 2 +- lineage_fogos.mk => lineage_rhodep.mk | 16 +- modules.blocklist | 23 +- modules.load | 91 +++--- modules.load.recovery | 17 +- proprietary-files.txt | 224 ++++++-------- .../Frameworks/res/xml/power_profile.xml | 82 ----- .../fogos/ProductFrameworks/Android.bp | 5 - .../ProductFrameworks/AndroidManifest.xml | 9 - .../ProductFrameworks/res/values/config.xml | 46 --- .../{fogos => rhodep}/Frameworks/Android.bp | 2 +- .../Frameworks/AndroidManifest.xml | 2 +- .../Frameworks/res/values-land/dimens.xml | 0 .../Frameworks/res/values/config.xml | 130 +++----- .../Frameworks/res/values/dimens.xml | 8 +- .../Frameworks/res/xml/power_profile.xml | 80 +++++ .../LineageSystemUI/Android.bp | 2 +- .../LineageSystemUI/AndroidManifest.xml | 2 +- .../LineageSystemUI/res/values/config.xml | 0 .../SettingsProvider/Android.bp | 2 +- .../SettingsProvider/AndroidManifest.xml | 2 +- .../SettingsProvider/res/values/config.xml | 2 +- .../{fogos => rhodep}/SystemUI/Android.bp | 2 +- .../SystemUI/AndroidManifest.xml | 2 +- .../SystemUI/res/values-land/dimens.xml | 0 .../SystemUI/res/values/dimens.xml | 18 +- .../SystemUI/res/values/integers.xml | 0 .../{fogos => rhodep}/Wifi/Android.bp | 2 +- .../Wifi/AndroidManifest.xml | 2 +- .../Wifi/res/values/config.xml | 2 +- rootdir/bin/init.oem.fingerprint.overlay.sh | 15 + rootdir/bin/init.oem.fingerprint2.sh | 24 +- rootdir/etc/init/hw/init.mmi.overlay.rc | 201 ++++-------- system.prop | 2 +- touch/Android.bp | 6 +- touch/service.cpp | 2 +- ...endor.lineage.touch@1.0-service.rhodep.rc} | 2 +- ...ndor.lineage.touch@1.0-service.rhodep.xml} | 0 vendor.prop | 11 +- 61 files changed, 740 insertions(+), 1208 deletions(-) rename configs/idc/{uinput_nav.idc => uinput-egis.idc} (81%) create mode 100644 configs/idc/uinput-focal.idc delete mode 100644 configs/idc/uinput-fpc.idc rename configs/keylayout/{uinput_nav.kl => uinput-egis.kl} (73%) create mode 100644 configs/keylayout/uinput-focal.kl delete mode 100644 configs/keylayout/uinput-fpc.kl rename fingerprint/{android.hardware.biometrics.fingerprint@2.1-service.fogos.rc => android.hardware.biometrics.fingerprint@2.1-service.rhodep.rc} (92%) rename fingerprint/{android.hardware.biometrics.fingerprint@2.1-service.fogos.xml => android.hardware.biometrics.fingerprint@2.1-service.rhodep.xml} (100%) rename lineage_fogos.mk => lineage_rhodep.mk (60%) delete mode 100644 resource-overlay/fogos/Frameworks/res/xml/power_profile.xml delete mode 100644 resource-overlay/fogos/ProductFrameworks/Android.bp delete mode 100644 resource-overlay/fogos/ProductFrameworks/AndroidManifest.xml delete mode 100644 resource-overlay/fogos/ProductFrameworks/res/values/config.xml rename resource-overlay/{fogos => rhodep}/Frameworks/Android.bp (69%) rename resource-overlay/{fogos => rhodep}/Frameworks/AndroidManifest.xml (89%) rename resource-overlay/{fogos => rhodep}/Frameworks/res/values-land/dimens.xml (100%) rename resource-overlay/{fogos => rhodep}/Frameworks/res/values/config.xml (86%) rename resource-overlay/{fogos => rhodep}/Frameworks/res/values/dimens.xml (61%) create mode 100644 resource-overlay/rhodep/Frameworks/res/xml/power_profile.xml rename resource-overlay/{fogos => rhodep}/LineageSystemUI/Android.bp (80%) rename resource-overlay/{fogos => rhodep}/LineageSystemUI/AndroidManifest.xml (87%) rename resource-overlay/{fogos => rhodep}/LineageSystemUI/res/values/config.xml (100%) rename resource-overlay/{fogos => rhodep}/SettingsProvider/Android.bp (65%) rename resource-overlay/{fogos => rhodep}/SettingsProvider/AndroidManifest.xml (84%) rename resource-overlay/{fogos => rhodep}/SettingsProvider/res/values/config.xml (78%) rename resource-overlay/{fogos => rhodep}/SystemUI/Android.bp (70%) rename resource-overlay/{fogos => rhodep}/SystemUI/AndroidManifest.xml (86%) rename resource-overlay/{fogos => rhodep}/SystemUI/res/values-land/dimens.xml (100%) rename resource-overlay/{fogos => rhodep}/SystemUI/res/values/dimens.xml (87%) rename resource-overlay/{fogos => rhodep}/SystemUI/res/values/integers.xml (100%) rename resource-overlay/{fogos => rhodep}/Wifi/Android.bp (85%) rename resource-overlay/{fogos => rhodep}/Wifi/AndroidManifest.xml (87%) rename resource-overlay/{fogos => rhodep}/Wifi/res/values/config.xml (96%) create mode 100755 rootdir/bin/init.oem.fingerprint.overlay.sh rename touch/{vendor.lineage.touch@1.0-service.fogos.rc => vendor.lineage.touch@1.0-service.rhodep.rc} (90%) rename touch/{vendor.lineage.touch@1.0-service.fogos.xml => vendor.lineage.touch@1.0-service.rhodep.xml} (100%) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index eaf7a8b..2303315 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -5,4 +5,4 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_fogos.mk + $(LOCAL_DIR)/lineage_rhodep.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index 54138f0..00b585f 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -4,17 +4,17 @@ # SPDX-License-Identifier: Apache-2.0 # -DEVICE_PATH := device/motorola/fogos +DEVICE_PATH := device/motorola/rhodep # Inherit from motorola sm6375-common include device/motorola/sm6375-common/BoardConfigCommon.mk # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := fogos +TARGET_BOOTLOADER_BOARD_NAME := rhodep # Kernel -BOARD_KERNEL_CMDLINE += androidboot.hab.product=fogos -TARGET_KERNEL_CONFIG += vendor/fogos_defconfig +BOARD_KERNEL_CMDLINE += androidboot.hab.product=rhodep +TARGET_KERNEL_CONFIG += vendor/rhodep_defconfig # Kernel Modules BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load)) @@ -23,8 +23,8 @@ BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVIC BOOT_KERNEL_MODULES := $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD) # Partitions -BOARD_MOT_DP_GROUP_SIZE := 5901385728 # (BOARD_SUPER_PARTITION_SIZE - 4MB) -BOARD_SUPER_PARTITION_SIZE := 5905580032 +BOARD_MOT_DP_GROUP_SIZE := 8608808960 # (BOARD_SUPER_PARTITION_SIZE - 4MB) +BOARD_SUPER_PARTITION_SIZE := 8613003264 # Properties TARGET_PRODUCT_PROP += $(DEVICE_PATH)/product.prop @@ -35,7 +35,7 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90 # Security patch level -VENDOR_SECURITY_PATCH := 2024-11-01 +VENDOR_SECURITY_PATCH := 2025-02-01 # inherit from the proprietary version -include vendor/motorola/fogos/BoardConfigVendor.mk +include vendor/motorola/rhodep/BoardConfigVendor.mk diff --git a/README.md b/README.md index 79ebe16..0b4bc6e 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# Device configuration files for Motorola moto g34 5G (fogos) +# Device configuration files for Motorola moto g82 5G (rhodep) diff --git a/audio/audio_ext_spkr.conf b/audio/audio_ext_spkr.conf index a310f30..4f317b7 100644 --- a/audio/audio_ext_spkr.conf +++ b/audio/audio_ext_spkr.conf @@ -1,5 +1,5 @@ global_config { - name fogos + name Rhodep force_ring_ramp true sonification_pad 20 sonification_prox_timeout_sec 5 @@ -9,7 +9,7 @@ ring { #dB to attenuate playback to meet safety level at each volume step #16 steps total, 15...0. In case of truncated list, last attenuation #given will be applied to all lower volume steps - attenuation 32,31,30,29,27,25,23,21,19,17,15,12,9,6,3,0 + attenuation 31,29,26,24,22,19,17,15,12,10,7,5,3,0,0,0 knee_step 16 } @@ -17,14 +17,14 @@ voice { #dB to attenuate playback to meet safety level at each volume step #16 steps total, 15...0. In case of truncated list, last attenuation #given will be applied to all lower volume steps - attenuation 32,31,30,29,27,25,23,21,19,17,15,12,9,6,3,0 - knee_step 16 + knee_step 1 + attenuation 0 } media { #dB to attenuate playback to meet safety level at each volume step #16 steps total, 15...0. In case of truncated list, last attenuation #given will be applied to all lower volume steps - attenuation 32,31,30,29,27,25,23,21,19,17,15,12,9,6,3,0 + attenuation 31,29,26,24,22,19,17,15,12,10,7,5,3,0,0,0 knee_step 16 } diff --git a/audio/audio_io_policy.conf b/audio/audio_io_policy.conf index 351bb90..dddeecf 100644 --- a/audio/audio_io_policy.conf +++ b/audio/audio_io_policy.conf @@ -11,130 +11,21 @@ # 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 - } - proaudio { - flags AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69943 - } voip_rx { - flags AUDIO_OUTPUT_FLAG_VOIP_RX + flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 8000|16000|32000|48000 + sampling_rates 48000 bit_width 16 app_type 69946 } - deep_buffer { - flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69936 - } - direct_pcm_16 { - flags AUDIO_OUTPUT_FLAG_DIRECT - formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT - sampling_rates 48000|96000 - bit_width 16 - app_type 69937 - } - direct_pcm_24 { - flags AUDIO_OUTPUT_FLAG_DIRECT - formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT - sampling_rates 48000|96000 - bit_width 24 - app_type 69940 - } - direct_pcm_32 { - flags AUDIO_OUTPUT_FLAG_DIRECT - formats AUDIO_FORMAT_PCM_32_BIT - sampling_rates 48000|96000 - bit_width 32 - app_type 69942 - } - compress_passthrough { - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH - formats AUDIO_FORMAT_DTS|AUDIO_FORMAT_DTS_HD|AUDIO_FORMAT_DSD - sampling_rates 48000 - bit_width 16 - app_type 69941 - } - compress_offload_16 { - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING - formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2|AUDIO_FORMAT_AAC_LATM_LC|AUDIO_FORMAT_AAC_LATM_HE_V1|AUDIO_FORMAT_AAC_LATM_HE_V2 - sampling_rates 48000|96000 - bit_width 16 - app_type 69937 - } - compress_offload_24 { - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING - formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2|AUDIO_FORMAT_AAC_LATM_LC|AUDIO_FORMAT_AAC_LATM_HE_V1|AUDIO_FORMAT_AAC_LATM_HE_V2 - sampling_rates 48000|96000 - bit_width 24 - app_type 69940 - } } inputs { - record_16bit { - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69938 - } - record_24bit { - formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT - sampling_rates 48000 - bit_width 24 - app_type 69948 - } - record_32bit { - formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT - sampling_rates 48000 - bit_width 32 - app_type 69949 - } - record_compress_16 { - flags AUDIO_INPUT_FLAG_COMPRESS - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69938 - } - record_compress_24 { - flags AUDIO_INPUT_FLAG_COMPRESS - formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT - sampling_rates 48000 - bit_width 24 - app_type 69948 - } - record_compress_32 { - flags AUDIO_INPUT_FLAG_COMPRESS - formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT - sampling_rates 48000 - bit_width 32 - app_type 69949 - } voip_tx { flags AUDIO_INPUT_FLAG_VOIP_TX formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 8000|16000|32000|48000 + sampling_rates 48000 bit_width 16 app_type 69946 } - low_latency_voip_tx { - flags AUDIO_INPUT_FLAG_FAST|AUDIO_INPUT_FLAG_VOIP_TX - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type - } } diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml index 5a896b4..a82a8df 100644 --- a/audio/audio_platform_info.xml +++ b/audio/audio_platform_info.xml @@ -99,7 +99,6 @@ - @@ -148,7 +147,6 @@ - @@ -179,8 +177,8 @@ - - + + @@ -228,7 +226,7 @@ - + @@ -252,12 +250,12 @@ - - - - - - + + + + + + @@ -267,47 +265,48 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + @@ -403,14 +402,14 @@ - - - - - - - - + + + + + + + + diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index f7145a1..6e9319d 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -49,22 +49,7 @@ - - - - - - - + + flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX"> @@ -126,6 +111,11 @@ + + + @@ -177,31 +167,31 @@ + sources="primary output,deep_buffer,compressed_offload,voip_rx"/> + sources="primary output,deep_buffer,compressed_offload,voip_rx"/> + sources="primary output,deep_buffer,compressed_offload,voip_rx"/> + sources="primary output,deep_buffer,compressed_offload,voip_rx"/> + sources="primary output,deep_buffer,compressed_offload,voip_rx"/> + sources="primary output,deep_buffer,voip_rx"/> + sources="primary output,deep_buffer,voip_rx"/> + sources="primary output,deep_buffer,voip_rx"/> + sources="primary output,deep_buffer,compressed_offload,voip_rx"/> + sources="primary output,deep_buffer,compressed_offload,voip_rx"/> + sources="primary output,deep_buffer,compressed_offload,hifi_playback,voip_rx"/> + sources="primary output,deep_buffer,compressed_offload,hifi_playback,voip_rx"/> + @@ -227,9 +219,6 @@ - - - diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml index ff391a1..7feafa4 100644 --- a/audio/audio_policy_volumes.xml +++ b/audio/audio_policy_volumes.xml @@ -1,4 +1,4 @@ - + - - + + 0,-3000 + 33,-2000 + 66,-1000 + 100,0 + + + 0,-2300 + 33,-1400 + 66,-650 + 100,0 + - 0,-2500 - 44,-1400 - 71,-700 + 0,-2400 + 33,-1600 + 66,-800 100,0 - 1,-3000 33,-2600 @@ -34,8 +40,6 @@ volume index from 0 to 100. ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> - - - - 1,-6550 - 15,-4300 - 30,-3050 - 43,-2200 - 65,-1150 - 85,-640 - 93,-280 - 100,0 - - - 1,-5500 - 13,-3950 - 20,-3400 - 27,-3200 - 33,-3150 - 40,-2990 - 47,-2650 - 50,-2500 - 60,-2200 - 66,-1950 - 73,-1750 - 80,-1550 - 86,-1150 - 90,-820 - 100,0 - + + - - - 1,-3600 - 33,-1950 - 60,-1600 - 100,-1000 + 1,-5300 + 70,-2890 + 84,-2010 + 100,-1300 - - - 1,-3000 33,-2600 66,-2200 100,-1800 - - - + 1,-3800 + 33,-2800 + 66,-2000 + 100,-1300 + + + 1,-2700 + 33,-1600 + 66,-700 + 100,0 + + - - - - - diff --git a/audio/default_volume_tables.xml b/audio/default_volume_tables.xml index 4db0816..70eacee 100644 --- a/audio/default_volume_tables.xml +++ b/audio/default_volume_tables.xml @@ -28,8 +28,8 @@ 1,-5300 - 33,-2990 - 66,-1800 + 70,-2390 + 84,-1010 100,0 @@ -37,7 +37,7 @@ 1,-3800 33,-3300 66,-2800 - 100,-1300 + 100,-2300 @@ -62,9 +62,12 @@ - 1,-5800 - 33,-3000 - 66,-1400 + 1,-5400 + 30,-3300 + 43,-2400 + 65,-1400 + 85,-750 + 93,-500 100,0 @@ -81,19 +84,4 @@ 60,-2100 100,-1000 - - - 1,-12700 - 20,-8000 - 60,-4000 - 100,0 - - - - - 0,-12700 - 20,-8000 - 60,-4000 - 100,0 - diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml index 54ed6a2..e142fe0 100644 --- a/audio/mixer_paths.xml +++ b/audio/mixer_paths.xml @@ -360,13 +360,12 @@ - - - + + + - @@ -432,8 +431,6 @@ - - @@ -448,21 +445,41 @@ - + + + + + + + + + + + + + + + + + + + + + - - + + - + @@ -503,12 +520,12 @@ - - + + - + @@ -531,11 +548,13 @@ - + + + - + @@ -663,11 +682,13 @@ - + + + - + @@ -799,11 +820,11 @@ - + - + @@ -934,11 +955,13 @@ - + + + - + @@ -1082,11 +1105,13 @@ - + + + - + @@ -1210,11 +1235,12 @@ - + + - + @@ -1337,11 +1363,12 @@ - + + - + @@ -1464,11 +1491,12 @@ - + + - + @@ -1591,11 +1619,12 @@ - + + - + @@ -1718,11 +1747,12 @@ - + + - + @@ -1845,11 +1875,12 @@ - + + - + @@ -1972,11 +2003,12 @@ - + + - + @@ -2430,12 +2462,13 @@ - + + - + @@ -2484,8 +2517,10 @@ - + + + @@ -2499,8 +2534,9 @@ - + + @@ -2508,11 +2544,6 @@ - - - - - @@ -2568,13 +2599,16 @@ - + + + - + + @@ -2587,11 +2621,6 @@ - - - - - @@ -2653,11 +2682,13 @@ - + + + - + @@ -2923,11 +2954,13 @@ - + + + - + @@ -3322,6 +3355,9 @@ + + + @@ -3415,43 +3451,27 @@ - - - - - - - - - - - - - - - - + + + + - - - - - - - - + + + + - + + + - - - + @@ -3516,7 +3536,7 @@ - + @@ -3549,15 +3569,9 @@ - - - - - - - - - + + + @@ -3637,41 +3651,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -3695,51 +3683,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -3859,10 +3804,6 @@ - - - - diff --git a/configs/idc/uinput_nav.idc b/configs/idc/uinput-egis.idc similarity index 81% rename from configs/idc/uinput_nav.idc rename to configs/idc/uinput-egis.idc index b7eb5b3..7acf10e 100644 --- a/configs/idc/uinput_nav.idc +++ b/configs/idc/uinput-egis.idc @@ -1,21 +1,18 @@ -# Copyright (C) 2010 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 - - -device.internal = 1 - -keyboard.layout = uinput_nav -keyboard.builtIn = 1 -keyboard.orientationAware = 1 - +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +device.internal = 1 +keyboard.layout = uinput-egis +keyboard.builtIn = 1 +keyboard.orientationAware = 1 diff --git a/configs/idc/uinput-focal.idc b/configs/idc/uinput-focal.idc new file mode 100644 index 0000000..bd9541e --- /dev/null +++ b/configs/idc/uinput-focal.idc @@ -0,0 +1,6 @@ +device.internal = 1 + +keyboard.layout = uinput-focal +keyboard.builtIn = 1 +keyboard.orientationAware = 1 + diff --git a/configs/idc/uinput-fpc.idc b/configs/idc/uinput-fpc.idc deleted file mode 100644 index 0faed28..0000000 --- a/configs/idc/uinput-fpc.idc +++ /dev/null @@ -1,20 +0,0 @@ -#Copyright (c) 2021 Fingerprint Cards AB -# -#Licensed under the Apache License, Version 2.0 (the "License"); -#you may not use this file except in compliance with the License. -#You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -#Unless required by applicable law or agreed to in writing, software -#distributed under the License is distributed on an "AS IS" BASIS, -#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -#See the License for the specific language governing permissions and -#limitations under the License. - -device.internal = 1 - -keyboard.layout = uinput-fpc -keyboard.builtIn = 1 -keyboard.orientationAware = 1 - diff --git a/configs/keylayout/uinput_nav.kl b/configs/keylayout/uinput-egis.kl similarity index 73% rename from configs/keylayout/uinput_nav.kl rename to configs/keylayout/uinput-egis.kl index b774e2a..b00f843 100644 --- a/configs/keylayout/uinput_nav.kl +++ b/configs/keylayout/uinput-egis.kl @@ -1,16 +1,18 @@ -# Copyright (C) 2010 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. - -key 618 SYSTEM_NAVIGATION_UP -key 619 SYSTEM_NAVIGATION_DOWN +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ets320 "finger present" +key 618 SYSTEM_NAVIGATION_UP +key 619 SYSTEM_NAVIGATION_DOWN +key 622 SYSTEM_NAVIGATION_LEFT diff --git a/configs/keylayout/uinput-focal.kl b/configs/keylayout/uinput-focal.kl new file mode 100644 index 0000000..d41ea68 --- /dev/null +++ b/configs/keylayout/uinput-focal.kl @@ -0,0 +1 @@ +key 622 SYSTEM_NAVIGATION_LEFT diff --git a/configs/keylayout/uinput-fpc.kl b/configs/keylayout/uinput-fpc.kl deleted file mode 100644 index 0464d4f..0000000 --- a/configs/keylayout/uinput-fpc.kl +++ /dev/null @@ -1,21 +0,0 @@ -# -# FPC1020 Touch sensor driver -# -# Copyright (c) 2021 Fingerprint Cards AB -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# fpc1020 "finger present" -# key 618 SYSTEM_NAVIGATION_UP -# key 619 SYSTEM_NAVIGATION_DOWN -key 622 SYSTEM_NAVIGATION_LEFT diff --git a/device.mk b/device.mk index f132f6d..86ef62e 100644 --- a/device.mk +++ b/device.mk @@ -10,30 +10,29 @@ TARGET_IS_VAB := true # Boot animation -TARGET_SCREEN_HEIGHT := 1600 -TARGET_SCREEN_WIDTH := 720 +TARGET_SCREEN_HEIGHT := 2400 +TARGET_SCREEN_WIDTH := 1080 # Screen -TARGET_SCREEN_DENSITY := 280 +TARGET_SCREEN_DENSITY := 400 # AAPT PRODUCT_AAPT_CONFIG := normal -PRODUCT_AAPT_PREF_CONFIG := 280dpi +PRODUCT_AAPT_PREF_CONFIG := 400dpi PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi -PRODUCT_SHIPPING_API_LEVEL := 34 +PRODUCT_SHIPPING_API_LEVEL := 31 # Inherit from motorola sm6375-common $(call inherit-product, device/motorola/sm6375-common/common.mk) # Overlays PRODUCT_PACKAGES += \ - FrameworksResFogos \ - LineageSystemUIFogos \ - ProductFrameworksResFogos \ - SettingsProviderResFogos \ - SystemUIResFogos \ - WifiResFogos + FrameworksResRhodep \ + LineageSystemUIRhodep \ + SettingsProviderResRhodep \ + SystemUIResRhodep \ + WifiResRhodep # Audio PRODUCT_COPY_FILES += \ @@ -46,13 +45,9 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ $(LOCAL_PATH)/audio/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml -# Camera -PRODUCT_PACKAGES += \ - libgui_shim_vendor - # Fingerprint PRODUCT_PACKAGES += \ - android.hardware.biometrics.fingerprint@2.1-service.fogos \ + android.hardware.biometrics.fingerprint@2.1-service.rhodep \ com.motorola.hardware.biometric.fingerprint@1.0.vendor $(foreach f,$(wildcard $(LOCAL_PATH)/configs/idc/*.idc),\ @@ -70,7 +65,7 @@ $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/bin/*.sh),\ # Lineage Touch PRODUCT_PACKAGES += \ - vendor.lineage.touch@1.0-service.fogos + vendor.lineage.touch@1.0-service.rhodep # NFC PRODUCT_PACKAGES += \ @@ -85,11 +80,7 @@ PRODUCT_PACKAGES += \ # Permissions PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \ frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ - frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \ - frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ - frameworks/native/data/etc/android.hardware.telephony.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.xml \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml # Sensors @@ -100,4 +91,4 @@ PRODUCT_COPY_FILES += \ PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH) # Inherit from vendor blobs -$(call inherit-product, vendor/motorola/fogos/fogos-vendor.mk) +$(call inherit-product, vendor/motorola/rhodep/rhodep-vendor.mk) diff --git a/extract-files.py b/extract-files.py index c03397e..52c48d3 100755 --- a/extract-files.py +++ b/extract-files.py @@ -9,6 +9,7 @@ from extract_utils.fixups_blob import ( blob_fixups_user_type, ) from extract_utils.fixups_lib import ( + lib_fixup_remove, lib_fixups, lib_fixups_user_type, ) @@ -32,15 +33,17 @@ namespace_imports = [ lib_fixups: lib_fixups_user_type = { **lib_fixups, + ( + 'libpowercore', + 'libmmcamera_mfnr', + ): lib_fixup_remove, } blob_fixups: blob_fixups_user_type = { - ('vendor/lib/libmot_chi_desktop_helper.so', 'vendor/lib64/libmot_chi_desktop_helper.so'): blob_fixup() - .add_needed('libgui_shim_vendor.so'), } # fmt: skip module = ExtractUtilsModule( - 'fogos', + 'rhodep', 'motorola', namespace_imports=namespace_imports, blob_fixups=blob_fixups, diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp index 49ecc3c..c499d2a 100644 --- a/fingerprint/Android.bp +++ b/fingerprint/Android.bp @@ -4,9 +4,9 @@ // SPDX-License-Identifier: Apache-2.0 // cc_binary { - name: "android.hardware.biometrics.fingerprint@2.1-service.fogos", - vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.fogos.xml"], - init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.fogos.rc"], + name: "android.hardware.biometrics.fingerprint@2.1-service.rhodep", + vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.rhodep.xml"], + init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.rhodep.rc"], defaults: ["hidl_defaults"], relative_install_path: "hw", srcs: ["service.cpp", "BiometricsFingerprint.cpp"], diff --git a/fingerprint/BiometricsFingerprint.cpp b/fingerprint/BiometricsFingerprint.cpp index 3a06cef..e960aa1 100644 --- a/fingerprint/BiometricsFingerprint.cpp +++ b/fingerprint/BiometricsFingerprint.cpp @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.fogos" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.rhodep" #include "BiometricsFingerprint.h" diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.fogos.rc b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.rhodep.rc similarity index 92% rename from fingerprint/android.hardware.biometrics.fingerprint@2.1-service.fogos.rc rename to fingerprint/android.hardware.biometrics.fingerprint@2.1-service.rhodep.rc index c4cec11..a19688d 100644 --- a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.fogos.rc +++ b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.rhodep.rc @@ -1,4 +1,4 @@ -service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.fogos +service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.rhodep 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.fogos.xml b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.rhodep.xml similarity index 100% rename from fingerprint/android.hardware.biometrics.fingerprint@2.1-service.fogos.xml rename to fingerprint/android.hardware.biometrics.fingerprint@2.1-service.rhodep.xml diff --git a/fingerprint/service.cpp b/fingerprint/service.cpp index 97b9fc0..6952cd2 100644 --- a/fingerprint/service.cpp +++ b/fingerprint/service.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.fogos" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.rhodep" #include #include diff --git a/lineage_fogos.mk b/lineage_rhodep.mk similarity index 60% rename from lineage_fogos.mk rename to lineage_rhodep.mk index 83e866b..9ab5494 100644 --- a/lineage_fogos.mk +++ b/lineage_rhodep.mk @@ -9,21 +9,21 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) TARGET_SUPPORTS_OMX_SERVICE := false $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) -# Inherit from fogos device -$(call inherit-product, device/motorola/fogos/device.mk) +# Inherit from rhodep device +$(call inherit-product, device/motorola/rhodep/device.mk) # Inherit some common Lineage stuff. $(call inherit-product, vendor/lineage/config/common_full_phone.mk) -PRODUCT_NAME := lineage_fogos -PRODUCT_DEVICE := fogos +PRODUCT_NAME := lineage_rhodep +PRODUCT_DEVICE := rhodep PRODUCT_MANUFACTURER := motorola PRODUCT_BRAND := motorola -PRODUCT_MODEL := moto g34 5G +PRODUCT_MODEL := moto g82 5G PRODUCT_GMS_CLIENTID_BASE := android-motorola PRODUCT_BUILD_PROP_OVERRIDES += \ - BuildDesc="fogos_g-user 14 U1UGS34M.23-82-2-6 0b9749 release-keys" \ - BuildFingerprint=motorola/fogos_g/fogos:11/U1UGS34.23-82-2-6/e21904:user/release-keys \ - DeviceProduct=fogos_g + BuildDesc="rhodep_g-user 13 T1SUS33M.1-124-6-14 2ee2d0 release-keys" \ + BuildFingerprint=motorola/rhodep_g/rhodep:13/T1SUS33M.1-124-6-14/2ee2d0:user/release-keys \ + DeviceProduct=rhodep_g diff --git a/modules.blocklist b/modules.blocklist index a5615ce..fa40eae 100644 --- a/modules.blocklist +++ b/modules.blocklist @@ -99,13 +99,20 @@ blocklist moto_f_usbnet # Motorola product module block list # -blocklist goodix_fod_mmi +blocklist fpsensor_spi_tee +blocklist rbs_fps_mmi +blocklist focal_fps_mmi blocklist fpc1020_mmi blocklist qpnp_adaptive_charge -blocklist nova_0flash_mmi -blocklist leds_aw99703 -blocklist leds_lm3697 -blocklist focaltech_0flash_v2_mmi -blocklist mmi_smbcharger_iio -blocklist chipone_tddi_v2_mmi -blocklist ilitek_v3_mmi +blocklist goodix_brl_mmi +blocklist tcpc_class +blocklist tcpc_rt1711h +blocklist tcpc_sgm7220.ko +blocklist rt_pd_manager +blocklist mmi_charger +blocklist mmi_discrete_charger_class +blocklist mmi_discrete_charger +blocklist sgm4154x_charger +blocklist bq2589x_charger +blocklist bq2597x_mmi_iio +blocklist mmi_discrete_turbo_charger diff --git a/modules.load b/modules.load index e9a2a0e..667214b 100644 --- a/modules.load +++ b/modules.load @@ -1,41 +1,34 @@ -sec_nfc.ko -lzo_decompress.ko -wcd9xxx_dlkm.ko -q6_pdr_dlkm.ko -apr_dlkm.ko -adsp_loader_dlkm.ko +swr_ctrl_dlkm.ko +va_macro_dlkm.ko +btpower.ko +platform_dlkm.ko +pinctrl_lpi_dlkm.ko +wcd938x_dlkm.ko bolero_cdc_dlkm.ko wcd937x_dlkm.ko -btpower.ko -lzo.ko +snd_event_dlkm.ko +stub_dlkm.ko +wcd_core_dlkm.ko +q6_dlkm.ko +q6_pdr_dlkm.ko tx_macro_dlkm.ko native_dlkm.ko -q6_dlkm.ko -wcd937x_slave_dlkm.ko -mbhc_dlkm.ko -bt_fm_slim.ko -camera.ko -q6_notifier_dlkm.ko -wcd938x_dlkm.ko -wsa881x_analog_dlkm.ko -lzo_compress.ko -rdbg.ko -stub_dlkm.ko -lzo-rle.ko -zram.ko -aw882xx_acf.ko -swr_dlkm.ko -rx_macro_dlkm.ko -pinctrl_lpi_dlkm.ko -wcd938x_slave_dlkm.ko -machine_dlkm.ko -wcd_core_dlkm.ko -va_macro_dlkm.ko aw882xx_k419.ko -swr_ctrl_dlkm.ko -platform_dlkm.ko -fs1815_dlkm.ko -snd_event_dlkm.ko +rx_macro_dlkm.ko +wsa881x_analog_dlkm.ko +aw882xx_acf.ko +wcd937x_slave_dlkm.ko +bt_fm_slim.ko +rdbg.ko +wcd9xxx_dlkm.ko +wcd938x_slave_dlkm.ko +camera.ko +machine_dlkm.ko +mbhc_dlkm.ko +q6_notifier_dlkm.ko +adsp_loader_dlkm.ko +swr_dlkm.ko +apr_dlkm.ko wlan.ko rmnet_core.ko rmnet_ctl.ko @@ -50,17 +43,29 @@ exfat.ko moto_f_usbnet.ko watchdogtest.ko qpnp_adaptive_charge.ko -goodix_fod_mmi.ko -fpc1020_mmi.ko +rbs_fps_mmi.ko +focal_fps_mmi.ko +ldo_vibrator_mmi.ko +wl2868c.ko +cci_intf.ko sensors_class.ko mmi_relay.ko +touchscreen_mmi.ko +goodix_brl_mmi.ko +sec_nfc.ko sx937x_sar.ko -awinic_sar.ko mmi_sys_temp.ko -ldo_vibrator_mmi.ko -cci_intf.ko -mmi-smbcharger-iio.ko -chipone_tddi_v2_mmi.ko -ilitek_v3_mmi.ko -moto_mm.ko -moto_swap.ko +sm5602_fg_mmi.ko +tcpc_class.ko +tcpc_sgm7220.ko +adapter_class.ko +rt_pd_manager.ko +sgm4154x_charger.ko +bq2589x_charger.ko +bq2597x_mmi_iio.ko +mmi_charger.ko +mmi_discrete_charger_class.ko +mmi_discrete_charger.ko +leds_aw99703.ko +leds_lm3697.ko +mmi_discrete_turbo_charger.ko diff --git a/modules.load.recovery b/modules.load.recovery index 2eb6a15..0a3266e 100644 --- a/modules.load.recovery +++ b/modules.load.recovery @@ -6,7 +6,18 @@ sensors_class.ko moto_f_usbnet.ko watchdogtest.ko qpnp_adaptive_charge.ko -sensors_class.ko -ilitek_v3_mmi.ko +goodix_brl_mmi.ko +touchscreen_mmi.ko +sm5602_fg_mmi.ko +tcpc_class.ko +tcpc_sgm7220.ko +adapter_class.ko +rt_pd_manager.ko +sgm4154x_charger.ko +bq2589x_charger.ko +bq2597x_mmi_iio.ko mmi_sys_temp.ko -mmi-smbcharger-iio.ko +mmi_charger.ko +mmi_discrete_charger_class.ko +mmi_discrete_charger.ko +mmi_discrete_turbo_charger.ko diff --git a/proprietary-files.txt b/proprietary-files.txt index 35498a3..7f19ae0 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,12 +1,14 @@ -# All unpinned blobs are extracted from fogos_g-user 14 U1UGS34.23-82-2-6 e21904 release-keys +# All unpinned blobs are extracted from rhodep_g-user 13 T1SUS33.1-124-6-14 a15be 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.0_0.0__3.0.0_0.0__eai_1.00-1.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.6.0_0.0__3.0.0_0.0__eai_1.00.pmd vendor/etc/acdbdata/nn_ns_models/fai__2.6.1_0.0__eai_v1.10.pmd -vendor/etc/acdbdata/nn_ns_models/fai__2.6.3_0.0__3.0.0_0.0__eai_1.10.pmd vendor/etc/acdbdata/nn_ns_models/fai__2.6.3_0.0__3.0.0_0.0__eai_1.10_enpu1.pmd +vendor/etc/acdbdata/nn_ns_models/fai__2.6.3_0.0__3.0.0_0.0__eai_1.10.pmd vendor/etc/acdbdata/nn_ns_models/fai__2.6.3_0.0__3.0.0_0.0__eai_1.36_enpu2.pmd vendor/etc/acdbdata/nn_ns_models/fai__2.7.4_0.0__3.0.0_0.0__eai_1.10_enpu1.pmd vendor/etc/acdbdata/nn_vad_models/fai_3.0.0_0.0_eai_1.00.pmd @@ -24,15 +26,6 @@ vendor/lib/libacdbloader.so vendor/lib64/libacdbloader.so # Camera -vendor/etc/bst_3ddns_1.cfg -vendor/etc/bst_3ddns_2.cfg -vendor/etc/bst_3ddns_3.cfg -vendor/etc/bstconfig/hdrcfg.cfg -vendor/etc/pwr/PowerFeatureConfig.xml -vendor/etc/pwr/VideoPowerOptFeature.xml -vendor/lib/libcamxexternalformatutils.so -vendor/lib64/libc2d_helper.so -vendor/lib64/libhdr_impl.so vendor/lib64/camera/fdconfigpreview.bin vendor/lib64/camera/fdconfigpreviewlite.bin vendor/lib64/camera/fdconfigvideo.bin @@ -46,14 +39,9 @@ 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/libaidenoiser.so -vendor/lib64/libaidenoiserv2.so -vendor/lib64/libbitmlengine.so +vendor/lib64/libBSTSWAD.so;DISABLE_CHECKELF vendor/lib64/libbitmlenginev2.so -vendor/lib64/libBST3DDNS.so -vendor/lib64/libBSTHDRDETECT.so -vendor/lib64/libBSTMultiExpoGainHDR.so -vendor/lib64/libBSTNodeUtils.so +vendor/lib64/libbitmlengine.so vendor/lib64/libcamera_nn_stub.so vendor/lib64/libcamerapostproc.so vendor/lib64/libcamxexternalformatutils.so @@ -69,59 +57,42 @@ vendor/lib64/libcamxswprocessalgo.so vendor/lib64/libcamxtintlessalgo.so vendor/lib64/libchilog.so vendor/lib64/libcom.qti.chinodeutils.so +vendor/lib64/libfcell.so vendor/lib64/libipebpsstriping.so vendor/lib64/libipebpsstriping170.so vendor/lib64/libjpege.so -vendor/lib64/libarcsoft_chi_utils.so -vendor/lib64/libarcsoft_portrait_super_night_se_raw.so -vendor/lib64/libarcsoft_super_night_raw.so -vendor/lib64/libarcsoft_super_night_se_raw.so -vendor/lib64/libportrait_repair_ppl3_ocl.so -vendor/lib64/libmot_chi_desktop_helper.so -vendor/lib64/libmot_engine_settings.so -vendor/lib64/liblowlight_ai_portrait.arcsoft.so vendor/lib64/libmctfengine_stub.so -vendor/lib64/libmfec.so -vendor/lib64/libmmcamera_bestats.so vendor/lib64/libmmcamera_cac3.so -vendor/lib64/libmmcamera_faceproc.so -vendor/lib64/libmmcamera_faceproc2.so -vendor/lib64/libmmcamera_lscv35.so -vendor/lib64/libmmcamera_mfnr.so -vendor/lib64/libmmcamera_mfnr_t4.so -vendor/lib64/libmmcamera_pdpc.so vendor/lib64/libmot_afd.so +vendor/lib64/libmotoisdataqueue.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/libremosaic_wrapper.so vendor/lib64/libswregistrationalgo.so -vendor/lib64/libsynx.so vendor/lib64/libtfestriping.so -vendor/lib64/libthreadutils.so +vendor/lib64/libundistort_impl.so +vendor/lib64/libvideooptfeature.so;DISABLE_CHECKELF vendor/lib64/libvidhance.so +vendor/lib64/libvidhance_active_ois.so +vendor/lib64/libvidhance_dmbr.so +vendor/lib64/libvidhance_face_stabilizer.so +vendor/lib64/libvidhance_fbc.so +vendor/lib64/libvidhance_horizon_correction.so +vendor/lib64/libvidhance_stabilizer.so +vendor/lib64/libvidhance_zoom_stabilization.so vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so -# Camera - Motorola -vendor/etc/init/motorola.hardware.camera.imgtuner@2.0-service.rc -vendor/lib64/hw/motorola.hardware.camera.imgtuner@2.0-impl.so;DISABLE_CHECKELF -vendor/lib64/motorola.hardware.camera.imgtuner@1.0.so;DISABLE_CHECKELF -vendor/lib64/motorola.hardware.camera.imgtuner@2.0.so;DISABLE_CHECKELF -vendor/lib64/motorola.hardware.camera.desktop@1.0.so -vendor/lib64/motorola.hardware.camera.desktop@2.0.so +# Camera-arcsoft +vendor/lib64/libarcsoft_low_light_shot.so +vendor/lib64/liblowlight_ai_portrait.arcsoft.so # Camera - Components -vendor/lib64/camera/components/com.arcsoft.node.supernightraw.so -vendor/lib64/camera/components/com.bst.node.hdrdetect.so -vendor/lib64/camera/components/com.bst.node.mfnr.so -vendor/lib64/camera/components/com.bst.node.yuvhdr.so -vendor/lib64/camera/components/com.mot.node.c2d.so +vendor/lib64/camera/components/com.arcsoft.node.mfnr.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 @@ -146,7 +117,7 @@ vendor/lib64/camera/components/com.qti.node.swbestats.so vendor/lib64/camera/components/com.qti.node.swcac.so vendor/lib64/camera/components/com.qti.node.swlsc.so vendor/lib64/camera/components/com.qti.node.swmctf.so -vendor/lib64/camera/components/com.qti.node.swmfnr.so +vendor/lib64/camera/components/com.qti.node.swmfnr.so;DISABLE_CHECKELF vendor/lib64/camera/components/com.qti.node.swpdpc.so vendor/lib64/camera/components/com.qti.node.swpreprocess.so vendor/lib64/camera/components/com.qti.node.swregistration.so @@ -171,11 +142,11 @@ vendor/lib64/camera/components/com.qtistatic.stats.awb.so vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so vendor/lib64/camera/components/com.vidhance.node.ica.so vendor/lib64/camera/components/com.vidhance.node.processing.so +vendor/lib64/camera/components/com.vidhance.stats.aec_dmbr.so vendor/lib64/camera/components/libdepthmapwrapper_secure.so # Camera - feature2 vendor/lib64/com.qti.feature2.anchorsync.so -vendor/lib64/com.qti.feature2.arcrawpro.so vendor/lib64/com.qti.feature2.demux.so vendor/lib64/com.qti.feature2.frameselect.so vendor/lib64/com.qti.feature2.fusion.so @@ -194,80 +165,74 @@ vendor/lib64/com.qti.feature2.serializer.so vendor/lib64/com.qti.feature2.swmf.so # Camera - etc -vendor/etc/camera/anc_detect_model -vendor/etc/camera/anc_track_model -vendor/etc/camera/mot_engine_config.bin -vendor/etc/camera/vidhance.lic +vendor/etc/camera/aec_golden_wide.bin +vendor/etc/camera/dual_golden_wide.bin +vendor/etc/camera/SwadAIMod.bin +vendor/etc/camera/SwadCalib.bin +vendor/etc/camera/SwadParamList.txt vendor/etc/camera/vidhance_calibration vendor/etc/camera/vidhance_calibration_2rd # Camera - eeprom -vendor/lib64/camera/com.mot.eeprom.mot_gt24p256c_s5kjns_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_ov16a1q_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_s5k3p9_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_sc202acs_otp.so +vendor/lib64/camera/com.mot.eeprom.mot_gt24p128e_s5kjn1_eeprom.so +vendor/lib64/camera/com.mot.eeprom.mot_gt24p64e_ov16a1q_eeprom.so +vendor/lib64/camera/com.mot.eeprom.mot_rhodep_gc02m1_otp.so +vendor/lib64/camera/com.mot.eeprom.mot_rhodep_s5k4h7_otp.so # Camera - sensor -vendor/lib64/camera/com.qti.flash.aw36514.so -vendor/lib64/camera/com.qti.flash.ocp81375.so +vendor/lib64/camera/com.qti.sensor.mot_gc02m1.so vendor/lib64/camera/com.qti.sensor.mot_ov16a1q.so -vendor/lib64/camera/com.qti.sensor.mot_s5k3p9.so -vendor/lib64/camera/com.qti.sensor.mot_s5kjns.so -vendor/lib64/camera/com.qti.sensor.mot_sc202acs.so -vendor/lib64/camera/com.qti.sensormodule.mot_fogor_s5kjns_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_fogor_sc202acs_sunny.bin -vendor/lib64/camera/com.qti.sensormodule.mot_fogos_ov16a1q_ofilm.bin -vendor/lib64/camera/com.qti.sensormodule.mot_fogos_s5k3p9_qtech.bin +vendor/lib64/camera/com.qti.sensor.mot_s5k4h7.so +vendor/lib64/camera/com.qti.sensor.mot_s5kjn1.so +vendor/lib64/camera/com.qti.sensormodule.mot_rhodep_gc02m1_sunwin.bin +vendor/lib64/camera/com.qti.sensormodule.mot_rhodep_ov16a1q_ofilm.bin +vendor/lib64/camera/com.qti.sensormodule.mot_rhodep_s5k4h7_qtech_ff.bin +vendor/lib64/camera/com.qti.sensormodule.mot_rhodep_s5kjn1_qtech.bin +vendor/lib64/camera/com.qti.sensormodule.mot_rhodep_s5kjn1_sunny.bin # Camera - tuned vendor/lib64/camera/com.qti.tuned.default.bin -vendor/lib64/camera/com.qti.tuned.mot_fogo_sc202acs.bin -vendor/lib64/camera/com.qti.tuned.mot_fogor_s5kjns.bin -vendor/lib64/camera/com.qti.tuned.mot_fogos_ov16a1q.bin -vendor/lib64/camera/com.qti.tuned.mot_fogos_s5k3p9.bin +vendor/lib64/camera/com.qti.tuned.mot_rhodep_gc02m1.bin +vendor/lib64/camera/com.qti.tuned.mot_rhodep_ov16a1q.bin +vendor/lib64/camera/com.qti.tuned.mot_rhodep_s5k4h7ff.bin +vendor/lib64/camera/com.qti.tuned.mot_rhodep_s5kjn1.bin +vendor/lib64/camera/com.qti.tuned.mot_rhodep_s5kjn1_2nd.bin # Display calibration data -vendor/etc/qdcm_calib_data_mipi_mot_vid_tm_icnl9916c_hdp_652_120.xml -vendor/etc/qdcm_calib_data_mipi_mot_vid_txd_ili9883c_hdp_652_120.xml - -# Display config -vendor/etc/SVIConfig.xml - -# EUICC -product/app/EuiccPartnerApp/EuiccPartnerApp.apk -product/etc/permissions/privapp-permissions-com.google.android.euicc.xml -product/priv-app/EuiccGoogle/EuiccGoogle.apk +vendor/etc/qdcm_calib_data_mipi_mot_cmd_csot_1080p_dsc_655.xml +vendor/etc/qdcm_calib_data_mipi_mot_cmd_tm_1080p_dsc_655.xml +vendor/etc/qdcm_calib_data_nt36672e_60_Hz_fhd_plus_video_mode_panel_without_DSC.xml +vendor/etc/qdcm_calib_data_nt36672e_fhd_plus_120Hz_Video_panel.xml +vendor/etc/qdcm_calib_data_nt36672e_fhd_plus_144Hz_video_panel.xml # Fingerprint -vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-goodixservice -vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-fpc -vendor/bin/hw/fpc_ident:vendor/bin/fpc_ident -vendor/bin/hw/goodix_ident:vendor/bin/goodix_ident -vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-goodixservice.rc -vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-fpc2.rc -vendor/lib64/com.fingerprints.extension@1.0.so -vendor/lib64/hw/fingerprint.goodix.default.so -vendor/lib64/libgf_ca.so -vendor/lib64/libgf_hal.so -vendor/lib64/libgoodixhwfingerprint.so -vendor/lib64/vendor.goodix.hardware.biometrics.fingerprint@3.0.so +vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-focalservice +vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-ets +vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-focalservice.rc +vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-ets2.rc +vendor/etc/init/init.ets.rc +vendor/lib64/hw/fingerprint.focaltech.default.so +vendor/lib64/libRbsFlow.so +vendor/lib64/libets_teeclient_v2.so +vendor/lib64/vendor.egistec.hardware.fingerprint@4.0.so +vendor/lib64/vendor.focaltech.fingerprint@1.0.so vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so # Firmware -vendor/etc/motorola/12m/chipone-icnl9916c_120hz_hd_plus_vid-primary-fogos.ini -vendor/firmware/aw963xx_reg_0.bin -vendor/firmware/chipone_firmware.bin -vendor/firmware/csot_focal_test_limits.ini -vendor/firmware/focaltech-csot-ft3681-22-0000-fogos.bin -vendor/firmware/fs1815.fsm -vendor/firmware/goodix-tm-gt9916S-23051702-646483c4-fogos.bin -vendor/firmware/ILITEK_FW +vendor/firmware/aw882xx_pid_2113_acf.bin +vendor/firmware/aw_skt.bin +vendor/firmware/csot_goodix_cfg_group.bin +vendor/firmware/csot_goodix_test_limits_255.csv +vendor/firmware/goodix-csot-gt9916S-2201040d-61EA60E3-rhodep.bin +vendor/firmware/goodix-tianma-gt9916S-2201040d-61EA66BC-rhodep.bin +vendor/firmware/tianma_goodix_cfg_group.bin +vendor/firmware/tianma_goodix_test_limits_255.csv +vendor/firmware/mot_dw9781c.prog vendor/firmware/sec_s3nrn4v_firmware.bin -vendor/firmware/tm_goodix_cfg_group.bin # HotwordEnrollment -product/priv-app/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND.apk -product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND.apk +product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk +product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml system_ext/framework/com.android.hotwordenrollment.common.util.jar @@ -291,21 +256,18 @@ system_ext/bin/motsettings # Moto Permissions product/etc/permissions/com.motorola.camera3.xml:vendor/etc/permissions/com.motorola.camera3.xml product/etc/permissions/com.motorola.camera3.content.ai.xml:vendor/etc/permissions/com.motorola.camera3.content.ai.xml -product/etc/permissions/com.motorola.camera3.fogos.xml:vendor/etc/permissions/com.motorola.camera3.fogos.xml +product/etc/permissions/com.motorola.camera3.rhodep.xml:vendor/etc/permissions/com.motorola.camera3.rhodec.xml product/etc/permissions/com.motorola.camera3.lens.xml:vendor/etc/permissions/com.motorola.camera3.lens.xml product/etc/permissions/com.motorola.moto-uirefresh.xml # NFC -vendor/etc/libnfc-PN557.conf -vendor/etc/libnfc-SN220-UICC.conf -vendor/etc/libnfc-SN220.conf vendor/etc/libnfc-mtp-SN100-UICC.conf vendor/etc/libnfc-mtp-SN100.conf vendor/etc/libnfc-mtp-SN100_38_4MHZ.conf +vendor/etc/libnfc-nci.conf vendor/etc/libnfc-nxp-pnscr.conf vendor/etc/libnfc-qrd-SN100.conf vendor/etc/libnfc-qrd-SN100_38_4MHZ.conf -vendor/etc/libnfc-sec-nci.conf vendor/etc/libnfc-sec-vendor.conf vendor/etc/nfc_calibration.txt @@ -318,9 +280,13 @@ vendor/lib64/sensors.ssc.so # Sensors Configs vendor/bin/capsense_reset -vendor/etc/sensors/config/icm4x6xa.json +vendor/etc/sensors/config/ak991x_0.json +vendor/etc/sensors/config/holi_default_sensors.json +vendor/etc/sensors/config/holi_lsm6dso_0.json +vendor/etc/sensors/config/holi_power_0.json +vendor/etc/sensors/config/icm4x6xx.json +vendor/etc/sensors/config/mmc56x3x_0.json vendor/etc/sensors/config/mot_camgest.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 @@ -337,16 +303,9 @@ vendor/etc/sensors/config/sns_smd.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/strait_bmi3x0_0.json -vendor/etc/sensors/config/strait_default_sensors.json -vendor/etc/sensors/config/strait_dynamic_sensors.json -vendor/etc/sensors/config/strait_ltr569_0.json -vendor/etc/sensors/config/strait_mmc56x3x_0_with_nfc.json -vendor/etc/sensors/config/strait_mmc56x3x_0_without_nfc.json -vendor/etc/sensors/config/strait_power_0.json -vendor/etc/sensors/config/strait_qmc6308_0_with_nfc.json -vendor/etc/sensors/config/strait_qmc6308_0_without_nfc.json -vendor/etc/sensors/config/strait_qmi8658_0.json +vendor/etc/sensors/config/stk3a5x_0_DVT1.json +vendor/etc/sensors/config/stk3a5x_0_DVT2.json +vendor/etc/sensors/config/stk3a5x_0.json vendor/etc/sensors/proto/descriptor.proto vendor/etc/sensors/proto/mot_barocal.proto vendor/etc/sensors/proto/mot_camgest.proto @@ -364,11 +323,10 @@ vendor/etc/sensors/proto/mot_offbody.proto vendor/etc/sensors/proto/mot_probe.proto vendor/etc/sensors/proto/mot_proxcal.proto vendor/etc/sensors/proto/mot_stowed.proto -vendor/etc/sensors/proto/mot_tap.proto vendor/etc/sensors/proto/mot_vsync.proto vendor/etc/sensors/proto/nanopb.proto -vendor/etc/sensors/proto/sns_accel.proto vendor/etc/sensors/proto/sns_accel_cal.proto +vendor/etc/sensors/proto/sns_accel.proto vendor/etc/sensors/proto/sns_activity_recognition.proto vendor/etc/sensors/proto/sns_ambient_light.proto vendor/etc/sensors/proto/sns_ambient_temperature.proto @@ -390,21 +348,20 @@ vendor/etc/sensors/proto/sns_ext_svc.proto vendor/etc/sensors/proto/sns_facing.proto vendor/etc/sensors/proto/sns_fmv.proto vendor/etc/sensors/proto/sns_formatter.proto -vendor/etc/sensors/proto/sns_formatter_notify.proto vendor/etc/sensors/proto/sns_fw.proto vendor/etc/sensors/proto/sns_game_rv.proto vendor/etc/sensors/proto/sns_geomag_rv.proto vendor/etc/sensors/proto/sns_gravity.proto -vendor/etc/sensors/proto/sns_gyro.proto vendor/etc/sensors/proto/sns_gyro_cal.proto +vendor/etc/sensors/proto/sns_gyro.proto vendor/etc/sensors/proto/sns_gyro_rot_matrix.proto vendor/etc/sensors/proto/sns_hall.proto vendor/etc/sensors/proto/sns_heart_beat.proto vendor/etc/sensors/proto/sns_heart_rate.proto vendor/etc/sensors/proto/sns_hinge_angle.proto vendor/etc/sensors/proto/sns_humidity.proto -vendor/etc/sensors/proto/sns_mag.proto vendor/etc/sensors/proto/sns_mag_cal.proto +vendor/etc/sensors/proto/sns_mag.proto vendor/etc/sensors/proto/sns_mot_factory_cal.proto vendor/etc/sensors/proto/sns_oem1.proto vendor/etc/sensors/proto/sns_offbody_detect.proto @@ -424,8 +381,8 @@ vendor/etc/sensors/proto/sns_rotv.proto vendor/etc/sensors/proto/sns_sar.proto vendor/etc/sensors/proto/sns_sensor_temperature.proto vendor/etc/sensors/proto/sns_sig_motion.proto -vendor/etc/sensors/proto/sns_std.proto vendor/etc/sensors/proto/sns_std_event_gated_sensor.proto +vendor/etc/sensors/proto/sns_std.proto vendor/etc/sensors/proto/sns_std_sensor.proto vendor/etc/sensors/proto/sns_std_type.proto vendor/etc/sensors/proto/sns_step_detect.proto @@ -440,8 +397,5 @@ vendor/etc/sensors/proto/tcs3708.proto vendor/etc/sensors/sns_reg_config # Thermal configs -vendor/etc/thermal-engine-fogos-camera.conf -vendor/etc/thermal-engine-fogos-game-normal.conf -vendor/etc/thermal-engine-fogos-game-perf.conf -vendor/etc/thermal-engine-fogos.conf +vendor/etc/thermal-engine-rhodep.conf vendor/etc/thermal-engine.conf diff --git a/resource-overlay/fogos/Frameworks/res/xml/power_profile.xml b/resource-overlay/fogos/Frameworks/res/xml/power_profile.xml deleted file mode 100644 index fc63724..0000000 --- a/resource-overlay/fogos/Frameworks/res/xml/power_profile.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - 0 - 120.12 - 370.48 - 1.78 - 110.2 - 83.35 - 607.96 - 158.81 - 50.69 - 149.95 - 74.8 - - 51 - 43 - 36 - 29 - 22 - 16 - 10 - 4.54 - - - 6 - 2 - - - 300000 - 576000 - 691200 - 940800 - 1113600 - 1324800 - 1516800 - 1651200 - 1708800 - 1804800 - - - 691200 - 940800 - 1228800 - 1401600 - 1516800 - 1651200 - 1804800 - 1900800 - 2054400 - 2208000 - - - 22.8 - 24.7 - 25.6 - 31.1 - 33.9 - 39.3 - 43.8 - 52.3 - 53.7 - 57.2 - - - 53.3 - 68.5 - 91.2 - 114.4 - 130.6 - 155.6 - 173.7 - 184.6 - 197.3 - 220.5 - - 13.5 - 43.3 - 6.34 - 8.606 - 10.72 - 5000 - \ No newline at end of file diff --git a/resource-overlay/fogos/ProductFrameworks/Android.bp b/resource-overlay/fogos/ProductFrameworks/Android.bp deleted file mode 100644 index 90c5241..0000000 --- a/resource-overlay/fogos/ProductFrameworks/Android.bp +++ /dev/null @@ -1,5 +0,0 @@ -runtime_resource_overlay { - name: "ProductFrameworksResFogos", - sdk_version: "current", - product_specific: true -} diff --git a/resource-overlay/fogos/ProductFrameworks/AndroidManifest.xml b/resource-overlay/fogos/ProductFrameworks/AndroidManifest.xml deleted file mode 100644 index 3d298f9..0000000 --- a/resource-overlay/fogos/ProductFrameworks/AndroidManifest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/resource-overlay/fogos/ProductFrameworks/res/values/config.xml b/resource-overlay/fogos/ProductFrameworks/res/values/config.xml deleted file mode 100644 index 1a9e919..0000000 --- a/resource-overlay/fogos/ProductFrameworks/res/values/config.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - gsm,9 - utran,9 - eutran,15 - - - - - 1 - - diff --git a/resource-overlay/fogos/Frameworks/Android.bp b/resource-overlay/rhodep/Frameworks/Android.bp similarity index 69% rename from resource-overlay/fogos/Frameworks/Android.bp rename to resource-overlay/rhodep/Frameworks/Android.bp index 2ded500..8e17be1 100644 --- a/resource-overlay/fogos/Frameworks/Android.bp +++ b/resource-overlay/rhodep/Frameworks/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "FrameworksResFogos", + name: "FrameworksResRhodep", sdk_version: "current", vendor: true } diff --git a/resource-overlay/fogos/Frameworks/AndroidManifest.xml b/resource-overlay/rhodep/Frameworks/AndroidManifest.xml similarity index 89% rename from resource-overlay/fogos/Frameworks/AndroidManifest.xml rename to resource-overlay/rhodep/Frameworks/AndroidManifest.xml index 4fbec7b..36610e8 100644 --- a/resource-overlay/fogos/Frameworks/AndroidManifest.xml +++ b/resource-overlay/rhodep/Frameworks/AndroidManifest.xml @@ -4,6 +4,6 @@ SPDX-License-Identifier: Apache-2.0 --> + package="android.overlay.rhodep"> diff --git a/resource-overlay/fogos/Frameworks/res/values-land/dimens.xml b/resource-overlay/rhodep/Frameworks/res/values-land/dimens.xml similarity index 100% rename from resource-overlay/fogos/Frameworks/res/values-land/dimens.xml rename to resource-overlay/rhodep/Frameworks/res/values-land/dimens.xml diff --git a/resource-overlay/fogos/Frameworks/res/values/config.xml b/resource-overlay/rhodep/Frameworks/res/values/config.xml similarity index 86% rename from resource-overlay/fogos/Frameworks/res/values/config.xml rename to resource-overlay/rhodep/Frameworks/res/values/config.xml index f24c14a..4eafc20 100644 --- a/resource-overlay/fogos/Frameworks/res/values/config.xml +++ b/resource-overlay/rhodep/Frameworks/res/values/config.xml @@ -25,29 +25,16 @@ Must be overridden in platform specific overlays --> - 1 2 + 4 5 10 - 29 - 50 - 90 + 40 100 - 150 - 200 - 300 - 400 - 500 - 800 - 1000 - 1300 - 1500 - 1600 - 1800 - 2000 - 3000 - 4000 - 8000 + 325 + 1250 + 3500 + 5500 - 3 + 2 + 7 10 - 20 - 50 - 70 - 85 - 110 - 130 - 150 - 180 - 180 - 180 - 180 - 210 - 210 - 210 - 220 - 225 - 225 - 350 - 400 - 400 - 400 - 400 + 12 + 24 + 95 + 111 + 149 + 192 + 252 + 500 0 - 2 + 1 + 4 + 5 6 - 13 - 32 - 45 - 54 - 70 - 83 - 96 - 115 - 134 - 140 - 143 - 223 + 12 + 48 + 57 + 76 + 98 + 129 255 @@ -133,21 +103,17 @@ This array should be equal in size to config_screenBrightnessBacklight --> 0 - 3 + 2 + 7 10 - 20 - 50 - 70 - 85 - 110 - 130 - 150 - 180 - 210 - 220 - 225 - 350 - 400 + 12 + 24 + 95 + 111 + 149 + 192 + 252 + 500 - M -28,0 - L 28,0 - L 28,77 - L -28,77 + M -34,0 + L -34,100 + L 34,100 + L 34,0 Z @@ -244,11 +210,11 @@ - 2 + 1 - 2 + 1 @@ -266,14 +232,14 @@ - 0 - 40 + 125 + 30 0 - 67 + 30 @@ -313,9 +279,9 @@ - local:4630946747577212033 - 720 - 600 + local:4630947043778501761 + 1080 + 815 200 @@ -339,7 +305,7 @@ 120 - motog345G + motog625G http://uaprof.motorola.com/phoneconfig/motov1/Profile/motov1.rdf diff --git a/resource-overlay/fogos/Frameworks/res/values/dimens.xml b/resource-overlay/rhodep/Frameworks/res/values/dimens.xml similarity index 61% rename from resource-overlay/fogos/Frameworks/res/values/dimens.xml rename to resource-overlay/rhodep/Frameworks/res/values/dimens.xml index b273676..064843f 100644 --- a/resource-overlay/fogos/Frameworks/res/values/dimens.xml +++ b/resource-overlay/rhodep/Frameworks/res/values/dimens.xml @@ -5,12 +5,12 @@ --> - 60.0px - 66.0px + 95.0px + 95.0px - 77.0px + 100.0px - 10.0px + 16.0px diff --git a/resource-overlay/rhodep/Frameworks/res/xml/power_profile.xml b/resource-overlay/rhodep/Frameworks/res/xml/power_profile.xml new file mode 100644 index 0000000..e7e3ebf --- /dev/null +++ b/resource-overlay/rhodep/Frameworks/res/xml/power_profile.xml @@ -0,0 +1,80 @@ + + + 0 + 47.12 + 310.48 + 1.78 + 88.58 + 44.18 + 607.96 + 99.85 + 50.69 + 284.89 + 35 + + 35 + 30 + 25 + 20 + 15 + 10 + 5 + 1.090 + + + 6 + 2 + + + 300000 + 576000 + 710400 + 940800 + 1190400 + 1324800 + 1478400 + 1574400 + 1708800 + 1804800 + + + 768000 + 979200 + 1017600 + 1248000 + 1401600 + 1536000 + 1651200 + 1804800 + 2035200 + + + 22.3 + 25.9 + 27.7 + 32.7 + 36.5 + 39.8 + 43.1 + 51.9 + 54.9 + 58.0 + + + 45.3 + 55.7 + 57.7 + 70.8 + 84.4 + 93.1 + 111.6 + 134.1 + 168.5 + + 0.7 + 6.7 + 3.993 + 5.006 + 4.4 + 5000 + \ No newline at end of file diff --git a/resource-overlay/fogos/LineageSystemUI/Android.bp b/resource-overlay/rhodep/LineageSystemUI/Android.bp similarity index 80% rename from resource-overlay/fogos/LineageSystemUI/Android.bp rename to resource-overlay/rhodep/LineageSystemUI/Android.bp index 7cda598..4dd785a 100644 --- a/resource-overlay/fogos/LineageSystemUI/Android.bp +++ b/resource-overlay/rhodep/LineageSystemUI/Android.bp @@ -4,6 +4,6 @@ // runtime_resource_overlay { - name: "LineageSystemUIFogos", + name: "LineageSystemUIRhodep", vendor: true, } diff --git a/resource-overlay/fogos/LineageSystemUI/AndroidManifest.xml b/resource-overlay/rhodep/LineageSystemUI/AndroidManifest.xml similarity index 87% rename from resource-overlay/fogos/LineageSystemUI/AndroidManifest.xml rename to resource-overlay/rhodep/LineageSystemUI/AndroidManifest.xml index 88a3ab4..981f9c4 100644 --- a/resource-overlay/fogos/LineageSystemUI/AndroidManifest.xml +++ b/resource-overlay/rhodep/LineageSystemUI/AndroidManifest.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0 --> + package="com.android.systemui.rhodep.lineage"> + package="com.android.providers.settings.overlay.rhodep"> diff --git a/resource-overlay/fogos/SettingsProvider/res/values/config.xml b/resource-overlay/rhodep/SettingsProvider/res/values/config.xml similarity index 78% rename from resource-overlay/fogos/SettingsProvider/res/values/config.xml rename to resource-overlay/rhodep/SettingsProvider/res/values/config.xml index 99a6bfe..aa0d285 100644 --- a/resource-overlay/fogos/SettingsProvider/res/values/config.xml +++ b/resource-overlay/rhodep/SettingsProvider/res/values/config.xml @@ -5,5 +5,5 @@ --> - moto g34 5G + moto g82 5G diff --git a/resource-overlay/fogos/SystemUI/Android.bp b/resource-overlay/rhodep/SystemUI/Android.bp similarity index 70% rename from resource-overlay/fogos/SystemUI/Android.bp rename to resource-overlay/rhodep/SystemUI/Android.bp index d35929e..a0dd24d 100644 --- a/resource-overlay/fogos/SystemUI/Android.bp +++ b/resource-overlay/rhodep/SystemUI/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "SystemUIResFogos", + name: "SystemUIResRhodep", sdk_version: "current", vendor: true } diff --git a/resource-overlay/fogos/SystemUI/AndroidManifest.xml b/resource-overlay/rhodep/SystemUI/AndroidManifest.xml similarity index 86% rename from resource-overlay/fogos/SystemUI/AndroidManifest.xml rename to resource-overlay/rhodep/SystemUI/AndroidManifest.xml index 87d741b..d2aeab9 100644 --- a/resource-overlay/fogos/SystemUI/AndroidManifest.xml +++ b/resource-overlay/rhodep/SystemUI/AndroidManifest.xml @@ -5,6 +5,6 @@ --> + package="com.android.systemui.overlay.rhodep"> diff --git a/resource-overlay/fogos/SystemUI/res/values-land/dimens.xml b/resource-overlay/rhodep/SystemUI/res/values-land/dimens.xml similarity index 100% rename from resource-overlay/fogos/SystemUI/res/values-land/dimens.xml rename to resource-overlay/rhodep/SystemUI/res/values-land/dimens.xml diff --git a/resource-overlay/fogos/SystemUI/res/values/dimens.xml b/resource-overlay/rhodep/SystemUI/res/values/dimens.xml similarity index 87% rename from resource-overlay/fogos/SystemUI/res/values/dimens.xml rename to resource-overlay/rhodep/SystemUI/res/values/dimens.xml index adef661..c65720b 100644 --- a/resource-overlay/fogos/SystemUI/res/values/dimens.xml +++ b/resource-overlay/rhodep/SystemUI/res/values/dimens.xml @@ -5,12 +5,12 @@ --> - 8dp + 24dp - 10.0px + 19.0px - 11.0px + 20.0px @*android:dimen/status_bar_height @@ -18,28 +18,28 @@ @dimen/status_bar_padding_start - 10.0px + 19.0px - 700px + 810px - 700px + 810px - 720px + 1080px - 300px - 482px + 450px + 722px diff --git a/resource-overlay/fogos/SystemUI/res/values/integers.xml b/resource-overlay/rhodep/SystemUI/res/values/integers.xml similarity index 100% rename from resource-overlay/fogos/SystemUI/res/values/integers.xml rename to resource-overlay/rhodep/SystemUI/res/values/integers.xml diff --git a/resource-overlay/fogos/Wifi/Android.bp b/resource-overlay/rhodep/Wifi/Android.bp similarity index 85% rename from resource-overlay/fogos/Wifi/Android.bp rename to resource-overlay/rhodep/Wifi/Android.bp index b10e0d2..2ee434a 100644 --- a/resource-overlay/fogos/Wifi/Android.bp +++ b/resource-overlay/rhodep/Wifi/Android.bp @@ -4,7 +4,7 @@ // runtime_resource_overlay { - name: "WifiResFogos", + name: "WifiResRhodep", sdk_version: "current", vendor: true, } diff --git a/resource-overlay/fogos/Wifi/AndroidManifest.xml b/resource-overlay/rhodep/Wifi/AndroidManifest.xml similarity index 87% rename from resource-overlay/fogos/Wifi/AndroidManifest.xml rename to resource-overlay/rhodep/Wifi/AndroidManifest.xml index d7ff2bf..26bcfb1 100644 --- a/resource-overlay/fogos/Wifi/AndroidManifest.xml +++ b/resource-overlay/rhodep/Wifi/AndroidManifest.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0 --> + package="com.android.wifi.resources.overlay.rhodep"> - moto g34 5G + moto g82 5G diff --git a/rootdir/bin/init.oem.fingerprint.overlay.sh b/rootdir/bin/init.oem.fingerprint.overlay.sh new file mode 100755 index 0000000..8f6b78b --- /dev/null +++ b/rootdir/bin/init.oem.fingerprint.overlay.sh @@ -0,0 +1,15 @@ +#!/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. +# November 19, 2020 zengzm move all codes to init.oem.fingerprint2.sh + diff --git a/rootdir/bin/init.oem.fingerprint2.sh b/rootdir/bin/init.oem.fingerprint2.sh index 6ac3535..4fdc943 100755 --- a/rootdir/bin/init.oem.fingerprint2.sh +++ b/rootdir/bin/init.oem.fingerprint2.sh @@ -27,11 +27,10 @@ GKI_PATH=$(getprop $PROP_GKI_PATH) # hal_list: the array contains the hal service name. # # note: all arrays should have the same size. -vendor_list=('goodix' 'fpc') -kernel_so_list=("/vendor/lib/modules/$GKI_PATH/goodix_fod_mmi.ko" "/vendor/lib/modules/$GKI_PATH/fpc1020_mmi.ko") -kernel_so_name_list=("goodix_fod_mmi.ko" "fpc1020_mmi.ko") -dev_node_list=("/dev/goodix_fp" "/sys/class/fingerprint/fpc1020/irq") -hal_list=('goodix_hal' 'fps_hal') +vendor_list=('egis' 'focal') +kernel_so_list=("/vendor/lib/modules/$GKI_PATH/rbs_fps_mmi.ko" "/vendor/lib/modules/$GKI_PATH/focal_fps_mmi.ko") +kernel_so_name_list=("rbs_fps_mmi.ko" "focal_fps_mmi.ko") +hal_list=('ets_hal' 'focal_hal') last_vendor_index=`expr ${#vendor_list[@]} - 1` vendor_list_size=${#vendor_list[@]} @@ -57,7 +56,7 @@ persist_fps_id=/mnt/vendor/persist/fps/vendor_id persist_fps_id2=/mnt/vendor/persist/fps/last_vendor_id FPS_VENDOR_NONE=none -MAX_TIMES=50 +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. @@ -95,19 +94,6 @@ function start_hal_service(){ sleep 1 setprop $prop_fps_ident ${vendor_list[$1]} - retry=1 - while [ $retry -lt 5 ] - do - if [ -e "${dev_node_list[$1]}" ]; then - log "dev node : ${dev_node_list[$1]} is ready" - break - else - log "driver is not ready, $retry times wait 1s to retry" - sleep 1 - fi - let retry++ - done - log "start ${hal_list[$1]}" start ${hal_list[$1]} diff --git a/rootdir/etc/init/hw/init.mmi.overlay.rc b/rootdir/etc/init/hw/init.mmi.overlay.rc index 0e7334d..c5f0165 100644 --- a/rootdir/etc/init/hw/init.mmi.overlay.rc +++ b/rootdir/etc/init/hw/init.mmi.overlay.rc @@ -2,160 +2,81 @@ import /vendor/etc/init/hw/init.nfc.sec.rc on post-fs - chown system system /sys/devices/platform/soc/4804000.ufshc/clkgate_enable - chown system system /sys/devices/platform/soc/4804000.ufshc/devfreq/4804000.ufshc/min_freq + # "Tap to wake" gesture + chown root input /sys/class/sensors/dt-gesture/enable + chmod 0660 /sys/class/sensors/dt-gesture/enable + chown root input /sys/class/sensors/dt-gesture/poll_delay + chmod 0660 /sys/class/sensors/dt-gesture/poll_delay + +on post-fs + chown system system /sys/devices/platform/soc/4804000.ufshc/clkgate_enable + chown system system /sys/devices/platform/soc/4804000.ufshc/devfreq/4804000.ufshc/min_freq + +#fps dual sensor +service chipone_ident /vendor/bin/hw/chipone_ident + class late_start + user system + group system + oneshot + disabled + +service vendor.ident-fps-overlay-sh /vendor/bin/init.oem.fingerprint.overlay.sh + class core + user root + group drmrpc system + oneshot + disabled on post-fs-data - + exec_start vendor.ident-fps-overlay-sh + chown system system /dev/fpsensor + chmod 0660 /dev/fpsensor chown system system /sys/devices/platform/soc/soc:fm_wcn39x0/elna_en - # touch api - chown system system /sys/class/touchscreen/primary/interpolation - chmod 0660 /sys/class/touchscreen/primary/interpolation - 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 - # change permission for stylus - chown system system /sys/class/touchscreen/primary/palm_settings - # Change ownership and permission for bq25960-standalone factory testing - chown system system /sys/class/power_supply/bq25960-standalone/voltage_now - chown system system /sys/bus/iio/devices/iio:device6/in_index_bq25980_cp_enabled_input - chmod 0644 /sys/class/power_supply/bq25960-standalone/voltage_now - chmod 0664 /sys/bus/iio/devices/iio:device6/in_index_bq25980_cp_enabled_input + # Change ownership and permission for cp-standalone factory testing + chown system system /sys/class/power_supply/cp-standalone/voltage_now + chown system system /sys/bus/iio/devices/iio:device5/in_index_sc8549_cp_enable_input + chmod 0644 /sys/class/power_supply/cp-standalone/voltage_now + chmod 0664 /sys/bus/iio/devices/iio:device5/in_index_sc8549_cp_enable_input - # Add for Egis Fod fingerprint - mkdir /data/vendor/egis 0770 system system - mkdir /mnt/vendor/persist/egis 0770 system system - mkdir /data/vendor/tzstorage/egis 0770 system system - mkdir /data/vendor/egis/cqa 0770 system system - - # Add for after-sale ois gyro cal - mkdir /mnt/vendor/persist/camera/gyro_compat 0770 vendor_tcmd camera - - # Add for OIS hall test result - mkdir /mnt/vendor/persist/camera/ois_hall 0770 vendor_tcmd camera - - # Add for fod fps calibration - chown system system /sys/class/backlight/panel0-backlight/brightness - chown system system /sys/class/drm/card0-DSI-1/panelName - chown system system /sys/class/drm/card0-DSI-1/panelId - chown system system /d/dri/0/debug/motUtil - chmod 0666 /d/dri/0/debug/motUtil; - chmod 0666 /sys/class/backlight/panel0-backlight/brightness - chmod 0666 /sys/class/drm/card0-DSI-1/panelName - chmod 0666 /sys/class/drm/card0-DSI-1/panelId - - #bluetooth sar - write /data/vendor/radio/bluetooth_sar disable - chmod 0644 /data/vendor/radio/bluetooth_sar - chown radio /data/vendor/radio/bluetooth_sar - -on early-init - insmod /vendor/lib/modules/leds_aw99703.ko - insmod /vendor/lib/modules/leds_lm3697.ko - exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -r -d /vendor/lib/modules/${ro.vendor.mot.gki.path} zram - -on boot - # vibrator hal need to access this sysfs node for AF noise issue - chown system system /sys/devices/platform/soc/soc:mot,cam-actuator/onekey_actuator - chmod 0660 /sys/devices/platform/soc/soc:mot,cam-actuator/onekey_actuator - # change permission for capsensor - chown system system /sys/class/capsense/reset - chown system system /sys/class/capsense/int_state - chown system system /sys/class/capsense/mode - chown radio system /sys/class/capsense/reg - chown radio system /sys/class/capsense/fw_download_status - # Change ownership for capsensor - chown root input /sys/class/sensors/Moto\ CapSense\ Ch0/enable - chown root input /sys/class/sensors/Moto\ CapSense\ Ch0/poll_delay - chown root input /sys/class/sensors/Moto\ CapSense\ Ch1/enable - chown root input /sys/class/sensors/Moto\ CapSense\ Ch1/poll_delay - chown root input /sys/class/sensors/Moto\ CapSense\ Ch2/enable - chown root input /sys/class/sensors/Moto\ CapSense\ Ch2/poll_delay - chown root input /sys/class/sensors/Moto\ CapSense\ Ch3/enable - chown root input /sys/class/sensors/Moto\ CapSense\ Ch3/poll_delay - chown root input /sys/class/sensors/Moto\ CapSense\ Ch4/enable - chown root input /sys/class/sensors/Moto\ CapSense\ Ch4/poll_delay - # Change ownership for touch gesture - chown root input /sys/class/sensors/dt-gesture/enable - chown root input /sys/class/sensors/dt-gesture/poll_delay - # touch - chown system system /sys/class/touchscreen/primary/interpolation - chmod 0660 /sys/class/touchscreen/primary/interpolation - chown system system /sys/class/touchscreen/primary/sample - chmod 0660 /sys/class/touchscreen/primary/sample - chown system system /sys/class/touchscreen/primary/edge - chmod 0660 /sys/class/touchscreen/primary/edge - chown system system /sys/class/touchscreen/primary/gesture - chmod 0660 /sys/class/touchscreen/primary/gesture - chmod 0660 /sys/class/capsense/mode - chmod 0666 /dev/gtp_tools - - chmod 0662 /sys/class/leds/vibrator/state - chmod 0666 /sys/class/leds/vibrator/activate - chmod 0662 /sys/class/leds/vibrator/duration - write /proc/sys/vm/dirty_background_bytes 26214400 - write /proc/sys/vm/dirty_bytes 104857600 + chown vendor_pwric vendor_pwric /sys/class/power_supply/cp-standalone/force_chg_auto_enable on fs - insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/rbs_fod_mmi.ko - + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/goodix_brl_mmi.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi_charger.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/bq2597x_mmi_iio.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi_discrete_charger_class.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/sgm4154x_charger.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/bq2589x_charger.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi_discrete_charger.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/qpnp_adaptive_charge.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/tcpc_class.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/tcpc_rt1711h.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/tcpc_sgm7220.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/rt_pd_manager.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi_discrete_turbo_charger.ko on boot && property:ro.vendor.mot.gki.path=5.4-gki insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/nfc_i2c.ko -on late-init - insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/qpnp_adaptive_charge.ko - insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi-smbcharger-iio.ko - exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/${ro.vendor.mot.gki.path} moto_mm moto_swap - -on early-boot - # Add for egis fingerprint - chown system system /dev/esfp0 - chmod 0664 /dev/esfp0 - - chown system camera /dev/cci_intf - chmod 0660 /dev/cci_intf - on charger + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi_charger.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/bq2597x_mmi_iio.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi_discrete_charger_class.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/sgm4154x_charger.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/bq2589x_charger.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi_discrete_charger.ko insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/qpnp_adaptive_charge.ko - insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi-smbcharger-iio.ko - -on post-fs-data && property:ro.boot.mode=charger - setprop persist.vendor.hvdcp_opti.start 1 + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/tcpc_class.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/tcpc_rt1711h.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/tcpc_sgm7220.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/rt_pd_manager.ko + insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi_discrete_turbo_charger.ko service capsense_reset /vendor/bin/capsense_reset - class core - user system - group system input - disabled - -on property:vendor.bluetooth.sar_state=connect - write /data/vendor/radio/bluetooth_sar connect - -on property:vendor.bluetooth.sar_state=disconnect - write /data/vendor/radio/bluetooth_sar disconnect + class core + user system + group system input + disabled on property:sys.boot_completed=1 start capsense_reset - chown system system /sys/class/touchscreen/primary/stowed - chmod 0660 /sys/class/touchscreen/primary/stowed - -on init - insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/chipone_tddi_v2_mmi.ko - insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/ilitek_v3_mmi.ko - -on property:dev.bootcomplete=1 && property:ro.vendor.hw.ram=4GB - write /sys/block/dm-0/queue/read_ahead_kb 128 - write /sys/block/dm-1/queue/read_ahead_kb 128 - write /sys/block/dm-2/queue/read_ahead_kb 128 - write /sys/block/dm-3/queue/read_ahead_kb 128 - write /sys/block/dm-4/queue/read_ahead_kb 128 - write /sys/block/dm-5/queue/read_ahead_kb 128 - write /sys/block/${dev.mnt.dev.root}/queue/read_ahead_kb 128 - write /sys/block/${dev.mnt.dev.system_ext}/queue/read_ahead_kb 128 - write /sys/block/${dev.mnt.dev.product}/queue/read_ahead_kb 128 - write /sys/block/${dev.mnt.dev.vendor}/queue/read_ahead_kb 128 - write /sys/block/${dev.mnt.dev.data}/queue/read_ahead_kb 128 - write /sys/block/${dev.mnt.rootdisk.data}/queue/read_ahead_kb 128 - diff --git a/system.prop b/system.prop index 215cfb5..72f1899 100644 --- a/system.prop +++ b/system.prop @@ -1,3 +1,3 @@ # Google -ro.opa.device_model_id=motorola-fogos +ro.opa.device_model_id=motorola-rhodep ro.opa.eligible_device=true diff --git a/touch/Android.bp b/touch/Android.bp index 72432ff..29ee170 100644 --- a/touch/Android.bp +++ b/touch/Android.bp @@ -4,9 +4,9 @@ // SPDX-License-Identifier: Apache-2.0 cc_binary { - name: "vendor.lineage.touch@1.0-service.fogos", - vintf_fragments: ["vendor.lineage.touch@1.0-service.fogos.xml"], - init_rc: ["vendor.lineage.touch@1.0-service.fogos.rc"], + name: "vendor.lineage.touch@1.0-service.rhodep", + vintf_fragments: ["vendor.lineage.touch@1.0-service.rhodep.xml"], + init_rc: ["vendor.lineage.touch@1.0-service.rhodep.rc"], defaults: ["hidl_defaults"], relative_install_path: "hw", proprietary: true, diff --git a/touch/service.cpp b/touch/service.cpp index 1d43add..deeeb71 100644 --- a/touch/service.cpp +++ b/touch/service.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_TAG "lineage.touch@1.0-service.fogos" +#define LOG_TAG "lineage.touch@1.0-service.rhodep" #include #include diff --git a/touch/vendor.lineage.touch@1.0-service.fogos.rc b/touch/vendor.lineage.touch@1.0-service.rhodep.rc similarity index 90% rename from touch/vendor.lineage.touch@1.0-service.fogos.rc rename to touch/vendor.lineage.touch@1.0-service.rhodep.rc index 2910bd3..83d6f32 100644 --- a/touch/vendor.lineage.touch@1.0-service.fogos.rc +++ b/touch/vendor.lineage.touch@1.0-service.rhodep.rc @@ -1,4 +1,4 @@ -service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.fogos +service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.rhodep interface vendor.lineage.touch@1.0::IHighTouchPollingRate default class hal user system diff --git a/touch/vendor.lineage.touch@1.0-service.fogos.xml b/touch/vendor.lineage.touch@1.0-service.rhodep.xml similarity index 100% rename from touch/vendor.lineage.touch@1.0-service.fogos.xml rename to touch/vendor.lineage.touch@1.0-service.rhodep.xml diff --git a/vendor.prop b/vendor.prop index 980d09d..4cb7a0f 100644 --- a/vendor.prop +++ b/vendor.prop @@ -1,13 +1,8 @@ # Bluetooth -bluetooth.device.default_name=moto g34 5G +bluetooth.device.default_name=moto g82 5G # Camera -persist.vendor.camera.physical.num=3 - -# Display -ro.vendor.display.svi=1 -vendor.display.svi.config=1 -vendor.display.svi.config_path=/vendor/etc/SVIConfig.xml +persist.vendor.camera.physical.num=4 # Motorola ro.mot.build.customerid=global @@ -16,4 +11,4 @@ ro.mot.build.customerid=global persist.vendor.nfc.config_secfile_name=libnfc-sec-nci.conf # Surfaceflinger -ro.sf.lcd_density=280 +ro.sf.lcd_density=400