diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-08-23 10:32:20 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2012-08-23 14:19:22 -0700 |
| commit | 63118a85fe3e6d8a85c7f45373d946a0e0c99d28 (patch) | |
| tree | de4b7105196f6f7800fed2fb0af13308a2f8b700 | |
| parent | 1ff1627ff7b4d1d0bb023146ce81a2c953a3b045 (diff) | |
| download | android_dalvik-63118a85fe3e6d8a85c7f45373d946a0e0c99d28.tar.gz android_dalvik-63118a85fe3e6d8a85c7f45373d946a0e0c99d28.tar.bz2 android_dalvik-63118a85fe3e6d8a85c7f45373d946a0e0c99d28.zip | |
One more errno for encrypted devices.
Bug: 7017585
Change-Id: I4c2cc95a5c3a44bab4a93f3a1f8907869f0ce8e6
| -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(); } |