commit 5b8a108ef5c9ec2a11a1b7afd4e9d4a4d8444854
author Paul Lawrence <paullawrence@google.com> Thu May 05 11:00:44 2016 -0700
committer Paul Lawrence <paullawrence@google.com> Wed May 11 07:34:47 2016 -0700
tree 26b87c64217e4cd1f727e952991aeca2a3113a2b
parent bd8c47e2d459c10910c1ce2333f2ca25c710969d

Add fileencrypted=software/ice to fstab options

Bug: 28616054
Change-Id: If9dd4a17641412607ca4e4fed7f7dbf661ff0d25

fs_mgr/include/fs_mgr.h

diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h
index 6f4580e..40cf91c 100644
--- a/fs_mgr/include/fs_mgr.h
+++ b/fs_mgr/include/fs_mgr.h
@@ -65,6 +65,7 @@
     int partnum;
     int swap_prio;
     unsigned int zram_size;
+    int file_encryption_type;
 };
 
 // Callback function for verity status
@@ -85,6 +86,10 @@
 
 #define FS_MGR_DOMNT_FAILED -1
 #define FS_MGR_DOMNT_BUSY -2
+
+#define ET_SOFTWARE 1
+#define ET_ICE      2
+
 int fs_mgr_do_mount(struct fstab *fstab, char *n_name, char *n_blk_device,
                     char *tmp_mount_point);
 int fs_mgr_do_tmpfs_mount(char *n_name);