From eb486d4bb7747f87296de36444804e5f035fd46d Mon Sep 17 00:00:00 2001 From: Roberto Sartori Date: Thu, 29 Dec 2022 10:30:17 +0100 Subject: [PATCH] sm8350-common: Switch from time_daemon to TimeKeep * time_daemon just refuses to work properly on mata. Sony's TimeKeep, instead, does the job flawlessly, so just ditch the former in favor of the latter. Signed-off-by: Roberto Sartori Change-Id: I54f50ed3d49efc2834d478781b15e6ee428a3062 --- BoardConfigCommon.mk | 1 + common.mk | 4 ++++ proprietary-files.txt | 3 --- rootdir/etc/init.qcom.rc | 4 ---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 17ab47a..bf4b427 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -165,6 +165,7 @@ VENDOR_SECURITY_PATCH := 2025-06-05 # Sepolicy include device/lineage/sepolicy/libperfmgr/sepolicy.mk include device/qcom/sepolicy_vndr/SEPolicy.mk +include hardware/sony/timekeep/sepolicy/SEPolicy.mk SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/private SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/public diff --git a/common.mk b/common.mk index 9415078..7c10d92 100644 --- a/common.mk +++ b/common.mk @@ -434,6 +434,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ android.hardware.thermal-service.qti +# TimeKeep +PRODUCT_PACKAGES += \ + TimeKeep + # Touchscreen PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml diff --git a/proprietary-files.txt b/proprietary-files.txt index 6934bcb..81fe8e3 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -695,9 +695,6 @@ vendor/lib/libthermalclient.so vendor/lib64/libthermalclient.so # Time services -vendor/app/TimeService/TimeService.apk -vendor/bin/time_daemon -vendor/etc/init/init.time_daemon.rc vendor/lib64/libtime_genoff.so # Trusted Execution Environment connector diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 761ad84..ab4db0f 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -83,7 +83,6 @@ on boot chmod 2770 /dev/socket/qmux_radio mkdir /mnt/vendor/persist/alarm 0770 system system - mkdir /mnt/vendor/persist/time 0770 system system mkdir /mnt/vendor/persist/secnvm 0770 system system mkdir /mnt/vendor/persist/iar_db 0770 system system mkdir /mnt/vendor/spunvm 0770 system system @@ -190,9 +189,6 @@ on post-fs-data mkdir /dev/socket/wifihal 0770 wifi wifi chmod 2770 /dev/socket/wifihal - # Create /data/time folder for time-services - mkdir /data/vendor/time/ 0700 system system - mkdir /data/vendor/secure_element 0777 system system # Mark the copy complete flag to not completed