diff --git a/Android.mk b/Android.mk index 7f27953..77b026c 100644 --- a/Android.mk +++ b/Android.mk @@ -16,6 +16,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),berlin) +ifeq ($(TARGET_DEVICE),dubai) include $(call all-makefiles-under,$(LOCAL_PATH)) -endif \ No newline at end of file +endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 3b6d331..1197c50 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,9 +15,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_berlin.mk + $(LOCAL_DIR)/lineage_dubai.mk COMMON_LUNCH_CHOICES := \ - lineage_berlin-user \ - lineage_berlin-userdebug \ - lineage_berlin-eng \ No newline at end of file + lineage_dubai-user \ + lineage_dubai-userdebug \ + lineage_dubai-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index 7ee1205..e7a37e2 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,23 +14,24 @@ # limitations under the License. # -DEVICE_PATH := device/motorola/berlin +DEVICE_PATH := device/motorola/dubai # Inherit from motorola sm7325-common include device/motorola/sm7325-common/BoardConfigCommon.mk # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := berlin +TARGET_BOOTLOADER_BOARD_NAME := dubai # Bluetooth BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth # HIDL -DEVICE_MANIFEST_YUPIK_FILES += $(DEVICE_PATH)/manifest_berlin.xml +DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/device_framework_matrix_dubai.xml +DEVICE_MANIFEST_YUPIK_FILES += $(DEVICE_PATH)/manifest_dubai.xml # Kernel -BOARD_KERNEL_CMDLINE += androidboot.hab.product=berlin -TARGET_KERNEL_CONFIG += vendor/lineage_berlin.config +BOARD_KERNEL_CMDLINE += androidboot.hab.product=dubai +TARGET_KERNEL_CONFIG += vendor/lineage_dubai.config # Kernel Modules BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load)) @@ -39,14 +40,14 @@ BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVIC BOOT_KERNEL_MODULES := $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD) # Partitions -BOARD_USERDATAIMAGE_PARTITION_SIZE := 102247673856 +BOARD_USERDATAIMAGE_PARTITION_SIZE := 116340535296 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 := 3318226944 +BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 873680896 +BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE := 916299776 endif -BOARD_MOT_DP_GROUP_SIZE := 7109345280 -BOARD_SUPER_PARTITION_SIZE := 14227079168 +BOARD_MOT_DP_GROUP_SIZE := 8921284608 # ( BOARD_SUPER_PARTITION_SIZE - 4MB ) +BOARD_SUPER_PARTITION_SIZE := 8925478912 # Power TARGET_TAP_TO_WAKE_NODE := "/sys/devices/platform/soc/a94000.i2c/i2c-2/2-0049/double_click" @@ -59,7 +60,7 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90 # Security -VENDOR_SECURITY_PATCH := 2022-07-01 +VENDOR_SECURITY_PATCH := 2022-06-01 # inherit from the proprietary version -include vendor/motorola/berlin/BoardConfigVendor.mk +include vendor/motorola/dubai/BoardConfigVendor.mk diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml new file mode 100755 index 0000000..c26cb4e --- /dev/null +++ b/audio/audio_effects.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/audio_ext_spkr.conf b/audio/audio_ext_spkr.conf new file mode 100755 index 0000000..c90b01e --- /dev/null +++ b/audio/audio_ext_spkr.conf @@ -0,0 +1,29 @@ +global_config { + name Dubai + sonification_pad 20 + sonification_prox_timeout_sec 5 +} + +ring { + #dB to attenuate playback to meet safety level at each volume step + #16 steps total, 15...0. In case of truncated list, last attenuation + #given will be applied to all lower volume steps + attenuation 32,31,30,29,27,25,23,21,19,17,15,12,9,6,3,0 + knee_step 16 +} + +voice { + #dB to attenuate playback to meet safety level at each volume step + #16 steps total, 15...0. In case of truncated list, last attenuation + #given will be applied to all lower volume steps + attenuation 32,31,30,29,27,25,23,21,19,17,15,12,9,6,3,0 + knee_step 16 +} + +media { + #dB to attenuate playback to meet safety level at each volume step + #16 steps total, 15...0. In case of truncated list, last attenuation + #given will be applied to all lower volume steps + attenuation 32,31,30,29,27,25,23,21,19,17,15,12,9,6,3,0 + knee_step 16 +} diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml new file mode 100755 index 0000000..b9ebe93 --- /dev/null +++ b/audio/audio_policy_configuration.xml @@ -0,0 +1,273 @@ + + + + + + + + + + + + + Earpiece + Speaker + Telephony Tx + Built-In Mic + Built-In Back Mic + Telephony Rx + FM tuner + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml old mode 100644 new mode 100755 index e5dedfe..437824f --- a/audio/audio_policy_volumes.xml +++ b/audio/audio_policy_volumes.xml @@ -8,12 +8,18 @@ volume index from 0 to 100. --> - + + 0,-3700 + 20,-2600 + 40,-1800 + 60,-1100 + 80,-500 + 100,0 + 0,-3000 - 33,-2300 - 66,-1600 + 33,-2000 + 66,-1000 100,0 - 1,-5800 - 34,-3200 - 67,-1600 + 1,-6000 + 33,-3800 + 66,-1800 100,0 - + - 1,-3900 - 33,-2600 - 66,-1300 + 1,-4800 + 33,-3100 + 66,-1500 100,0 - 1,-4000 - 70,-1600 - 84,-800 - 100,0 + 1,-4900 + 33,-3400 + 66,-2000 + 100,-700 - 1,-3200 - 33,-2700 - 66,-2200 - 100,-1700 + 1,-3800 + 33,-3300 + 66,-2800 + 100,-2300 @@ -62,12 +62,9 @@ - 1,-5000 - 30,-3300 - 43,-2000 - 65,-1200 - 85,-600 - 93,-300 + 1,-5400 + 33,-3000 + 66,-1200 100,0 diff --git a/audio/sku_yupik/audio_platform_info.xml b/audio/sku_yupik/audio_platform_info.xml old mode 100644 new mode 100755 index a39a1c2..542af86 --- a/audio/sku_yupik/audio_platform_info.xml +++ b/audio/sku_yupik/audio_platform_info.xml @@ -143,6 +143,7 @@ + @@ -155,13 +156,15 @@ + + - + @@ -180,6 +183,7 @@ + @@ -187,6 +191,7 @@ + @@ -210,17 +215,17 @@ - - + + - - - - + + + + - + @@ -251,27 +256,30 @@ - - - - - + + + + + - - - - - - + + + + + + + + - + - + + @@ -314,6 +322,7 @@ + diff --git a/audio/sku_yupik/mixer_paths.xml b/audio/sku_yupik/mixer_paths.xml old mode 100644 new mode 100755 index 735c770..ba94e68 --- a/audio/sku_yupik/mixer_paths.xml +++ b/audio/sku_yupik/mixer_paths.xml @@ -165,8 +165,6 @@ - - @@ -318,8 +316,6 @@ - - @@ -446,17 +442,6 @@ - - - - - - - - - - - @@ -467,6 +452,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -477,7 +488,17 @@ - + + + + + + + + + + + @@ -495,6 +516,15 @@ + + + + + + + + + @@ -509,7 +539,17 @@ - + + + + + + + + + + + @@ -518,6 +558,15 @@ + + + + + + + + + @@ -532,11 +581,14 @@ - + + + + @@ -603,11 +655,14 @@ - + + + + @@ -674,7 +729,8 @@ - + + @@ -745,10 +801,12 @@ + + - + @@ -823,11 +881,14 @@ - + + + + @@ -1133,11 +1194,7 @@ - - - - - + @@ -1185,14 +1242,21 @@ - + + + + + + + - + + @@ -1245,14 +1309,21 @@ - + + + + + + + - + + @@ -1306,11 +1377,14 @@ - + + + + @@ -1418,11 +1492,14 @@ - + + + + @@ -1661,6 +1738,9 @@ + + + @@ -1790,9 +1870,14 @@ - - - + + + + + + + + @@ -1868,13 +1953,9 @@ - - - - - - - + + + @@ -1931,8 +2012,9 @@ - + + @@ -1954,7 +2036,6 @@ - diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h index a41ec90..f3f64ef 100644 --- a/bluetooth/bdroid_buildcfg.h +++ b/bluetooth/bdroid_buildcfg.h @@ -22,7 +22,7 @@ #ifndef _BDROID_BUILDCFG_H #define _BDROID_BUILDCFG_H -#define BTM_DEF_LOCAL_NAME "Motorola Edge 20" +#define BTM_DEF_LOCAL_NAME "Motorola Edge 30" // Disables read remote device feature #define MAX_ACL_CONNECTIONS 16 #define MAX_L2CAP_CHANNELS 16 diff --git a/configs/idc/uinput_nav.idc b/configs/idc/uinput_nav.idc deleted file mode 100644 index 76641fb..0000000 --- a/configs/idc/uinput_nav.idc +++ /dev/null @@ -1,5 +0,0 @@ -# Goodix side-type fingerprint sensor -device.internal = 1 -keyboard.layout = uinput_nav -keyboard.builtIn = 1 -keyboard.orientationAware = 1 diff --git a/configs/keylayout/goodix_ts.kl b/configs/keylayout/goodix_ts.kl new file mode 100755 index 0000000..25c3c5c --- /dev/null +++ b/configs/keylayout/goodix_ts.kl @@ -0,0 +1,9 @@ +# +# Goodix Touch sensor fod key event +# +# +# 704 finger touch down +# 705 finger touch up +# goodix_ts "finger present" +key 704 SYSTEM_NAVIGATION_DOWN +key 705 SYSTEM_NAVIGATION_UP diff --git a/configs/keylayout/uinput_nav.kl b/configs/keylayout/uinput_nav.kl deleted file mode 100644 index 9a92198..0000000 --- a/configs/keylayout/uinput_nav.kl +++ /dev/null @@ -1,7 +0,0 @@ -# Goodix side-type fingerprint sensor - -key 103 SYSTEM_NAVIGATION_UP -key 108 SYSTEM_NAVIGATION_DOWN - -# use SYSTEM_NAVIGATION_LEFT for double-tap gesture -key 115 SYSTEM_NAVIGATION_LEFT diff --git a/device.mk b/device.mk index 7a74f42..f2dfe56 100644 --- a/device.mk +++ b/device.mk @@ -33,23 +33,22 @@ $(call inherit-product, device/motorola/sm7325-common/sm7325.mk) # Overlay PRODUCT_PACKAGES += \ - FrameworksResBerlin \ - SystemUIResBerlin + FrameworksResDubai \ + SystemUIResDubai # Audio PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - $(LOCAL_PATH)/audio/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ $(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_yupik/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/mixer_paths.xml \ + $(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ + $(LOCAL_PATH)/audio/audio_ext_spkr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_ext_spkr.conf \ + $(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 # Fingerprint PRODUCT_PACKAGES += \ - android.hardware.biometrics.fingerprint@2.1-service.berlin - -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/idc/uinput_nav.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput_nav.idc \ - $(LOCAL_PATH)/configs/keylayout/uinput_nav.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput_nav.kl + android.hardware.biometrics.fingerprint@2.1.vendor # Init $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/etc/init/hw/*.rc),\ @@ -59,9 +58,13 @@ $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/etc/init/*.rc),\ $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/bin/*.sh),\ $(eval PRODUCT_COPY_FILES += $(f):$(TARGET_COPY_OUT_VENDOR)/bin/$(notdir $f))) +# Keylayout +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/keylayout/goodix_ts.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/goodix_ts.kl + # Lineage Touch PRODUCT_PACKAGES += \ - vendor.lineage.touch@1.0-service.berlin + vendor.lineage.touch@1.0-service.dubai # Media PRODUCT_COPY_FILES += \ @@ -87,4 +90,4 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml # Inherit from vendor blobs -$(call inherit-product, vendor/motorola/berlin/berlin-vendor.mk) +$(call inherit-product, vendor/motorola/dubai/dubai-vendor.mk) diff --git a/device_framework_matrix_dubai.xml b/device_framework_matrix_dubai.xml new file mode 100644 index 0000000..93fd69b --- /dev/null +++ b/device_framework_matrix_dubai.xml @@ -0,0 +1,11 @@ + + + vendor.egistec.hardware.fingerprint + hwbinder + 4.0 + + IBiometricsFingerprintRbs + default + + + diff --git a/extract-files.sh b/extract-files.sh index 3dab39d..4196aee 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-2022 The LineageOS Project # # SPDX-License-Identifier: Apache-2.0 # @@ -14,7 +14,7 @@ fi set -e -export DEVICE=berlin +export DEVICE=dubai export DEVICE_COMMON=sm7325-common export VENDOR=motorola diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp deleted file mode 100644 index 5fe40bc..0000000 --- a/fingerprint/Android.bp +++ /dev/null @@ -1,32 +0,0 @@ -// -// Copyright (C) 2017-2018 The LineageOS Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -cc_binary { - name: "android.hardware.biometrics.fingerprint@2.1-service.berlin", - vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.berlin.xml"], - init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.berlin.rc"], - defaults: ["hidl_defaults"], - relative_install_path: "hw", - srcs: ["service.cpp", "BiometricsFingerprint.cpp"], - shared_libs: [ - "libbase", - "libhardware", - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "android.hardware.biometrics.fingerprint@2.1", - ], - proprietary: true, -} diff --git a/fingerprint/BiometricsFingerprint.cpp b/fingerprint/BiometricsFingerprint.cpp deleted file mode 100644 index eaf05c7..0000000 --- a/fingerprint/BiometricsFingerprint.cpp +++ /dev/null @@ -1,375 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * Copyright (C) 2018-2020 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.berlin" - -#include "BiometricsFingerprint.h" - -#include -#include -#include -#include -#include -#include -#include - -namespace android { -namespace hardware { -namespace biometrics { -namespace fingerprint { -namespace V2_1 { -namespace implementation { - -// Supported fingerprint HAL version -static const uint16_t kVersion = HARDWARE_MODULE_API_VERSION(2, 1); - -using RequestStatus = android::hardware::biometrics::fingerprint::V2_1::RequestStatus; - -BiometricsFingerprint* BiometricsFingerprint::sInstance = nullptr; - -BiometricsFingerprint::BiometricsFingerprint() : mClientCallback(nullptr), mDevice(nullptr) { - sInstance = this; // keep track of the most recent instance - mDevice = openHal(); - if (!mDevice) { - ALOGE("Can't open HAL module"); - } -} - -BiometricsFingerprint::~BiometricsFingerprint() { - ALOGV("~BiometricsFingerprint()"); - if (mDevice == nullptr) { - ALOGE("No valid device"); - return; - } - int err; - if (0 != (err = mDevice->common.close(reinterpret_cast(mDevice)))) { - ALOGE("Can't close fingerprint module, error: %d", err); - return; - } - mDevice = nullptr; -} - -Return BiometricsFingerprint::ErrorFilter(int32_t error) { - switch (error) { - case 0: - return RequestStatus::SYS_OK; - case -2: - return RequestStatus::SYS_ENOENT; - case -4: - return RequestStatus::SYS_EINTR; - case -5: - return RequestStatus::SYS_EIO; - case -11: - return RequestStatus::SYS_EAGAIN; - case -12: - return RequestStatus::SYS_ENOMEM; - case -13: - return RequestStatus::SYS_EACCES; - case -14: - return RequestStatus::SYS_EFAULT; - case -16: - return RequestStatus::SYS_EBUSY; - case -22: - return RequestStatus::SYS_EINVAL; - case -28: - return RequestStatus::SYS_ENOSPC; - case -110: - return RequestStatus::SYS_ETIMEDOUT; - default: - ALOGE("An unknown error returned from fingerprint vendor library: %d", error); - return RequestStatus::SYS_UNKNOWN; - } -} - -// Translate from errors returned by traditional HAL (see fingerprint.h) to -// HIDL-compliant FingerprintError. -FingerprintError BiometricsFingerprint::VendorErrorFilter(int32_t error, int32_t* vendorCode) { - *vendorCode = 0; - switch (error) { - case FINGERPRINT_ERROR_HW_UNAVAILABLE: - return FingerprintError::ERROR_HW_UNAVAILABLE; - case FINGERPRINT_ERROR_UNABLE_TO_PROCESS: - return FingerprintError::ERROR_UNABLE_TO_PROCESS; - case FINGERPRINT_ERROR_TIMEOUT: - return FingerprintError::ERROR_TIMEOUT; - case FINGERPRINT_ERROR_NO_SPACE: - return FingerprintError::ERROR_NO_SPACE; - case FINGERPRINT_ERROR_CANCELED: - return FingerprintError::ERROR_CANCELED; - case FINGERPRINT_ERROR_UNABLE_TO_REMOVE: - return FingerprintError::ERROR_UNABLE_TO_REMOVE; - case FINGERPRINT_ERROR_LOCKOUT: - return FingerprintError::ERROR_LOCKOUT; - default: - if (error >= FINGERPRINT_ERROR_VENDOR_BASE) { - // vendor specific code. - *vendorCode = error - FINGERPRINT_ERROR_VENDOR_BASE; - return FingerprintError::ERROR_VENDOR; - } - } - ALOGE("Unknown error from fingerprint vendor library: %d", error); - return FingerprintError::ERROR_UNABLE_TO_PROCESS; -} - -// Translate acquired messages returned by traditional HAL (see fingerprint.h) -// to HIDL-compliant FingerprintAcquiredInfo. -FingerprintAcquiredInfo BiometricsFingerprint::VendorAcquiredFilter(int32_t info, - int32_t* vendorCode) { - *vendorCode = 0; - switch (info) { - case FINGERPRINT_ACQUIRED_GOOD: - return FingerprintAcquiredInfo::ACQUIRED_GOOD; - case FINGERPRINT_ACQUIRED_PARTIAL: - return FingerprintAcquiredInfo::ACQUIRED_PARTIAL; - case FINGERPRINT_ACQUIRED_INSUFFICIENT: - return FingerprintAcquiredInfo::ACQUIRED_INSUFFICIENT; - case FINGERPRINT_ACQUIRED_IMAGER_DIRTY: - return FingerprintAcquiredInfo::ACQUIRED_IMAGER_DIRTY; - case FINGERPRINT_ACQUIRED_TOO_SLOW: - return FingerprintAcquiredInfo::ACQUIRED_TOO_SLOW; - case FINGERPRINT_ACQUIRED_TOO_FAST: - return FingerprintAcquiredInfo::ACQUIRED_TOO_FAST; - default: - if (info >= FINGERPRINT_ACQUIRED_VENDOR_BASE) { - // vendor specific code. - *vendorCode = info - FINGERPRINT_ACQUIRED_VENDOR_BASE; - return FingerprintAcquiredInfo::ACQUIRED_VENDOR; - } - } - ALOGE("Unknown acquiredmsg from fingerprint vendor library: %d", info); - return FingerprintAcquiredInfo::ACQUIRED_INSUFFICIENT; -} - -Return BiometricsFingerprint::setNotify( - const sp& clientCallback) { - std::lock_guard lock(mClientCallbackMutex); - mClientCallback = clientCallback; - // This is here because HAL 2.1 doesn't have a way to propagate a - // unique token for its driver. Subsequent versions should send a unique - // token for each call to setNotify(). This is fine as long as there's only - // one fingerprint device on the platform. - return reinterpret_cast(mDevice); -} - -Return BiometricsFingerprint::preEnroll() { - return mDevice->pre_enroll(mDevice); -} - -Return BiometricsFingerprint::enroll(const hidl_array& hat, - uint32_t gid, uint32_t timeoutSec) { - const hw_auth_token_t* authToken = reinterpret_cast(hat.data()); - return ErrorFilter(mDevice->enroll(mDevice, authToken, gid, timeoutSec)); -} - -Return BiometricsFingerprint::postEnroll() { - return ErrorFilter(mDevice->post_enroll(mDevice)); -} - -Return BiometricsFingerprint::getAuthenticatorId() { - return mDevice->get_authenticator_id(mDevice); -} - -Return BiometricsFingerprint::cancel() { - return ErrorFilter(mDevice->cancel(mDevice)); -} - -Return BiometricsFingerprint::enumerate() { - return ErrorFilter(mDevice->enumerate(mDevice)); -} - -Return BiometricsFingerprint::remove(uint32_t gid, uint32_t fid) { - return ErrorFilter(mDevice->remove(mDevice, gid, fid)); -} - -Return BiometricsFingerprint::setActiveGroup(uint32_t gid, - const hidl_string& storePath) { - if (storePath.size() >= PATH_MAX || storePath.size() <= 0) { - ALOGE("Bad path length: %zd", storePath.size()); - return RequestStatus::SYS_EINVAL; - } - std::string mutableStorePath = storePath; - if (android::base::StartsWith(mutableStorePath, "/data/system/users/")) { - mutableStorePath = "/data/vendor_de/"; - mutableStorePath += - static_cast(storePath).substr(strlen("/data/system/users/")); - } - if (access(mutableStorePath.c_str(), W_OK)) { - return RequestStatus::SYS_EINVAL; - } - return ErrorFilter(mDevice->set_active_group(mDevice, gid, mutableStorePath.c_str())); -} - -Return BiometricsFingerprint::authenticate(uint64_t operationId, uint32_t gid) { - return ErrorFilter(mDevice->authenticate(mDevice, operationId, gid)); -} - -IBiometricsFingerprint* BiometricsFingerprint::getInstance() { - if (!sInstance) { - sInstance = new BiometricsFingerprint(); - } - return sInstance; -} - -fingerprint_device_t* getDevice() { - const hw_module_t* hw_module = nullptr; - const char* className = "goodix"; - int err; - err = hw_get_module_by_class(FINGERPRINT_HARDWARE_MODULE_ID, className, &hw_module); - if (err) { - ALOGE("Failed to get fingerprint module: error %d", err); - return nullptr; - } - if (hw_module == nullptr) { - ALOGE("No valid fingerprint module"); - return nullptr; - } - fingerprint_module_t const* fp_module = reinterpret_cast(hw_module); - if (fp_module->common.methods->open == nullptr) { - ALOGE("No valid open method"); - return nullptr; - } - hw_device_t* device = nullptr; - err = fp_module->common.methods->open(hw_module, nullptr, &device); - if (err) { - ALOGE("Can't open fingerprint methods, error: %d", err); - return nullptr; - } - if (kVersion != device->version) { - ALOGE("Wrong fingerprint version: expected %d, got %d", kVersion, device->version); - return nullptr; - } - fingerprint_device_t* fp_device = reinterpret_cast(device); - ALOGI("Loaded fingerprint module"); - return fp_device; -} - -fingerprint_device_t* getFingerprintDevice() { - fingerprint_device_t* fp_device; - fp_device = getDevice(); - if (fp_device == nullptr) { - ALOGE("Failed to load fingerprint module"); - } else { - return fp_device; - } - return nullptr; -} - -fingerprint_device_t* BiometricsFingerprint::openHal() { - int err; - fingerprint_device_t* fp_device; - fp_device = getFingerprintDevice(); - if (fp_device == nullptr) { - return nullptr; - } - if (0 != (err = fp_device->set_notify(fp_device, BiometricsFingerprint::notify))) { - ALOGE("Can't register fingerprint module callback, error: %d", err); - return nullptr; - } - return fp_device; -} - -void BiometricsFingerprint::notify(const fingerprint_msg_t* msg) { - BiometricsFingerprint* thisPtr = - static_cast(BiometricsFingerprint::getInstance()); - std::lock_guard lock(thisPtr->mClientCallbackMutex); - if (thisPtr == nullptr || thisPtr->mClientCallback == nullptr) { - ALOGE("Receiving callbacks before the client callback is registered."); - return; - } - const uint64_t devId = reinterpret_cast(thisPtr->mDevice); - switch (msg->type) { - case FINGERPRINT_ERROR: { - int32_t vendorCode = 0; - FingerprintError result = VendorErrorFilter(msg->data.error, &vendorCode); - ALOGD("onError(%d)", result); - if (!thisPtr->mClientCallback->onError(devId, result, vendorCode).isOk()) { - ALOGE("failed to invoke fingerprint onError callback"); - } - } break; - case FINGERPRINT_ACQUIRED: { - int32_t vendorCode = 0; - FingerprintAcquiredInfo result = - VendorAcquiredFilter(msg->data.acquired.acquired_info, &vendorCode); - ALOGD("onAcquired(%d)", result); - if (!thisPtr->mClientCallback->onAcquired(devId, result, vendorCode).isOk()) { - ALOGE("failed to invoke fingerprint onAcquired callback"); - } - } break; - case FINGERPRINT_TEMPLATE_ENROLLING: - ALOGD("onEnrollResult(fid=%d, gid=%d, rem=%d)", msg->data.enroll.finger.fid, - msg->data.enroll.finger.gid, msg->data.enroll.samples_remaining); - if (!thisPtr->mClientCallback - ->onEnrollResult(devId, msg->data.enroll.finger.fid, - msg->data.enroll.finger.gid, - msg->data.enroll.samples_remaining) - .isOk()) { - ALOGE("failed to invoke fingerprint onEnrollResult callback"); - } - break; - case FINGERPRINT_TEMPLATE_REMOVED: - ALOGD("onRemove(fid=%d, gid=%d, rem=%d)", msg->data.removed.finger.fid, - msg->data.removed.finger.gid, msg->data.removed.remaining_templates); - if (!thisPtr->mClientCallback - ->onRemoved(devId, msg->data.removed.finger.fid, msg->data.removed.finger.gid, - msg->data.removed.remaining_templates) - .isOk()) { - ALOGE("failed to invoke fingerprint onRemoved callback"); - } - break; - case FINGERPRINT_AUTHENTICATED: - if (msg->data.authenticated.finger.fid != 0) { - ALOGD("onAuthenticated(fid=%d, gid=%d)", msg->data.authenticated.finger.fid, - msg->data.authenticated.finger.gid); - const uint8_t* hat = reinterpret_cast(&msg->data.authenticated.hat); - const hidl_vec token( - std::vector(hat, hat + sizeof(msg->data.authenticated.hat))); - if (!thisPtr->mClientCallback - ->onAuthenticated(devId, msg->data.authenticated.finger.fid, - msg->data.authenticated.finger.gid, token) - .isOk()) { - ALOGE("failed to invoke fingerprint onAuthenticated callback"); - } - } else { - // Not a recognized fingerprint - if (!thisPtr->mClientCallback - ->onAuthenticated(devId, msg->data.authenticated.finger.fid, - msg->data.authenticated.finger.gid, hidl_vec()) - .isOk()) { - ALOGE("failed to invoke fingerprint onAuthenticated callback"); - } - } - break; - case FINGERPRINT_TEMPLATE_ENUMERATING: - ALOGD("onEnumerate(fid=%d, gid=%d, rem=%d)", msg->data.enumerated.finger.fid, - msg->data.enumerated.finger.gid, msg->data.enumerated.remaining_templates); - if (!thisPtr->mClientCallback - ->onEnumerate(devId, msg->data.enumerated.finger.fid, - msg->data.enumerated.finger.gid, - msg->data.enumerated.remaining_templates) - .isOk()) { - ALOGE("failed to invoke fingerprint onEnumerate callback"); - } - break; - } -} - -} // namespace implementation -} // namespace V2_1 -} // namespace fingerprint -} // namespace biometrics -} // namespace hardware -} // namespace android diff --git a/fingerprint/BiometricsFingerprint.h b/fingerprint/BiometricsFingerprint.h deleted file mode 100644 index a92a419..0000000 --- a/fingerprint/BiometricsFingerprint.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H - -#define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H - -#include -#include -#include -#include -#include -#include -#include - -namespace android { -namespace hardware { -namespace biometrics { -namespace fingerprint { -namespace V2_1 { -namespace implementation { - -using ::android::sp; -using ::android::hardware::hidl_string; -using ::android::hardware::hidl_vec; -using ::android::hardware::Return; -using ::android::hardware::Void; -using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint; -using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback; -using ::android::hardware::biometrics::fingerprint::V2_1::RequestStatus; - -struct BiometricsFingerprint : public IBiometricsFingerprint { - public: - BiometricsFingerprint(); - ~BiometricsFingerprint(); - // Method to wrap legacy HAL with BiometricsFingerprint class - static IBiometricsFingerprint* getInstance(); - // Methods from ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint follow. - Return setNotify( - const sp& clientCallback) override; - Return preEnroll() override; - Return enroll(const hidl_array& hat, uint32_t gid, - uint32_t timeoutSec) override; - Return postEnroll() override; - Return getAuthenticatorId() override; - Return cancel() override; - Return enumerate() override; - Return remove(uint32_t gid, uint32_t fid) override; - Return setActiveGroup(uint32_t gid, const hidl_string& storePath) override; - Return authenticate(uint64_t operationId, uint32_t gid) override; - - private: - static fingerprint_device_t* openHal(); - static void notify( - const fingerprint_msg_t* msg); /* Static callback for legacy HAL implementation */ - static Return ErrorFilter(int32_t error); - static FingerprintError VendorErrorFilter(int32_t error, int32_t* vendorCode); - static FingerprintAcquiredInfo VendorAcquiredFilter(int32_t error, int32_t* vendorCode); - static BiometricsFingerprint* sInstance; - std::mutex mClientCallbackMutex; - sp mClientCallback; - fingerprint_device_t* mDevice; -}; - -} // namespace implementation -} // namespace V2_1 -} // namespace fingerprint -} // namespace biometrics -} // namespace hardware -} // namespace android - -#endif // ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H - diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.berlin.rc b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.berlin.rc deleted file mode 100644 index eaec4c7..0000000 --- a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.berlin.rc +++ /dev/null @@ -1,9 +0,0 @@ -service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.berlin - interface android.hardware.biometrics.fingerprint@2.1::IBiometricsFingerprint default - oneshot - # "class hal" causes a race condition on some devices due to files created - # in /data. As a workaround, postpone startup until later in boot once - # /data is mounted. - class late_start - user system - group system input uhid diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.berlin.xml b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.berlin.xml deleted file mode 100644 index 115dd7b..0000000 --- a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.berlin.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - android.hardware.biometrics.fingerprint - hwbinder - 2.1 - - IBiometricsFingerprint - default - - - diff --git a/fingerprint/service.cpp b/fingerprint/service.cpp deleted file mode 100644 index 33391c3..0000000 --- a/fingerprint/service.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.berlin" - -#include -#include - -#include "BiometricsFingerprint.h" - -// libhwbinder: -using android::hardware::configureRpcThreadpool; -using android::hardware::joinRpcThreadpool; - -// Generated HIDL files -using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint; -using android::hardware::biometrics::fingerprint::V2_1::implementation::BiometricsFingerprint; - -int main() { - android::sp service = BiometricsFingerprint::getInstance(); - if (service == nullptr) { - ALOGE("Instance of BiometricsFingerprint is null"); - return 1; - } - configureRpcThreadpool(1, true /*callerWillJoin*/); - android::status_t status = service->registerAsService(); - if (status != android::OK) { - ALOGE("Cannot register BiometricsFingerprint service"); - return 1; - } - joinRpcThreadpool(); - return 0; // should never get here -} diff --git a/lineage_berlin.mk b/lineage_dubai.mk similarity index 72% rename from lineage_berlin.mk rename to lineage_dubai.mk index 8a4fbcf..53257f4 100644 --- a/lineage_berlin.mk +++ b/lineage_dubai.mk @@ -18,22 +18,22 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) -# Inherit from berlin device -$(call inherit-product, device/motorola/berlin/device.mk) +# Inherit from dubai device +$(call inherit-product, device/motorola/dubai/device.mk) # Inherit some common Lineage stuff. $(call inherit-product, vendor/lineage/config/common_full_phone.mk) -PRODUCT_NAME := lineage_berlin -PRODUCT_DEVICE := berlin +PRODUCT_NAME := lineage_dubai +PRODUCT_DEVICE := dubai PRODUCT_MANUFACTURER := motorola PRODUCT_BRAND := motorola -PRODUCT_MODEL := motorola edge 20 +PRODUCT_MODEL := motorola edge 30 PRODUCT_GMS_CLIENTID_BASE := android-motorola PRODUCT_BUILD_PROP_OVERRIDES += \ - TARGET_PRODUCT=berlin_retail \ - PRIVATE_BUILD_DESC="berlin_global-user 11 S1RG32.53-18-11-7 7be15 release-keys" + TARGET_PRODUCT=dubai_retail \ + PRIVATE_BUILD_DESC="dubai_g-user 12 S1RD32M.55-67 356bc release-keys" -BUILD_FINGERPRINT := motorola/berlin_global/berlin:11/S1RGS32.53-18-11-7/7be15:user/release-keys +BUILD_FINGERPRINT := motorola/dubai_g/dubai:12/S1RD32M.55-67/356bc:user/release-keys diff --git a/manifest_berlin.xml b/manifest_dubai.xml similarity index 100% rename from manifest_berlin.xml rename to manifest_dubai.xml diff --git a/modules.blocklist b/modules.blocklist index a484c55..b5e1237 100644 --- a/modules.blocklist +++ b/modules.blocklist @@ -99,5 +99,5 @@ blocklist utags # # Motorola product module block list # -blocklist camera -blocklist aw8695 + + diff --git a/modules.load b/modules.load index 5b299e5..97a1177 100644 --- a/modules.load +++ b/modules.load @@ -95,17 +95,20 @@ bm_adsp_ulog.ko mmi_charger.ko qti_glink_charger.ko qpnp_adaptive_charge.ko -cirrus_wm_adsp.ko -cirrus_cs35l41.ko -aw8695.ko +aw862x.ko mmi_info.ko mmi_relay.ko -goodix_fod_mmi.ko wl2864c.ko cci_intf.ko st21nfc.ko +nfc_i2c.ko sx937x_sar.ko moto_f_usbnet.ko touchscreen_mmi.ko -stmicro_mmi.ko +goodix_brl_mmi.ko mmi_sys_temp.ko +rbs_fps_mmi.ko +mmi_info.ko +mmi_annotate.ko +tzlog_dump.ko +watchdog_cpu_ctx.ko diff --git a/modules.load.recovery b/modules.load.recovery index 2d76c67..399dce7 100644 --- a/modules.load.recovery +++ b/modules.load.recovery @@ -4,4 +4,4 @@ sensors_class.ko touchscreen_mmi.ko mmi_annotate.ko mmi_info.ko -stmicro_mmi.ko +goodix_brl_mmi.ko diff --git a/proprietary-files.txt b/proprietary-files.txt index fbe3c94..6a04164 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,4 +1,4 @@ -# All unpinned blobs below are extracted from S1RG32.53-18-11-7 +# All unpinned blobs below are extracted from S1RD32M.55-67 # ACDB Data vendor/etc/acdbdata/Bluetooth_cal.acdb @@ -16,10 +16,12 @@ vendor/etc/acdbdata/nn_ns_models/fai__2.6.1_0.0__eai_v1.10.pmd vendor/etc/acdbdata/nn_vad_models/fai_3.0.0_0.0_eai_1.00.pmd # Audio firmware -vendor/firmware/cs35l41-dsp1-spk-cali.bin -vendor/firmware/cs35l41-dsp1-spk-cali.wmfw -vendor/firmware/cs35l41-dsp1-spk-prot.bin -vendor/firmware/cs35l41-dsp1-spk-prot.wmfw +vendor/firmware/aw882xx_spk_reg.bin +vendor/firmware/aw_skt.bin + +# Audio libraries +vendor/lib/libacdbloader.so +vendor/lib64/libacdbloader.so # Camera vendor/etc/pwr/PowerFeatureConfig.xml @@ -31,8 +33,16 @@ vendor/lib/com.qti.settings.mannar.so vendor/lib/com.qti.settings.sdm865.so vendor/lib/com.qti.settings.sm8350.so vendor/lib/com.qti.stats.common.so -vendor/lib/libarcsoft_portrait_distortion_correction.so +vendor/lib/libarcsoft_chi_utils.so vendor/lib/libarcsoft_distortion_correction.so +vendor/lib/libarcsoft_hdr_detection.so +vendor/lib/libarcsoft_high_dynamic_range.so +vendor/lib/libarcsoft_portrait_distortion_correction.so +vendor/lib/libarcsoft_portrait_super_night_raw.so +vendor/lib/libarcsoft_portrait_super_night_se_raw.so +vendor/lib/libarcsoft_qnnhtp.so +vendor/lib/libarcsoft_super_night_raw.so +vendor/lib/libarcsoft_super_night_se_raw.so vendor/lib/libbitmlengine.so vendor/lib/libbitmlenginev2.so vendor/lib/libcamera_nn_stub.so @@ -71,6 +81,7 @@ vendor/lib/libofflinelog.so vendor/lib/libopencv.so vendor/lib/libos.so vendor/lib/libpowercore.so +vendor/lib/libremosaic_wrapper.so vendor/lib/libswregistrationalgo.so vendor/lib/libsynx.so vendor/lib/libthreadutils.so @@ -98,10 +109,18 @@ vendor/lib64/com.qti.settings.mannar.so vendor/lib64/com.qti.settings.sdm865.so vendor/lib64/com.qti.settings.sm8350.so vendor/lib64/com.qti.stats.common.so -vendor/lib64/libarcsoft_triple_sat.so -vendor/lib64/libarcsoft_portrait_distortion_correction.so +vendor/lib64/libarcsoft_chi_utils.so vendor/lib64/libarcsoft_distortion_correction.so -vendor/lib64/libarcsoft_triple_zoomtranslator.so +vendor/lib64/libarcsoft_dual_sat.so +vendor/lib64/libarcsoft_dual_zoomtranslator.so +vendor/lib64/libarcsoft_hdr_detection.so +vendor/lib64/libarcsoft_high_dynamic_range.so +vendor/lib64/libarcsoft_portrait_distortion_correction.so +vendor/lib64/libarcsoft_portrait_super_night_raw.so +vendor/lib64/libarcsoft_portrait_super_night_se_raw.so +vendor/lib64/libarcsoft_qnnhtp.so +vendor/lib64/libarcsoft_super_night_raw.so +vendor/lib64/libarcsoft_super_night_se_raw.so vendor/lib64/libbitmlengine.so vendor/lib64/libbitmlenginev2.so vendor/lib64/libcamera_nn_stub.so @@ -140,11 +159,10 @@ vendor/lib64/libofflinelog.so vendor/lib64/libopencv.so vendor/lib64/libos.so vendor/lib64/libpowercore.so +vendor/lib64/libremosaic_wrapper.so vendor/lib64/libswregistrationalgo.so vendor/lib64/libsynx.so vendor/lib64/libthreadutils.so -vendor/lib64/libtriplecam_optical_zoom_control.so -vendor/lib64/libtriplecam_video_optical_zoom.so vendor/lib64/libvideooptfeature.so vendor/lib64/libvidhance.so vendor/lib64/libvidhance_active_ois.so @@ -163,9 +181,10 @@ vendor/lib64/hw/camera.qcom.so vendor/lib64/hw/com.qti.chi.override.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.mot.node.c2d.so +vendor/lib/camera/components/com.mot.node.dc_capture.so +vendor/lib/camera/components/com.mot.node.hdr.so +vendor/lib/camera/components/com.mot.node.scene_detect.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 @@ -196,33 +215,35 @@ vendor/lib/camera/components/com.qti.node.swmfnr.so vendor/lib/camera/components/com.qti.node.swpdpc.so vendor/lib/camera/components/com.qti.node.swpreprocess.so vendor/lib/camera/components/com.qti.node.swregistration.so +vendor/lib/camera/components/com.qtistatic.stats.aec.so +vendor/lib/camera/components/com.qtistatic.stats.af.so +vendor/lib/camera/components/com.qtistatic.stats.awb.so +vendor/lib/camera/components/com.qtistatic.stats.pdlib.so vendor/lib/camera/components/com.qti.stats.aec.so vendor/lib/camera/components/com.qti.stats.aecwrapper.so vendor/lib/camera/components/com.qti.stats.aecxcore.so -vendor/lib/camera/components/com.qti.stats.af.so vendor/lib/camera/components/com.qti.stats.afd.so +vendor/lib/camera/components/com.qti.stats.af.so vendor/lib/camera/components/com.qti.stats.afwrapper.so vendor/lib/camera/components/com.qti.stats.asd.so vendor/lib/camera/components/com.qti.stats.awb.so vendor/lib/camera/components/com.qti.stats.awbwrapper.so vendor/lib/camera/components/com.qti.stats.cnndriver.so -vendor/lib/camera/components/com.qti.stats.haf.so vendor/lib/camera/components/com.qti.stats.hafoverride.so +vendor/lib/camera/components/com.qti.stats.haf.so vendor/lib/camera/components/com.qti.stats.pdlib.so vendor/lib/camera/components/com.qti.stats.pdlibsony.so vendor/lib/camera/components/com.qti.stats.pdlibwrapper.so vendor/lib/camera/components/com.qti.stats.tracker.so -vendor/lib/camera/components/com.qtistatic.stats.aec.so -vendor/lib/camera/components/com.qtistatic.stats.af.so -vendor/lib/camera/components/com.qtistatic.stats.awb.so -vendor/lib/camera/components/com.qtistatic.stats.pdlib.so vendor/lib/camera/components/com.vidhance.node.ica.so vendor/lib/camera/components/com.vidhance.node.processing.so vendor/lib/camera/components/com.vidhance.stats.aec_dmbr.so -vendor/lib64/camera/components/com.arcsoft.node.dc_capture.so -vendor/lib64/camera/components/com.arcsoft.node.dc_preview.so vendor/lib64/camera/components/com.arcsoft.node.smooth_transition.so +vendor/lib64/camera/components/com.arcsoft.node.supernightraw.so vendor/lib64/camera/components/com.mot.node.c2d.so +vendor/lib64/camera/components/com.mot.node.dc_capture.so +vendor/lib64/camera/components/com.mot.node.hdr.so +vendor/lib64/camera/components/com.mot.node.scene_detect.so vendor/lib64/camera/components/com.qti.camx.chiiqutils.so vendor/lib64/camera/components/com.qti.eisv2.so vendor/lib64/camera/components/com.qti.eisv3.so @@ -253,45 +274,46 @@ vendor/lib64/camera/components/com.qti.node.swmfnr.so vendor/lib64/camera/components/com.qti.node.swpdpc.so vendor/lib64/camera/components/com.qti.node.swpreprocess.so vendor/lib64/camera/components/com.qti.node.swregistration.so +vendor/lib64/camera/components/com.qtistatic.stats.aec.so +vendor/lib64/camera/components/com.qtistatic.stats.af.so +vendor/lib64/camera/components/com.qtistatic.stats.awb.so +vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so vendor/lib64/camera/components/com.qti.stats.aec.so vendor/lib64/camera/components/com.qti.stats.aecwrapper.so vendor/lib64/camera/components/com.qti.stats.aecxcore.so -vendor/lib64/camera/components/com.qti.stats.af.so vendor/lib64/camera/components/com.qti.stats.afd.so +vendor/lib64/camera/components/com.qti.stats.af.so vendor/lib64/camera/components/com.qti.stats.afwrapper.so vendor/lib64/camera/components/com.qti.stats.asd.so vendor/lib64/camera/components/com.qti.stats.awb.so vendor/lib64/camera/components/com.qti.stats.awbwrapper.so vendor/lib64/camera/components/com.qti.stats.cnndriver.so -vendor/lib64/camera/components/com.qti.stats.haf.so vendor/lib64/camera/components/com.qti.stats.hafoverride.so +vendor/lib64/camera/components/com.qti.stats.haf.so vendor/lib64/camera/components/com.qti.stats.pdlib.so vendor/lib64/camera/components/com.qti.stats.pdlibsony.so vendor/lib64/camera/components/com.qti.stats.pdlibwrapper.so vendor/lib64/camera/components/com.qti.stats.tracker.so -vendor/lib64/camera/components/com.qtistatic.stats.aec.so -vendor/lib64/camera/components/com.qtistatic.stats.af.so -vendor/lib64/camera/components/com.qtistatic.stats.awb.so -vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so vendor/lib64/camera/components/com.vidhance.node.ica.so vendor/lib64/camera/components/com.vidhance.node.processing.so vendor/lib64/camera/components/com.vidhance.stats.aec_dmbr.so vendor/lib64/camera/components/libdepthmapwrapper_secure.so # Camera - eeprom -vendor/lib/camera/com.mot.eeprom.mot_gt24p64b_ov08a10_eeprom.so -vendor/lib/camera/com.mot.eeprom.mot_gt24p64b_ov16a10_eeprom.so +vendor/lib/camera/com.mot.eeprom.mot_dubai_gc02m1b_otp.so +vendor/lib/camera/com.mot.eeprom.mot_gt24p128e_ov50a_eeprom.so +vendor/lib/camera/com.mot.eeprom.mot_gt24p128e_s5kjn1_eeprom.so vendor/lib/camera/com.mot.eeprom.mot_gt24p64e_ov32b40_eeprom.so -vendor/lib/camera/com.mot.eeprom.mot_gt24p64e_s5khm2_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_ov08a10_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_ov16a10_eeprom.so +vendor/lib64/camera/com.mot.eeprom.mot_dubai_gc02m1b_otp.so +vendor/lib64/camera/com.mot.eeprom.mot_gt24p128e_ov50a_eeprom.so +vendor/lib64/camera/com.mot.eeprom.mot_gt24p128e_s5kjn1_eeprom.so vendor/lib64/camera/com.mot.eeprom.mot_gt24p64e_ov32b40_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_gt24p64e_s5khm2_eeprom.so # Camera - etc -vendor/etc/camera/aec_golden_tele.bin +vendor/etc/camera/aec_golden_depth.bin +vendor/etc/camera/aec_golden_wide.bin vendor/etc/camera/arcsoft_calibration_u_dc.bin -vendor/etc/camera/dual_golden_tele.bin +vendor/etc/camera/dual_golden_depth.bin vendor/etc/camera/dual_golden_wide.bin vendor/etc/camera/mot_engine_config.bin vendor/etc/camera/vidhance_calibration @@ -366,66 +388,67 @@ vendor/lib64/motorola.hardware.camera.desktop@1.0.so vendor/lib64/motorola.hardware.camera.desktop@2.0.so # Camera - OIS -vendor/firmware/mot_bu63169.coeff -vendor/firmware/mot_bu63169.prog +vendor/firmware/mot_dw9781c.prog # Camera - sensor -vendor/lib/camera/com.qti.sensor.mot_ov08a10.so -vendor/lib/camera/com.qti.sensor.mot_ov16a10.so +vendor/lib/camera/com.qti.sensormodule.mot_dubai_gc02m1b_tsp.bin +vendor/lib/camera/com.qti.sensormodule.mot_dubai_ov32b40_ofilm.bin +vendor/lib/camera/com.qti.sensormodule.mot_dubai_ov50a_sunny.bin +vendor/lib/camera/com.qti.sensormodule.mot_dubai_s5kjn1_qtech.bin +vendor/lib/camera/com.qti.sensor.mot_gc02m1b.so vendor/lib/camera/com.qti.sensor.mot_ov32b40.so -vendor/lib/camera/com.qti.sensor.mot_s5khm2.so -vendor/lib64/camera/com.qti.sensor.mot_ov08a10.so -vendor/lib64/camera/com.qti.sensor.mot_ov16a10.so +vendor/lib/camera/com.qti.sensor.mot_ov50a.so +vendor/lib/camera/com.qti.sensor.mot_s5kjn1.so +vendor/lib64/camera/com.qti.sensormodule.mot_dubai_gc02m1b_tsp.bin +vendor/lib64/camera/com.qti.sensormodule.mot_dubai_ov32b40_ofilm.bin +vendor/lib64/camera/com.qti.sensormodule.mot_dubai_ov50a_sunny.bin +vendor/lib64/camera/com.qti.sensormodule.mot_dubai_s5kjn1_qtech.bin +vendor/lib64/camera/com.qti.sensor.mot_gc02m1b.so vendor/lib64/camera/com.qti.sensor.mot_ov32b40.so -vendor/lib64/camera/com.qti.sensor.mot_s5khm2.so +vendor/lib64/camera/com.qti.sensor.mot_ov50a.so +vendor/lib64/camera/com.qti.sensor.mot_s5kjn1.so # Camera - sensormodule -vendor/lib/camera/com.qti.sensormodule.mot_berlin_ov08a10_qtech.bin -vendor/lib/camera/com.qti.sensormodule.mot_berlin_ov16a10_qtech.bin -vendor/lib/camera/com.qti.sensormodule.mot_berlin_ov32b40_qtech.bin -vendor/lib/camera/com.qti.sensormodule.mot_berlin_s5khm2_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_berlin_ov08a10_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_berlin_ov16a10_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_berlin_ov32b40_qtech.bin -vendor/lib64/camera/com.qti.sensormodule.mot_berlin_s5khm2_qtech.bin +vendor/lib/camera/com.qti.sensormodule.mot_dubai_gc02m1b_tsp.bin +vendor/lib/camera/com.qti.sensormodule.mot_dubai_ov32b40_ofilm.bin +vendor/lib/camera/com.qti.sensormodule.mot_dubai_ov50a_sunny.bin +vendor/lib/camera/com.qti.sensormodule.mot_dubai_s5kjn1_qtech.bin +vendor/lib64/camera/com.qti.sensormodule.mot_dubai_gc02m1b_tsp.bin +vendor/lib64/camera/com.qti.sensormodule.mot_dubai_ov32b40_ofilm.bin +vendor/lib64/camera/com.qti.sensormodule.mot_dubai_ov50a_sunny.bin +vendor/lib64/camera/com.qti.sensormodule.mot_dubai_s5kjn1_qtech.bin # Camera - tuned vendor/lib/camera/com.qti.tuned.default.bin -vendor/lib/camera/com.qti.tuned.mot_berlin_ov08a10.bin -vendor/lib/camera/com.qti.tuned.mot_berlin_ov16a10.bin -vendor/lib/camera/com.qti.tuned.mot_berlin_ov32b40.bin -vendor/lib/camera/com.qti.tuned.mot_berlin_s5khm2.bin +vendor/lib/camera/com.qti.tuned.mot_dubai_gc02m1b.bin +vendor/lib/camera/com.qti.tuned.mot_dubai_ov32b40.bin +vendor/lib/camera/com.qti.tuned.mot_dubai_ov50a.bin +vendor/lib/camera/com.qti.tuned.mot_dubai_s5kjn1.bin vendor/lib64/camera/com.qti.tuned.default.bin -vendor/lib64/camera/com.qti.tuned.mot_berlin_ov08a10.bin -vendor/lib64/camera/com.qti.tuned.mot_berlin_ov16a10.bin -vendor/lib64/camera/com.qti.tuned.mot_berlin_ov32b40.bin -vendor/lib64/camera/com.qti.tuned.mot_berlin_s5khm2.bin +vendor/lib64/camera/com.qti.tuned.mot_dubai_gc02m1b.bin +vendor/lib64/camera/com.qti.tuned.mot_dubai_ov32b40.bin +vendor/lib64/camera/com.qti.tuned.mot_dubai_ov50a.bin +vendor/lib64/camera/com.qti.tuned.mot_dubai_s5kjn1.bin # Display calibration data -vendor/etc/qdcm_calib_data_mipi_mot_cmd_csot_1080p_dsc_667.xml -vendor/etc/qdcm_calib_data_mipi_mot_cmd_visionox_1080p_dsc_667.xml +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/lib64/hw/fingerprint.goodix.default.so -vendor/lib64/libgoodixhwfingerprint.so -vendor/lib64/vendor.goodix.hardware.biometrics.fingerprint@3.0.so vendor/lib64/com.motorola.hardware.biometric.fingerprint@1.0.so -vendor/lib64/libgf_hal.so -vendor/lib64/libgf_ca.so +vendor/lib64/vendor.egistec.hardware.fingerprint@4.0.so +vendor/lib64/libets_teeclient_v3.so +vendor/lib64/libRbsFlow.so # NFC vendor/bin/STFlashTool # NFC - configs vendor/etc/libnfc-hal-st.conf -vendor/etc/libnfc-mtp-SN100.conf -vendor/etc/libnfc-mtp-SN100_38_4MHZ.conf vendor/etc/libnfc-nci-st.conf -vendor/etc/libnfc-qrd-SN100.conf -vendor/etc/libnfc-qrd-SN100_38_4MHZ.conf vendor/etc/st21nfc_conf_ds.txt vendor/etc/st21nfc_conf_ss.txt @@ -436,8 +459,12 @@ vendor/firmware/st21nfc_fw7.bin # OEM vendor/etc/vhw.xml +# Sensors +vendor/lib64/sensors.moto.so +vendor/lib64/sensors.ssc.so + # Sensor - configs -vendor/etc/sensors/config/ak991x_0.json +vendor/etc/sensors/config/icm4x6xx.json vendor/etc/sensors/config/kodiak_default_sensors.json vendor/etc/sensors/config/kodiak_dynamic_sensors.json vendor/etc/sensors/config/kodiak_irq.json @@ -446,6 +473,7 @@ vendor/etc/sensors/config/lsm6dso_0.json vendor/etc/sensors/config/mmc5603x_0.json vendor/etc/sensors/config/mot_camgest.json vendor/etc/sensors/config/mot_devorient.json +vendor/etc/sensors/config/mxg4300_0.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 @@ -460,6 +488,7 @@ vendor/etc/sensors/config/sns_cm.json vendor/etc/sensors/config/sns_dae.json vendor/etc/sensors/config/sns_device_orient.json vendor/etc/sensors/config/sns_diag_filter.json +vendor/etc/sensors/config/sns_direct_channel.json vendor/etc/sensors/config/sns_distance_bound.json vendor/etc/sensors/config/sns_dpc.json vendor/etc/sensors/config/sns_facing.json @@ -480,10 +509,7 @@ 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_always.json -vendor/etc/sensors/config/stk3a5x_0_emerald_always.json -vendor/etc/sensors/config/stk3a5x_0_white_always.json -vendor/etc/sensors/hals.conf +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 @@ -505,8 +531,8 @@ 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 @@ -532,16 +558,16 @@ 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 @@ -562,8 +588,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 @@ -579,12 +605,71 @@ vendor/etc/sensors/sns_reg_config # Thermal engine - configs vendor/etc/thermal-engine.conf -vendor/etc/thermal-engine-berlin.conf +vendor/etc/thermal-engine-dubai.conf # Touchscreen firmware -vendor/firmware/csot_stm_fts_production_limits.csv -vendor/firmware/stmicro-csot-fts3639-21120227-de141027-berlin.ftb -vendor/firmware/stmicro-visionox-fts3639-21072312-0009200c-berlin.ftb -vendor/firmware/visionox_stm_fts_production_limits.csv - +vendor/firmware/csot_goodix_cfg_group.bin +vendor/firmware/csot_goodix_test_limits_255.csv +vendor/firmware/goodix-csot-gt9916S-2202250f-62187be9-dubai.bin +vendor/firmware/goodix-tianma-gt9916S-2202250f-62187c3e-dubai.bin +vendor/firmware/tianma_goodix_cfg_group.bin +vendor/firmware/tianma_goodix_test_limits_255.csv +# Vibration firmware +vendor/firmware/aw8622x_haptic.bin +vendor/firmware/aw8622x_osc_rtp_12K_10s.bin +vendor/firmware/aw8622x_rtp_Argo_Navis.bin +vendor/firmware/aw8622x_rtp_Attentive.bin +vendor/firmware/aw8622x_rtp_Awake.bin +vendor/firmware/aw8622x_rtp.bin +vendor/firmware/aw8622x_rtp_Bird_Loop.bin +vendor/firmware/aw8622x_rtp_Brilliant_Times.bin +vendor/firmware/aw8622x_rtp_Chimey_Phone.bin +vendor/firmware/aw8622x_rtp_City_Lights.bin +vendor/firmware/aw8622x_rtp_Complex.bin +vendor/firmware/aw8622x_rtp_Crazy_Dream.bin +vendor/firmware/aw8622x_rtp_Curve_Ball_Blend.bin +vendor/firmware/aw8622x_rtp_Digital_Phone.bin +vendor/firmware/aw8622x_rtp_Electrovision.bin +vendor/firmware/aw8622x_rtp_Ether_Shake.bin +vendor/firmware/aw8622x_rtp_Fateful_Words.bin +vendor/firmware/aw8622x_rtp_Firefly.bin +vendor/firmware/aw8622x_rtp_Flutey_Phone.bin +vendor/firmware/aw8622x_rtp_Future_Funk.bin +vendor/firmware/aw8622x_rtp_Future_Hi_Tech.bin +vendor/firmware/aw8622x_rtp_Girtab.bin +vendor/firmware/aw8622x_rtp_Hello.bin +vendor/firmware/aw8622x_rtp_Hexagon.bin +vendor/firmware/aw8622x_rtp_Hydra.bin +vendor/firmware/aw8622x_rtp_Insert_Coin.bin +vendor/firmware/aw8622x_rtp_Jumping_Dots.bin +vendor/firmware/aw8622x_rtp_Keys.bin +vendor/firmware/aw8622x_rtp_Loopy.bin +vendor/firmware/aw8622x_rtp_Loopy_Lounge.bin +vendor/firmware/aw8622x_rtp_Modular.bin +vendor/firmware/aw8622x_rtp_Momentum.bin +vendor/firmware/aw8622x_rtp_Morning.bin +vendor/firmware/aw8622x_rtp_Moto.bin +vendor/firmware/aw8622x_rtp_Moto_Original.bin +vendor/firmware/aw8622x_rtp_Moto_Retro.bin +vendor/firmware/aw8622x_rtp_Natural.bin +vendor/firmware/aw8622x_rtp_New_Player.bin +vendor/firmware/aw8622x_rtp_Now_or_Never.bin +vendor/firmware/aw8622x_rtp_Onward.bin +vendor/firmware/aw8622x_rtp_Organ_Dub.bin +vendor/firmware/aw8622x_rtp_Overclocked.bin +vendor/firmware/aw8622x_rtp_Pegasus.bin +vendor/firmware/aw8622x_rtp_Play.bin +vendor/firmware/aw8622x_rtp_Pyxis.bin +vendor/firmware/aw8622x_rtp_Regrade.bin +vendor/firmware/aw8622x_rtp_Scarabaeus.bin +vendor/firmware/aw8622x_rtp_Sceptrum.bin +vendor/firmware/aw8622x_rtp_Simple.bin +vendor/firmware/aw8622x_rtp_Solarium.bin +vendor/firmware/aw8622x_rtp_Sparse.bin +vendor/firmware/aw8622x_rtp_Terrabytes.bin +vendor/firmware/aw8622x_rtp_Verizon_Airwaves.bin +vendor/firmware/aw8622x_rtp_Zero_Hour.bin +vendor/firmware/aw882xx_pid_1852_acf.bin +vendor/firmware/aw882xx_pid_2113_acf.bin +vendor/firmware/aw882xx_spk_reg.bin diff --git a/resource-overlay/berlin/Frameworks/res/xml/power_profile.xml b/resource-overlay/berlin/Frameworks/res/xml/power_profile.xml deleted file mode 100644 index 126986e..0000000 --- a/resource-overlay/berlin/Frameworks/res/xml/power_profile.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - 0 - 139.28 - 155.5 - 0.9 - 34.36 - 4.73 - 523.93 - 200.75 - 171 - 86.278 - 10.57 - - 33.079 - 30 - 25 - 20 - 15 - 10 - 5 - 1.463 - - - 4 - 3 - 1 - - - 300000 - 691200 - 806400 - 940800 - 1152000 - 1324800 - 1516800 - 1651200 - 1804800 - - - 691200 - 940800 - 1228800 - 1344000 - 1516800 - 1651200 - 1900800 - 2054400 - 2131200 - 2400000 - - - 806400 - 1056000 - 1324800 - 1516800 - 1766400 - 1862400 - 2035200 - 2208000 - 2380800 - 2400000 - - - 4.13 - 6.9 - 7.26 - 8.88 - 12.17 - 15.7 - 20.06 - 25.76 - 30.9 - - - 26.93 - 20.23 - 57.22 - 71.71 - 91.77 - 108.31 - 158.29 - 182.69 - 186.79 - 230.89 - - - 34.69 - 49.4 - 70.56 - 89.92 - 117.81 - 129.49 - 185.7 - 184.51 - 218.2 - 233.16 - - 1.13 - 1.13 - 1.13 - 5.5 - 15.86 - 5.79 - 4000 - \ No newline at end of file diff --git a/resource-overlay/berlin/Frameworks/Android.bp b/resource-overlay/dubai/Frameworks/Android.bp similarity index 69% rename from resource-overlay/berlin/Frameworks/Android.bp rename to resource-overlay/dubai/Frameworks/Android.bp index 95839da..2c2019a 100644 --- a/resource-overlay/berlin/Frameworks/Android.bp +++ b/resource-overlay/dubai/Frameworks/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "FrameworksResBerlin", + name: "FrameworksResDubai", sdk_version: "current", vendor: true } diff --git a/resource-overlay/berlin/Frameworks/AndroidManifest.xml b/resource-overlay/dubai/Frameworks/AndroidManifest.xml similarity index 89% rename from resource-overlay/berlin/Frameworks/AndroidManifest.xml rename to resource-overlay/dubai/Frameworks/AndroidManifest.xml index 0ad488e..344a3bc 100644 --- a/resource-overlay/berlin/Frameworks/AndroidManifest.xml +++ b/resource-overlay/dubai/Frameworks/AndroidManifest.xml @@ -4,6 +4,6 @@ SPDX-License-Identifier: Apache-2.0 --> + package="android.overlay.dubai"> diff --git a/resource-overlay/berlin/Frameworks/res/values-land/dimens.xml b/resource-overlay/dubai/Frameworks/res/values-land/dimens.xml similarity index 85% rename from resource-overlay/berlin/Frameworks/res/values-land/dimens.xml rename to resource-overlay/dubai/Frameworks/res/values-land/dimens.xml index f3a471a..8b2feaa 100644 --- a/resource-overlay/berlin/Frameworks/res/values-land/dimens.xml +++ b/resource-overlay/dubai/Frameworks/res/values-land/dimens.xml @@ -7,5 +7,5 @@ - 24dp + 24.0dip diff --git a/resource-overlay/berlin/Frameworks/res/values/config.xml b/resource-overlay/dubai/Frameworks/res/values/config.xml similarity index 83% rename from resource-overlay/berlin/Frameworks/res/values/config.xml rename to resource-overlay/dubai/Frameworks/res/values/config.xml index 1c6a6ce..8350c69 100644 --- a/resource-overlay/berlin/Frameworks/res/values/config.xml +++ b/resource-overlay/dubai/Frameworks/res/values/config.xml @@ -25,7 +25,6 @@ Must be overridden in platform specific overlays --> - 5 10 40 100 @@ -49,15 +48,14 @@ array. The brightness values must be non-negative and non-decreasing. This must be overridden in platform specific overlays --> - 5 - 12 - 24 - 95 - 111 - 149 - 192 - 252 - 500 + 10 + 20 + 80 + 93 + 125 + 161 + 212 + 420 0 - 4 - 7 - 13 - 51 - 59 - 82 - 102 - 138 + 8 + 12 + 48 + 56 + 78 + 99 + 122 255 @@ -86,15 +83,14 @@ This array should be equal in size to config_screenBrightnessBacklight --> 0 - 5 - 12 - 24 - 95 - 111 - 149 - 192 - 252 - 500 + 10 + 20 + 80 + 93 + 125 + 161 + 212 + 420 - 500 - 500 + 2000 + 8000 true - - - 0:2:15 - - - - true - - 4 + 10 - 2 + 10 0 - 67 + 1 + 20 + 21 0 - 67 + 10 + 20 + 30 - 0 - 30 + 40 0 - 0 - 94 + 1 + 20 + 21 + 500 + 600 0 15 - 30 - 15 + 10 + 10 @@ -263,23 +254,6 @@ during initialization when the setting is still null. --> false - - - @array/config_sfps_sensor_props_0 - - - - local:4630947043778501762 - 1080 - 705 - 150 - - - - true - - motorolaedge20pro + motorolaedge30 http://uaprof.motorola.com/phoneconfig/motov1/Profile/motov1.rdf diff --git a/resource-overlay/berlin/Frameworks/res/values/dimens.xml b/resource-overlay/dubai/Frameworks/res/values/dimens.xml similarity index 66% rename from resource-overlay/berlin/Frameworks/res/values/dimens.xml rename to resource-overlay/dubai/Frameworks/res/values/dimens.xml index c3c85b0..40f04fc 100644 --- a/resource-overlay/berlin/Frameworks/res/values/dimens.xml +++ b/resource-overlay/dubai/Frameworks/res/values/dimens.xml @@ -5,11 +5,11 @@ --> - 90px + 24.0dip - 90px + 24.0dip - 10.0px + 0.0px diff --git a/resource-overlay/dubai/Frameworks/res/xml/power_profile.xml b/resource-overlay/dubai/Frameworks/res/xml/power_profile.xml new file mode 100644 index 0000000..18f5ad4 --- /dev/null +++ b/resource-overlay/dubai/Frameworks/res/xml/power_profile.xml @@ -0,0 +1,67 @@ + + + 0.1 + 0.1 + 0.1 + 0.1 + 0.1 + 0.1 + 0.1 + 0.1 + 0.1 + 0.1 + 0.1 + 0.1 + 0.1 + 0.1 + 0.1 + + 0.2 + 0.1 + + + 0.1 + + + 1 + + + 400000 + + + 0.1 + + 0.1 + + 22.7 + + 1000 + 0 + 0 + 0 + + 0 + + .0002 + .002 + .02 + .2 + 2 + + 0 + 0 + 0 + + 0 + 0 + 0 + 0 + 0 + + 0 + + 0 + 0 + + 0 + \ No newline at end of file diff --git a/resource-overlay/berlin/SystemUI/Android.bp b/resource-overlay/dubai/SystemUI/Android.bp similarity index 70% rename from resource-overlay/berlin/SystemUI/Android.bp rename to resource-overlay/dubai/SystemUI/Android.bp index e6148e3..7181f65 100644 --- a/resource-overlay/berlin/SystemUI/Android.bp +++ b/resource-overlay/dubai/SystemUI/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "SystemUIResBerlin", + name: "SystemUIResDubai", sdk_version: "current", vendor: true } diff --git a/resource-overlay/berlin/SystemUI/AndroidManifest.xml b/resource-overlay/dubai/SystemUI/AndroidManifest.xml similarity index 86% rename from resource-overlay/berlin/SystemUI/AndroidManifest.xml rename to resource-overlay/dubai/SystemUI/AndroidManifest.xml index 784c2bf..f3d4211 100644 --- a/resource-overlay/berlin/SystemUI/AndroidManifest.xml +++ b/resource-overlay/dubai/SystemUI/AndroidManifest.xml @@ -5,6 +5,6 @@ --> + package="com.android.systemui.overlay.dubai"> diff --git a/resource-overlay/berlin/SystemUI/res/values-land/dimens.xml b/resource-overlay/dubai/SystemUI/res/values-land/dimens.xml similarity index 100% rename from resource-overlay/berlin/SystemUI/res/values-land/dimens.xml rename to resource-overlay/dubai/SystemUI/res/values-land/dimens.xml diff --git a/resource-overlay/berlin/SystemUI/res/values/dimens.xml b/resource-overlay/dubai/SystemUI/res/values/dimens.xml similarity index 64% rename from resource-overlay/berlin/SystemUI/res/values/dimens.xml rename to resource-overlay/dubai/SystemUI/res/values/dimens.xml index efc717c..38117f0 100644 --- a/resource-overlay/berlin/SystemUI/res/values/dimens.xml +++ b/resource-overlay/dubai/SystemUI/res/values/dimens.xml @@ -19,23 +19,10 @@ @dimen/status_bar_padding_start 10.0px - + 810px - - 1080px - - - 810px - 300px 482px diff --git a/resource-overlay/berlin/SystemUI/res/values/integers.xml b/resource-overlay/dubai/SystemUI/res/values/integers.xml similarity index 100% rename from resource-overlay/berlin/SystemUI/res/values/integers.xml rename to resource-overlay/dubai/SystemUI/res/values/integers.xml diff --git a/rootdir/etc/init/hw/init.mmi.overlay.rc b/rootdir/etc/init/hw/init.mmi.overlay.rc index 110ac18..eb9e3f6 100644 --- a/rootdir/etc/init/hw/init.mmi.overlay.rc +++ b/rootdir/etc/init/hw/init.mmi.overlay.rc @@ -10,20 +10,19 @@ 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/cirrus_wm_adsp.ko - insmod /vendor/lib/modules/cirrus_cs35l41.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/goodix_brl_mmi.ko insmod /vendor/lib/modules/camera.ko - insmod /vendor/lib/modules/aw8695.ko + insmod /vendor/lib/modules/aw862x.ko insmod /vendor/lib/modules/cci_intf.ko insmod /vendor/lib/modules/qpnp_adaptive_charge.ko start vendor.mmi_modules on fs - # Goodix fingerprint sensor GF3626 reuses the driver "goodix_fod_mmi.ko" - insmod /vendor/lib/modules/goodix_fod_mmi.ko + # egis fod ko + insmod /vendor/lib/modules/rbs_fps_mmi.ko on post-fs-data mkdir /mnt/vendor/persist/tof 0755 vendor_tcmd camera @@ -39,12 +38,26 @@ on post-fs-data chmod 0640 /mnt/vendor/persist/tof/offset_cal # Param updater data for various modules mkdir /data/vendor/param 0775 system system - mkdir /data/vendor/tzstorage/goodix 0770 system system + # 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 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 on early-boot - # Goodix fingerprint - chown system system /dev/goodix_fp - chmod 0664 /dev/goodix_fp + # Add for egis fingerprint + chown system system /dev/esfp0 + chmod 0664 /dev/esfp0 on boot # allow TCMD to access cci for OIS test @@ -54,8 +67,10 @@ on boot #change adsp pmic test command file access permission chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/tcmd chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_pmic_icl + chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:qcom,battery_charger/force_charging_enable chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/tcmd chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_pmic_icl + chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:qcom,battery_charger/force_charging_enable # Touch game mode control chown system system /sys/class/touchscreen/primary/rotate chmod 0660 /sys/class/touchscreen/primary/rotate @@ -65,19 +80,9 @@ on boot chmod 0660 /sys/class/touchscreen/primary/edge chown system system /sys/class/touchscreen/primary/first_filter chmod 0660 /sys/class/touchscreen/primary/first_filter - chown system system /sys/class/touchscreen/primary/sensitivity - chmod 0660 /sys/class/touchscreen/primary/sensitivity - 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 chown system system /sys/module/qpnp_adaptive_charge/parameters/upper_limit chown system system /sys/module/qpnp_adaptive_charge/parameters/lower_limit - # 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 @@ -90,4 +95,3 @@ on property:sys.boot_completed=1 on property:persist.vendor.paramfile.parse_panel=1 write /sys/devices/platform/soc/soc:qcom,dsi-display-primary/dsi_display_parse_para "5" - diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 89079b5..6390be8 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-2022 The LineageOS Project # # SPDX-License-Identifier: Apache-2.0 # set -e -export DEVICE=berlin +export DEVICE=dubai export DEVICE_COMMON=sm7325-common export VENDOR=motorola diff --git a/system.prop b/system.prop index 9f29100..0397c97 100644 --- a/system.prop +++ b/system.prop @@ -1,3 +1,3 @@ # Google -ro.opa.device_model_id=motorola-berlin +ro.opa.device_model_id=motorola-dubai ro.opa.eligible_device=true diff --git a/touch/Android.bp b/touch/Android.bp index b24be52..1c54de2 100644 --- a/touch/Android.bp +++ b/touch/Android.bp @@ -14,9 +14,9 @@ // limitations under the License. cc_binary { - name: "vendor.lineage.touch@1.0-service.berlin", - vintf_fragments: ["vendor.lineage.touch@1.0-service.berlin.xml"], - init_rc: ["vendor.lineage.touch@1.0-service.berlin.rc"], + name: "vendor.lineage.touch@1.0-service.dubai", + vintf_fragments: ["vendor.lineage.touch@1.0-service.dubai.xml"], + init_rc: ["vendor.lineage.touch@1.0-service.dubai.rc"], defaults: ["hidl_defaults"], relative_install_path: "hw", proprietary: true, diff --git a/touch/service.cpp b/touch/service.cpp index 455bc22..f488e91 100644 --- a/touch/service.cpp +++ b/touch/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "lineage.touch@1.0-service.berlin" +#define LOG_TAG "lineage.touch@1.0-service.dubai" #include #include diff --git a/touch/vendor.lineage.touch@1.0-service.berlin.rc b/touch/vendor.lineage.touch@1.0-service.dubai.rc similarity index 90% rename from touch/vendor.lineage.touch@1.0-service.berlin.rc rename to touch/vendor.lineage.touch@1.0-service.dubai.rc index cd4325c..12dc28a 100644 --- a/touch/vendor.lineage.touch@1.0-service.berlin.rc +++ b/touch/vendor.lineage.touch@1.0-service.dubai.rc @@ -1,4 +1,4 @@ -service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.berlin +service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.dubai interface vendor.lineage.touch@1.0::IHighTouchPollingRate default class hal user system diff --git a/touch/vendor.lineage.touch@1.0-service.berlin.xml b/touch/vendor.lineage.touch@1.0-service.dubai.xml similarity index 100% rename from touch/vendor.lineage.touch@1.0-service.berlin.xml rename to touch/vendor.lineage.touch@1.0-service.dubai.xml