ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition"

Browse source 
am: ea057b46e0

Change-Id: Ib7583cd28f93e882a00dade3507ee75183674115
This commit is contained in:
Bowgo Tsai 2017-03-28 00:35:57 +00:00 • committed by android-build-merger
commit 75ada5fce3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/fs_mgr_avb_ops.cpp
View file

@ -78,7 +78,7 @@ static AvbIOResult read_from_partition(AvbOps* ops ATTRIBUTE_UNUSED, const char*
// access. fs_mgr_test_access() will test a few iterations if the // access. fs_mgr_test_access() will test a few iterations if the
// path doesn't exist yet. // path doesn't exist yet.
if (fs_mgr_test_access(path.c_str()) < 0) { if (fs_mgr_test_access(path.c_str()) < 0) {
return AVB_IO_RESULT_ERROR_IO; return AVB_IO_RESULT_ERROR_NO_SUCH_PARTITION;
} }
android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_CLOEXEC))); android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_CLOEXEC)));