diff options
| author | Bowgo Tsai | 2017-03-27 19:43:24 -0500 |
|---|---|---|
| committer | android-build-merger | 2017-03-27 19:43:24 -0500 |
| commit | 9b83226871612117e808f17fd160a068b62791c7 (patch) | |
| tree | 1b4aa19d97c1b74ed25cc390650068fb07dc2b31 | |
| parent | d04ab5abfb9b7bbdf775046e320cc7b49ccc8fd3 (diff) | |
| parent | f6b7adb464c9801262856ea321298fc1c3aaabf5 (diff) | |
| download | platform-system-core-9b83226871612117e808f17fd160a068b62791c7.tar.gz platform-system-core-9b83226871612117e808f17fd160a068b62791c7.tar.xz platform-system-core-9b83226871612117e808f17fd160a068b62791c7.zip | |
Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition" am: ea057b46e0 am: 75ada5fce3
am: f6b7adb464
Change-Id: I375d5a1129253d9c08e6b57039487f094bf3dd42
| -rw-r--r-- | fs_mgr/fs_mgr_avb_ops.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr_avb_ops.cpp b/fs_mgr/fs_mgr_avb_ops.cpp index dd8c7e775..2c14c9bdf 100644 --- a/fs_mgr/fs_mgr_avb_ops.cpp +++ b/fs_mgr/fs_mgr_avb_ops.cpp | |||
| @@ -78,7 +78,7 @@ static AvbIOResult read_from_partition(AvbOps* ops ATTRIBUTE_UNUSED, const char* | |||
| 78 | // access. fs_mgr_test_access() will test a few iterations if the | 78 | // access. fs_mgr_test_access() will test a few iterations if the |
| 79 | // path doesn't exist yet. | 79 | // path doesn't exist yet. |
| 80 | if (fs_mgr_test_access(path.c_str()) < 0) { | 80 | if (fs_mgr_test_access(path.c_str()) < 0) { |
| 81 | return AVB_IO_RESULT_ERROR_IO; | 81 | return AVB_IO_RESULT_ERROR_NO_SUCH_PARTITION; |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_CLOEXEC))); | 84 | android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_CLOEXEC))); |