summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Sumrall2013-09-23 15:06:41 -0500
committerAndroid (Google) Code Review2013-09-23 15:06:41 -0500
commit777a00e3d193e45d928b1a26de85ae5a238271c4 (patch)
tree60ea1e33336af39b7893e7df65c580ba54f46c7d
parent0ee7d8c68b57c02d02f707d6f71c731234d56eec (diff)
parent887f2892062c64fa688fc9525ebd09cc98ca70d8 (diff)
downloadplatform-system-core-777a00e3d193e45d928b1a26de85ae5a238271c4.tar.gz
platform-system-core-777a00e3d193e45d928b1a26de85ae5a238271c4.tar.xz
platform-system-core-777a00e3d193e45d928b1a26de85ae5a238271c4.zip
Merge "New fstab flags to support more expressive SD card permissions" into klp-dev
-rw-r--r--fs_mgr/fs_mgr.c6
-rw-r--r--fs_mgr/fs_mgr_priv.h6
-rw-r--r--fs_mgr/include/fs_mgr.h1
3 files changed, 13 insertions, 0 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 82c579821..ea60cc899 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -92,6 +92,7 @@ static struct flag_list fs_mgr_flags[] = {
92 { "swapprio=", MF_SWAPPRIO }, 92 { "swapprio=", MF_SWAPPRIO },
93 { "zramsize=", MF_ZRAMSIZE }, 93 { "zramsize=", MF_ZRAMSIZE },
94 { "verify", MF_VERIFY }, 94 { "verify", MF_VERIFY },
95 { "noemulatedsd", MF_NOEMULATEDSD },
95 { "defaults", 0 }, 96 { "defaults", 0 },
96 { 0, 0 }, 97 { 0, 0 },
97}; 98};
@@ -931,3 +932,8 @@ int fs_mgr_is_encryptable(struct fstab_rec *fstab)
931{ 932{
932 return fstab->fs_mgr_flags & MF_CRYPT; 933 return fstab->fs_mgr_flags & MF_CRYPT;
933} 934}
935
936int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab)
937{
938 return fstab->fs_mgr_flags & MF_NOEMULATEDSD;
939}
diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h
index f284ca69e..59ffd785c 100644
--- a/fs_mgr/fs_mgr_priv.h
+++ b/fs_mgr/fs_mgr_priv.h
@@ -72,6 +72,12 @@
72#define MF_SWAPPRIO 0x80 72#define MF_SWAPPRIO 0x80
73#define MF_ZRAMSIZE 0x100 73#define MF_ZRAMSIZE 0x100
74#define MF_VERIFY 0x200 74#define MF_VERIFY 0x200
75/*
76 * There is no emulated sdcard daemon running on /data/media on this device,
77 * so treat the physical SD card as the only external storage device,
78 * a la the Nexus One.
79 */
80#define MF_NOEMULATEDSD 0x400
75 81
76#define DM_BUF_SIZE 4096 82#define DM_BUF_SIZE 4096
77 83
diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h
index 384d19594..0f90c32f1 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
62int fs_mgr_is_voldmanaged(struct fstab_rec *fstab); 62int fs_mgr_is_voldmanaged(struct fstab_rec *fstab);
63int fs_mgr_is_nonremovable(struct fstab_rec *fstab); 63int fs_mgr_is_nonremovable(struct fstab_rec *fstab);
64int fs_mgr_is_encryptable(struct fstab_rec *fstab); 64int fs_mgr_is_encryptable(struct fstab_rec *fstab);
65int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab);
65int fs_mgr_swapon_all(struct fstab *fstab); 66int fs_mgr_swapon_all(struct fstab *fstab);
66#ifdef __cplusplus 67#ifdef __cplusplus
67} 68}