From 6f754fdde93be2cdae765003da7fb6575a1b9d0c Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Thu, 14 Jul 2022 21:01:02 +0800
Subject: [PATCH] init.gs201.rc: remove vendor.device.modules.ready from 'on
 init' section

1) for projects with device specific modules, this property should only
   be set while device modules been loaded.
2) also remove "wait_for_prop vendor.device.modules.ready 1" to prevent
   infinite wait
3) migrate vendor.all.modules.ready/vendor.all.devices.ready to
   init.insmod.<DEVICE>.cfg and set these proprieties while .cfg not
   exist

Bug: 238853979
Signed-off-by: Robin Peng <robinpeng@google.com>
Change-Id: Ie5a2b939191947c4fce154dde48859a28fe86329
---
 conf/init.gs201.rc | 11 -----------
 init.insmod.sh     |  2 ++
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 7557ac90..35d9cd66 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -320,10 +320,6 @@ on init
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/mem_latency/ratio_ceil 3200
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/ratio_ceil 3200
 
-# For GKI kernel, no device specific modules
-on init
-    setprop vendor.device.modules.ready 1
-
 on late-fs
     # Wait for keymaster HALs
     exec_start wait_for_keymaster
@@ -440,13 +436,6 @@ on early-boot
     # Wait for insmod_sh to finish all common modules
     wait_for_prop vendor.common.modules.ready 1
 
-    # Wait for insmod_sh to finish all device specific modules
-    wait_for_prop vendor.device.modules.ready 1
-
-    # Other services depend on the properties
-    setprop vendor.all.modules.ready 1
-    setprop vendor.all.devices.ready 1
-
     # Permission for Health Storage HAL
     chown system system /dev/sys/block/bootdevice/manual_gc
 
diff --git a/init.insmod.sh b/init.insmod.sh
index 97ae7bcb..645391af 100755
--- a/init.insmod.sh
+++ b/init.insmod.sh
@@ -51,6 +51,8 @@ else
   # to unblock early-boot trigger
   setprop vendor.common.modules.ready
   setprop vendor.device.modules.ready
+  setprop vendor.all.modules.ready
+  setprop vendor.all.devices.ready
   exit 1
 fi