diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-02-07 00:11:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-07 00:11:12 +0000 |
| commit | a1738915329e704ea52fc09c222bb4893e6e51df (patch) | |
| tree | 1ca57494303eb4e662c744f271807ef383ded03c /fs_mgr/fs_mgr.c | |
| parent | e6ed63e610c5e6a56b04a5168e873dfa48c73aec (diff) | |
| parent | 317b4024a2a46b8c57abfa08f2a649df13572bd3 (diff) | |
| download | system_core-a1738915329e704ea52fc09c222bb4893e6e51df.zip system_core-a1738915329e704ea52fc09c222bb4893e6e51df.tar.gz system_core-a1738915329e704ea52fc09c222bb4893e6e51df.tar.bz2 | |
am 317b4024: Revert "Make encryption configurable"
* commit '317b4024a2a46b8c57abfa08f2a649df13572bd3':
Revert "Make encryption configurable"
Diffstat (limited to 'fs_mgr/fs_mgr.c')
| -rw-r--r-- | fs_mgr/fs_mgr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index 8d788c3..8b2d439 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -488,7 +488,9 @@ int fs_mgr_mount_all(struct fstab *fstab) /* Deal with encryptability. */ if (!mret) { /* If this is encryptable, need to trigger encryption */ - if (fs_mgr_is_encryptable(&fstab->recs[attempted_idx])) { + if ( (fstab->recs[attempted_idx].fs_mgr_flags & MF_FORCECRYPT) + || (device_is_force_encrypted() + && fs_mgr_is_encryptable(&fstab->recs[attempted_idx]))) { if (umount(fstab->recs[attempted_idx].mount_point) == 0) { if (encryptable == FS_MGR_MNTALL_DEV_NOT_ENCRYPTED) { ERROR("Will try to encrypt %s %s\n", fstab->recs[attempted_idx].mount_point, |