diff options
| author | Ken Sumrall <ksumrall@android.com> | 2013-09-23 18:59:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-23 18:59:39 -0700 |
| commit | 12d71925862c9268a06c4a9bbf0904f22e1c5323 (patch) | |
| tree | 2e16c5fecbe344fd694488c51ce129cddbdcc9eb | |
| parent | 500f3ffad43d115faad38f4ed2c32a08b694f183 (diff) | |
| parent | 777a00e3d193e45d928b1a26de85ae5a238271c4 (diff) | |
| download | system_core-12d71925862c9268a06c4a9bbf0904f22e1c5323.zip system_core-12d71925862c9268a06c4a9bbf0904f22e1c5323.tar.gz system_core-12d71925862c9268a06c4a9bbf0904f22e1c5323.tar.bz2 | |
am 777a00e3: Merge "New fstab flags to support more expressive SD card permissions" into klp-dev
* commit '777a00e3d193e45d928b1a26de85ae5a238271c4':
New fstab flags to support more expressive SD card permissions
| -rw-r--r-- | fs_mgr/fs_mgr.c | 6 | ||||
| -rw-r--r-- | fs_mgr/fs_mgr_priv.h | 6 | ||||
| -rw-r--r-- | fs_mgr/include/fs_mgr.h | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index 9a84a4e..a4ef7dc 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -92,6 +92,7 @@ static struct flag_list fs_mgr_flags[] = { { "swapprio=", MF_SWAPPRIO }, { "zramsize=", MF_ZRAMSIZE }, { "verify", MF_VERIFY }, + { "noemulatedsd", MF_NOEMULATEDSD }, { "defaults", 0 }, { 0, 0 }, }; @@ -877,3 +878,8 @@ int fs_mgr_is_encryptable(struct fstab_rec *fstab) { return fstab->fs_mgr_flags & MF_CRYPT; } + +int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab) +{ + return fstab->fs_mgr_flags & MF_NOEMULATEDSD; +} diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h index f284ca6..59ffd78 100644 --- a/fs_mgr/fs_mgr_priv.h +++ b/fs_mgr/fs_mgr_priv.h @@ -72,6 +72,12 @@ #define MF_SWAPPRIO 0x80 #define MF_ZRAMSIZE 0x100 #define MF_VERIFY 0x200 +/* + * 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 DM_BUF_SIZE 4096 diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h index 384d195..0f90c32 100644 --- a/fs_mgr/include/fs_mgr.h +++ b/fs_mgr/include/fs_mgr.h @@ -62,6 +62,7 @@ struct fstab_rec *fs_mgr_get_entry_for_mount_point(struct fstab *fstab, const ch int fs_mgr_is_voldmanaged(struct fstab_rec *fstab); int fs_mgr_is_nonremovable(struct fstab_rec *fstab); int fs_mgr_is_encryptable(struct fstab_rec *fstab); +int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab); int fs_mgr_swapon_all(struct fstab *fstab); #ifdef __cplusplus } |