From 3a41cf3876fd6ae4a936d1935d13ca653c8843bd Mon Sep 17 00:00:00 2001
From: Thurston Dang <thurston@google.com>
Date: Sat, 22 Jan 2022 07:45:53 +0000
Subject: [PATCH] Backport 'Start storageproxyd early' to P22

... 'And restart it after /data is mounted.'

This is Tri's change to init.gs101.rc (http://go/a-g/15447094),
applied to init.<censored>.rc.

Bug: 187105270
Test: boot device, secure storage test com.android.storage-unittest.td
Change-Id: I226181b35c59f4882e466d2b8a839d32750e93e0
---
 conf/init.gs201.rc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 78518490..fce0b756 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -753,12 +753,11 @@ on post-fs-data
     chmod 0770 /data/vendor/ss/persist
     chown system system /dev/sg1
 
-    start storageproxyd
+    restart storageproxyd
 
 service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 \
         -r /dev/sg1 -p /data/vendor/ss -t ufs
-    class main
-    disabled
+    class early_hal
     user root
 
 # Write build info to kdebuginfo