diff options
| -rw-r--r-- | roots.cpp | 4 | ||||
| -rw-r--r-- | screen_ui.cpp | 10 | ||||
| -rw-r--r-- | updater/install.cpp | 3 |
3 files changed, 7 insertions, 10 deletions
@@ -260,8 +260,6 @@ int format_volume(const char* volume, const char* directory) { if (result == 0 && directory != nullptr) { const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", - "-S", - "/file_contexts", "-f", directory, "-a", @@ -270,7 +268,7 @@ int format_volume(const char* volume, const char* directory) { nullptr }; result = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv)); - } + } } else { /* Has to be f2fs because we checked earlier. */ if (v->key_loc != NULL && strcmp(v->key_loc, "footer") == 0 && length < 0) { LOG(ERROR) << "format_volume: crypt footer + negative length (" << length diff --git a/screen_ui.cpp b/screen_ui.cpp index d9574d869..8f792f162 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -301,15 +301,15 @@ void ScreenRecoveryUI::draw_screen_locked() { gr_color(0, 0, 0, 255); gr_clear(); - static constexpr int TEXT_INDENT = 4; - int x = TEXT_INDENT + kMarginWidth; int y = kMarginHeight; if (show_menu) { - std::string recovery_fingerprint = - android::base::GetProperty("ro.bootimage.build.fingerprint", ""); + static constexpr int kMenuIndent = 4; + int x = kMarginWidth + kMenuIndent; SetColor(INFO); y += DrawTextLine(x, y, "Android Recovery", true); + std::string recovery_fingerprint = + android::base::GetProperty("ro.bootimage.build.fingerprint", ""); for (const auto& chunk : android::base::Split(recovery_fingerprint, ":")) { y += DrawTextLine(x, y, chunk.c_str(), false); } @@ -343,7 +343,7 @@ void ScreenRecoveryUI::draw_screen_locked() { size_t count = 0; for (int ty = gr_fb_height() - kMarginHeight - char_height_; ty >= y && count < text_rows_; ty -= char_height_, ++count) { - DrawTextLine(x, ty, text_[row], false); + DrawTextLine(kMarginWidth, ty, text_[row], false); --row; if (row < 0) row = text_rows_ - 1; } diff --git a/updater/install.cpp b/updater/install.cpp index c9a3a0799..bfe91e7f9 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -322,8 +322,7 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt return StringValue(location); } - const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", "-S", - "/file_contexts", "-a", mount_point.c_str(), + const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", "-a", mount_point.c_str(), location.c_str(), nullptr }; status = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv)); if (status != 0) { |