commit af02f57404b28590b34fa3777a381c13e3c956eb
author Jeff Sharkey <jsharkey@android.com> Thu Aug 23 10:32:20 2012 -0700
committer Jeff Sharkey <jsharkey@android.com> Thu Aug 23 10:32:20 2012 -0700
tree de4b7105196f6f7800fed2fb0af13308a2f8b700
parent b88891a2f40a47aef0cab76dc5b696812359f8bb

One more errno for encrypted devices.

Bug: 7017585
Change-Id: I4c2cc95a5c3a44bab4a93f3a1f8907869f0ce8e6

vm/native/dalvik_system_Zygote.cpp

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