diff options
| author | Todd Poynor <toddpoynor@google.com> | 2014-07-01 17:57:13 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2014-07-01 17:57:13 -0700 |
| commit | 22f63e393fbc87494b6d9be3ed93b8289f41b123 (patch) | |
| tree | 66f8ac489426da5aa1c52638f2dbdbb04bb61798 /fs_mgr | |
| parent | a7300274fdc5c92144471b1fe6dd19a8d18ae393 (diff) | |
| download | core-22f63e393fbc87494b6d9be3ed93b8289f41b123.tar.gz core-22f63e393fbc87494b6d9be3ed93b8289f41b123.tar.bz2 core-22f63e393fbc87494b6d9be3ed93b8289f41b123.zip | |
fs_mgr: fix crash on "noemulatedsd" in fstab
MF_FORCECRYPT claimed same flag value as existing MF_NOEMULATEDSD.
MF_FORCECRYPT also crashes if no "=" in the option.
Modify MF_NOEMULATEDSD flag value to unique, and reformat comment to keep
the definition near the other defines.
Change-Id: Iec86f40ff43eea14b791d3d19c0ae11fd4b5f784
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr_priv.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h index 7ac8db2e4..34938fad7 100644 --- a/fs_mgr/fs_mgr_priv.h +++ b/fs_mgr/fs_mgr_priv.h @@ -73,12 +73,8 @@ #define MF_ZRAMSIZE 0x100 #define MF_VERIFY 0x200 #define MF_FORCECRYPT 0x400 -/* - * There is no emulated sdcard daemon running on /data/media on this device, - * so treat the physical SD card as the only external storage device, - * a la the Nexus One. - */ -#define MF_NOEMULATEDSD 0x400 +#define MF_NOEMULATEDSD 0x800 /* no emulated sdcard daemon, sd card is the only + external storage */ #define DM_BUF_SIZE 4096 |