One more errno for encrypted devices.

Bug: 7017585
Change-Id: I4c2cc95a5c3a44bab4a93f3a1f8907869f0ce8e6

diff --git a/vm/native/dalvik_system_Zygote.cpp b/vm/native/dalvik_system_Zygote.cpp
index 8196f2f..609de7c 100644 (file)
--- 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();
                 }