diff options
| -rw-r--r-- | vm/native/dalvik_system_Zygote.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vm/native/dalvik_system_Zygote.cpp b/vm/native/dalvik_system_Zygote.cpp index 8196f2feb..609de7c8c 100644 --- a/vm/native/dalvik_system_Zygote.cpp +++ b/vm/native/dalvik_system_Zygote.cpp @@ -554,9 +554,9 @@ static pid_t forkAndSpecializeCommon(const u4* args, bool isSystemServer) err = mountExternalStorage(uid, mountExternal); if (err < 0) { ALOGE("cannot mountExternalStorage(): %s", strerror(errno)); - if (errno == ENOTCONN) { - // Missing FUSE daemon, which is expected during device - // encryption; let Zygote continue without external storage. + if (errno == ENOTCONN || errno == EROFS) { + // Missing FUSE daemon, which is expected when booting encrypted + // devices; let Zygote continue without external storage. } else { dvmAbort(); } |