!1187 set up session keyring for fscrypt v1 keys

Merge pull request !1187 from linqiheng/fscrypt_fix

services/init/standard/init.c

@@ -29,6 +29,7 @@
 #include "device.h"
 #include "fd_holder_service.h"
 #include "fs_manager/fs_manager.h"
+#include "key_control.h"
 #include "init_control_fd_service.h"
 #include "init_log.h"
 #include "init_mount.h"
@@ -199,6 +200,9 @@ static void StartInitSecondStage(void)
     // It will panic if close stdio before execv("/bin/sh", NULL)
     CloseStdio();
 
+    // Set up a session keyring that all processes will have access to.
+    KeyCtrlGetKeyringId(KEY_SPEC_SESSION_KEYRING, 1);
+
 #ifndef DISABLE_INIT_TWO_STAGES
     SwitchRoot("/usr");
     // Execute init second stage

services/init/standard/init_cmds.c

@@ -453,10 +453,6 @@ static void DoInitMainUser(const struct CmdArgs *ctx)
         INIT_LOGE("DoInitMainUser: para invalid");
         return;
     }
-    if (!InitFscryptPolicy()) {
-        INIT_LOGI("DoInitMainUser:init fscrypt failed,not enable fscrypt");
-        return;
-    }
 
     char * const argv[] = {
         "/system/bin/sdc",