diff options
author | android-build-team Robot | 2017-07-16 02:28:18 -0500 |
---|---|---|
committer | android-build-team Robot | 2017-07-16 02:28:18 -0500 |
commit | 3925d88c7916772d9124a4384286a17b5aedbbb6 (patch) | |
tree | 5cc47f00741220c606da8de89971a2f4533ecf8f | |
parent | dda74c41b3979e8ae43f0db2107919cc5b928485 (diff) | |
parent | f7cc0e0cfb61f704b1a70c4c43fa0697bca2c04a (diff) | |
download | platform-bootable-recovery-3925d88c7916772d9124a4384286a17b5aedbbb6.tar.gz platform-bootable-recovery-3925d88c7916772d9124a4384286a17b5aedbbb6.tar.xz platform-bootable-recovery-3925d88c7916772d9124a4384286a17b5aedbbb6.zip |
release-request-05263112-375a-4b1f-a657-a14bb2a5c5a3-for-git_oc-mr1-release-4185249 snap-temp-L63000000082739046
Change-Id: If5b820c31fd15c067850d75cdb9d9518e1e1b666
-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) { | |||
260 | if (result == 0 && directory != nullptr) { | 260 | if (result == 0 && directory != nullptr) { |
261 | const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", | 261 | const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", |
262 | "-e", | 262 | "-e", |
263 | "-S", | ||
264 | "/file_contexts", | ||
265 | "-f", | 263 | "-f", |
266 | directory, | 264 | directory, |
267 | "-a", | 265 | "-a", |
@@ -270,7 +268,7 @@ int format_volume(const char* volume, const char* directory) { | |||
270 | nullptr }; | 268 | nullptr }; |
271 | 269 | ||
272 | result = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv)); | 270 | result = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv)); |
273 | } | 271 | } |
274 | } else { /* Has to be f2fs because we checked earlier. */ | 272 | } else { /* Has to be f2fs because we checked earlier. */ |
275 | if (v->key_loc != NULL && strcmp(v->key_loc, "footer") == 0 && length < 0) { | 273 | if (v->key_loc != NULL && strcmp(v->key_loc, "footer") == 0 && length < 0) { |
276 | LOG(ERROR) << "format_volume: crypt footer + negative length (" << length | 274 | LOG(ERROR) << "format_volume: crypt footer + negative length (" << length |
diff --git a/screen_ui.cpp b/screen_ui.cpp index d9574d86..8f792f16 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp | |||
@@ -301,15 +301,15 @@ void ScreenRecoveryUI::draw_screen_locked() { | |||
301 | gr_color(0, 0, 0, 255); | 301 | gr_color(0, 0, 0, 255); |
302 | gr_clear(); | 302 | gr_clear(); |
303 | 303 | ||
304 | static constexpr int TEXT_INDENT = 4; | ||
305 | int x = TEXT_INDENT + kMarginWidth; | ||
306 | int y = kMarginHeight; | 304 | int y = kMarginHeight; |
307 | if (show_menu) { | 305 | if (show_menu) { |
308 | std::string recovery_fingerprint = | 306 | static constexpr int kMenuIndent = 4; |
309 | android::base::GetProperty("ro.bootimage.build.fingerprint", ""); | 307 | int x = kMarginWidth + kMenuIndent; |
310 | 308 | ||
311 | SetColor(INFO); | 309 | SetColor(INFO); |
312 | y += DrawTextLine(x, y, "Android Recovery", true); | 310 | y += DrawTextLine(x, y, "Android Recovery", true); |
311 | std::string recovery_fingerprint = | ||
312 | android::base::GetProperty("ro.bootimage.build.fingerprint", ""); | ||
313 | for (const auto& chunk : android::base::Split(recovery_fingerprint, ":")) { | 313 | for (const auto& chunk : android::base::Split(recovery_fingerprint, ":")) { |
314 | y += DrawTextLine(x, y, chunk.c_str(), false); | 314 | y += DrawTextLine(x, y, chunk.c_str(), false); |
315 | } | 315 | } |
@@ -343,7 +343,7 @@ void ScreenRecoveryUI::draw_screen_locked() { | |||
343 | size_t count = 0; | 343 | size_t count = 0; |
344 | for (int ty = gr_fb_height() - kMarginHeight - char_height_; ty >= y && count < text_rows_; | 344 | for (int ty = gr_fb_height() - kMarginHeight - char_height_; ty >= y && count < text_rows_; |
345 | ty -= char_height_, ++count) { | 345 | ty -= char_height_, ++count) { |
346 | DrawTextLine(x, ty, text_[row], false); | 346 | DrawTextLine(kMarginWidth, ty, text_[row], false); |
347 | --row; | 347 | --row; |
348 | if (row < 0) row = text_rows_ - 1; | 348 | if (row < 0) row = text_rows_ - 1; |
349 | } | 349 | } |
diff --git a/updater/install.cpp b/updater/install.cpp index c9a3a079..bfe91e7f 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 | |||
322 | return StringValue(location); | 322 | return StringValue(location); |
323 | } | 323 | } |
324 | 324 | ||
325 | const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", "-S", | 325 | const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", "-a", mount_point.c_str(), |
326 | "/file_contexts", "-a", mount_point.c_str(), | ||
327 | location.c_str(), nullptr }; | 326 | location.c_str(), nullptr }; |
328 | status = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv)); | 327 | status = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv)); |
329 | if (status != 0) { | 328 | if (status != 0) { |