From 7fdcbdfc7bd2fc18e64824d1164ad0fc69f4c0e8 Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Fri, 13 Apr 2018 12:28:42 -0700 Subject: [PATCH] Fix FDE Need a larger tmpfs to stop crashes Need to run start-zygote after mounting the real data Test: Cherry-pick ag/3898232. System boots, can set pattern, system reboots. Wifi works at all points. Bug: 76452634 Change-Id: Id24241db940d352fd3bcdef594b5358854c6f71d --- fs_mgr/fs_mgr_priv.h | 2 +- rootdir/init.rc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h index ade0cc4cd..9011bb38e 100644 --- a/fs_mgr/fs_mgr_priv.h +++ b/fs_mgr/fs_mgr_priv.h @@ -45,7 +45,7 @@ #define PWARNING PLOG(WARNING) << FS_MGR_TAG #define PERROR PLOG(ERROR) << FS_MGR_TAG -#define CRYPTO_TMPFS_OPTIONS "size=256m,mode=0771,uid=1000,gid=1000" +#define CRYPTO_TMPFS_OPTIONS "size=512m,mode=0771,uid=1000,gid=1000" /* fstab has the following format: * diff --git a/rootdir/init.rc b/rootdir/init.rc index 391f42a3b..a6ed96231 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -689,6 +689,7 @@ on property:vold.decrypt=trigger_load_persist_props on property:vold.decrypt=trigger_post_fs_data trigger post-fs-data + trigger zygote-start on property:vold.decrypt=trigger_restart_min_framework # A/B update verifier that marks a successful boot. @@ -696,6 +697,8 @@ on property:vold.decrypt=trigger_restart_min_framework class_start main on property:vold.decrypt=trigger_restart_framework + stop surfaceflinger + start surfaceflinger # A/B update verifier that marks a successful boot. exec_start update_verifier class_start main