From c64b94d2072723e9238a93e2f24e8e34042c2d90 Mon Sep 17 00:00:00 2001 From: Marc Bourgoin Date: Thu, 2 May 2024 22:11:40 -0600 Subject: [PATCH] Revert "rtwo: Drop MotCamera4" This reverts commit 9085bd8b9b24e6ce38f85755a58ee95c14e04184. Change-Id: Idf9115d757494faed2cbd330e4d1383be1d4e6c0 --- device.mk | 3 +++ proprietary-files.txt | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/device.mk b/device.mk index b6dd490..06ed15a 100644 --- a/device.mk +++ b/device.mk @@ -64,6 +64,9 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/usecaseKvManager_prc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usecaseKvManager_prc.xml \ $(LOCAL_PATH)/audio/usecaseKvManager_tmo.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usecaseKvManager_tmo.xml +# Dex-pre-opt exclusions +$(call add-product-dex-preopt-module-config,MotoSignatureApp,disable) + # Fingerprint PRODUCT_PACKAGES += \ android.hardware.biometrics.fingerprint@2.3-service.rtwo diff --git a/proprietary-files.txt b/proprietary-files.txt index 537e0cd..061af52 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -589,6 +589,30 @@ product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoog system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml system_ext/framework/com.android.hotwordenrollment.common.util.jar +# MotCamera4 +product/app/MotCamera3AI/MotCamera3AI.apk;PRESIGNED +product/etc/permissions/com.motorola.camera3.xml +product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml +product/etc/permissions/privapp-permissions-com.motorola.camera3.xml +product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml +product/priv-app/MotCamera4/MotCamera4.apk;PRESIGNED +system/app/MotoSignatureApp/MotoSignatureApp.apk;PRESIGNED +system/etc/permissions/com.motorola.motosignature.xml +system/etc/permissions/moto-core_services.xml +system/etc/permissions/moto-settings.xml +system/framework/com.motorola.motosignature.jar +system/framework/moto-core_services.jar +system/framework/moto-settings.jar +system_ext/bin/motsettings +system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk + +# Moto Permissions +product/etc/permissions/com.motorola.camera3.content.ai.xml:vendor/etc/permissions/com.motorola.camera3.content.ai.xml +product/etc/permissions/com.motorola.camera3.lens.xml:vendor/etc/permissions/com.motorola.camera3.lens.xml +product/etc/permissions/com.motorola.camera3.rtwo.xml:vendor/etc/permissions/com.motorola.camera3.rtwo.xml +product/etc/permissions/com.motorola.camera3.xml:vendor/etc/permissions/com.motorola.camera3.xml +product/etc/permissions/com.motorola.moto-uirefresh.xml + # NFC vendor/bin/hw/vendor.nxp.hardware.nfc@2.0-service vendor/etc/init/vendor.nxp.hardware.nfc@2.0-service.rc