diff options
| author | Bowgo Tsai <bowgotsai@google.com> | 2017-10-15 04:14:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-15 04:14:53 +0000 |
| commit | 609a29956b38c7eeaa047a334f5a4ca8b5f8215e (patch) | |
| tree | 5826ba863c2a9cac1af0fa9a91c331ab010a24c2 /fs_mgr/fs_mgr_verity.cpp | |
| parent | ff01e0da777842db54be765bbf5f95339634cee0 (diff) | |
| parent | 2da820c0ab87812902b1aac7f782a66060d19a76 (diff) | |
| download | system_core-609a29956b38c7eeaa047a334f5a4ca8b5f8215e.tar.gz system_core-609a29956b38c7eeaa047a334f5a4ca8b5f8215e.tar.bz2 system_core-609a29956b38c7eeaa047a334f5a4ca8b5f8215e.zip | |
Merge "fs_mgr: removing is_device_secure()" am: af54c27e1b am: 6353d514e8 am: ee042cac71
am: 2da820c0ab
Change-Id: I5f111f4e0b47dfc6a5da35cbbec2b842c6e72150
Diffstat (limited to 'fs_mgr/fs_mgr_verity.cpp')
| -rw-r--r-- | fs_mgr/fs_mgr_verity.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp index 7f8e1e213..896b60313 100644 --- a/fs_mgr/fs_mgr_verity.cpp +++ b/fs_mgr/fs_mgr_verity.cpp @@ -765,13 +765,6 @@ int fs_mgr_setup_verity(struct fstab_rec *fstab, bool wait_for_verity_dev) const std::string mount_point(basename(fstab->mount_point)); bool verified_at_boot = false; - // This is a public API and so deserves its own check to see if verity - // setup is needed at all. - if (!is_device_secure()) { - LINFO << "Verity setup skipped for " << mount_point; - return FS_MGR_SETUP_VERITY_SKIPPED; - } - if (fec_open(&f, fstab->blk_device, O_RDONLY, FEC_VERITY_DISABLE, FEC_DEFAULT_ROOTS) < 0) { PERROR << "Failed to open '" << fstab->blk_device << "'"; @@ -792,7 +785,7 @@ int fs_mgr_setup_verity(struct fstab_rec *fstab, bool wait_for_verity_dev) #ifdef ALLOW_ADBD_DISABLE_VERITY if (verity.disabled) { retval = FS_MGR_SETUP_VERITY_DISABLED; - LINFO << "Attempt to cleanly disable verity - only works in USERDEBUG"; + LINFO << "Attempt to cleanly disable verity - only works in USERDEBUG/ENG"; goto out; } #endif |