From 74eb1c9755e698452eade39cb0a4a9b026402111 Mon Sep 17 00:00:00 2001
From: Wei Wang <wvw@google.com>
Date: Mon, 18 Jun 2018 23:26:02 -0400
Subject: [PATCH] sanders: Make sure graphics HAL services started before
 mounting data

Bug: 36409349

Signed off by: Nolen Johnson <johnsonnolen@gmail.com>

Change-Id: I1df0bd7878c7d67d3695ad1644c6b928cee0e323
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
---
 rootdir/etc/init.qcom.rc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 9b70290..404b269 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -48,12 +48,20 @@ on fs
     mount_all /vendor/etc/fstab.qcom --early
     write /proc/sys/vm/swappiness 100
 
+    # Start HW service manager early
+    start hwservicemanager
+
 on late-fs
     # Start services for bootanim
-    start hwservicemanager
     start servicemanager
     start surfaceflinger
     start bootanim
+
+    # Make sure HW service manager started and start required HAL services
+    wait_for_prop hwservicemanager.ready true
+    start configstore-hal-1-0
+    start gralloc-2-0
+
     # mount RW partitions which need run fsck
     mount_all /vendor/etc/fstab.qcom --late