From b3c1e7f84dcf2c0f01028254d3c978092826180d Mon Sep 17 00:00:00 2001 From: Armelle Laine Date: Fri, 2 Dec 2022 19:17:49 +0000 Subject: [PATCH 1/2] Revert "Revert "init: Delay trusty app loading until storage is ..." Revert submission 20612866-trusty-fs-ready Reason for revert: ag/20620962 Reverted Changes: I915870922:Revert "init: Delay trusty app loading until stora... Idc3589cd3:Revert "init: Delay trusty app loading until stora... Change-Id: I7e12122ff0650a166ead67c9937105595560d211 --- conf/init.tangorpro.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc index 4e5535c..8d02002 100644 --- a/conf/init.tangorpro.rc +++ b/conf/init.tangorpro.rc @@ -82,13 +82,13 @@ on post-fs-data chown system system /sys/devices/platform/odm/odm:fp_fpc1020/irq chown system system /sys/devices/platform/odm/odm:fp_fpc1020/wakeup_enable -on fs +on property:ro.vendor.trusty.storage.fs_ready=1 exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/1540.app # Permissions for hwcomposer chown system system /sys/class/backlight/panel0-backlight/cabc_mode # Castauth -on post-fs-data +on property:ro.vendor.trusty.storage.fs_ready=1 exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/cast_auth.app # Wifi From 785443fca3ad018cab061e28d0ce75be371ef647 Mon Sep 17 00:00:00 2001 From: Lucas Silva Date: Mon, 5 Dec 2022 16:56:02 -0500 Subject: [PATCH 2/2] Disable legacy dream components Bug: 260118215 Test: set settings.secure.screensaver_components to the colors screensaver using adb, and verified it doesn't show Change-Id: I2e4d4aaa2e16e48efbe6d1b3474464a4da5a12f1 --- component-overrides.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/component-overrides.xml b/component-overrides.xml index fc2529b..93ccf3e 100644 --- a/component-overrides.xml +++ b/component-overrides.xml @@ -18,4 +18,13 @@ + + + + + + + + +