6 years agoMerge cherrypicks of [3156476, 3155698, 3156194, 3156639, 3156018, 3156477, 3156098... d-oreo-mr1-release oreo-mr1-release android-8.1.0_r1 android-8.1.0_r10 android-8.1.0_r11 android-8.1.0_r12 android-8.1.0_r15 android-8.1.0_r16 android-8.1.0_r3 android-8.1.0_r4 android-8.1.0_r5 android-8.1.0_r6 android-cts-8.1_r1 android-cts-8.1_r2 android-cts-8.1_r3 android-vts-8.1_r3
Merge cherrypicks of [3156476, 3155698, 3156194, 3156639, 3156018, 3156477, 3156098, 3156099, 3156100, 3156101, 3156102, 3158393, 3155699, 3155700, 3156195, 3156196, 3156019, 3156020, 3158394] into oc-mr1-release
Change-Id: I2a293bf3975f633db807bb800e1707f73e8d74b9
Change-Id: I2a293bf3975f633db807bb800e1707f73e8d74b9
update_verifier: Fix the wrong computation with group_range_count.
'group_range_count' doesn't properly consider the pair-wise range
structure. It may split the ranges into wrong pairs if it evaluates to
an odd number.
For example, for an input range string of "6,0,2,10,12,20,22" with 4
threads, group_range_count becomes 1. It would then try to verify (0,2),
(2,10), (10,12) and (12,20). Note that (2,10) and (12,20) are not valid
ranges to be verified, and with (20,22) uncovered.
Bug: 68343761
Test: Trigger update_verifier verification. Check the number of verified
blocks against the one in care_map.txt.
Change-Id: I7c5769325d9866be06c45e7dbcc0c8ea266de714
(cherry picked from commit 62caeb5f48c9d7b1a8ed97c4a021195b8499b804)
(cherry picked from commit 559a6d1d2ae2e5145641e1eb16e2c015d756d8c9)
'group_range_count' doesn't properly consider the pair-wise range
structure. It may split the ranges into wrong pairs if it evaluates to
an odd number.
For example, for an input range string of "6,0,2,10,12,20,22" with 4
threads, group_range_count becomes 1. It would then try to verify (0,2),
(2,10), (10,12) and (12,20). Note that (2,10) and (12,20) are not valid
ranges to be verified, and with (20,22) uncovered.
Bug: 68343761
Test: Trigger update_verifier verification. Check the number of verified
blocks against the one in care_map.txt.
Change-Id: I7c5769325d9866be06c45e7dbcc0c8ea266de714
(cherry picked from commit 62caeb5f48c9d7b1a8ed97c4a021195b8499b804)
(cherry picked from commit 559a6d1d2ae2e5145641e1eb16e2c015d756d8c9)
release-request-1f2fcfef-9736-44dc-8628-3ba96dac60db-for-git_oc-mr1-release-4343541 snap-temp-L73700000103533431
Change-Id: I53b93674a347f24620ce431ac12ac09230486e32
Change-Id: I53b93674a347f24620ce431ac12ac09230486e32
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ia05d14ff5b7f6b283f46566c88a4edc4a89d5576
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ia05d14ff5b7f6b283f46566c88a4edc4a89d5576
release-request-946c768b-83eb-4b7b-83e7-5737856fa8ec-for-git_oc-mr1-release-4326576 snap-temp-L80300000101054689
Change-Id: Ie2b658ebaabe2fdfb39b9443cd1d1b544a573faa
Change-Id: Ie2b658ebaabe2fdfb39b9443cd1d1b544a573faa
ui: Manage menu_ with std::vector.
Prior to this CL, menu_ is allocated with a fixed length of text_rows_.
However, because we support scrollable menu in wear_ui, there might be
more menu entries than text_rows_, which would lead to out-of-bounds
array access. This CL addresses the issue by switching to std::vector.
Bug: 65416558
Test: Run 'View recovery logs' on angler.
Test: Set large margin height that leaves text_rows less than 21. Then
run 'View recovery logs' with 21 menu entries.
Change-Id: I5d4e3a0a097039e1104eda7d494c6269053dc894
(cherry picked from commit e15d7a5104978cd8399501636aec0df9c1a4823c)
Prior to this CL, menu_ is allocated with a fixed length of text_rows_.
However, because we support scrollable menu in wear_ui, there might be
more menu entries than text_rows_, which would lead to out-of-bounds
array access. This CL addresses the issue by switching to std::vector.
Bug: 65416558
Test: Run 'View recovery logs' on angler.
Test: Set large margin height that leaves text_rows less than 21. Then
run 'View recovery logs' with 21 menu entries.
Change-Id: I5d4e3a0a097039e1104eda7d494c6269053dc894
(cherry picked from commit e15d7a5104978cd8399501636aec0df9c1a4823c)
release-request-81b48854-d0e0-49af-bcf2-857273cbb8dc-for-git_oc-mr1-release-4306444 snap-temp-L17300000097872583
Change-Id: I34720566a178fe123dbbd024b25396ddc80bec8c
Change-Id: I34720566a178fe123dbbd024b25396ddc80bec8c
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ife1e0455a5433bc0cb0e15b0aabf2beef1ba8827
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ife1e0455a5433bc0cb0e15b0aabf2beef1ba8827
release-request-cff6d9b6-a564-4d17-99cb-c2d0bb282758-for-git_oc-mr1-release-4293817 snap-temp-L12800000095933585
Change-Id: I2c1af830f9b14fc851f8a170e6bd290d0067142a
Change-Id: I2c1af830f9b14fc851f8a170e6bd290d0067142a
Merge changes from topic "bug-64307776" into oc-mr1-dev
* changes:
wear_ui: Expose menu_unusable_rows via Makefile var.
Allow customizing WearRecoveryUI via Makefile variables.
* changes:
wear_ui: Expose menu_unusable_rows via Makefile var.
Allow customizing WearRecoveryUI via Makefile variables.
release-request-edd71ba9-6f93-47be-957d-774c9d43a2dc-for-git_oc-mr1-release-4281935 snap-temp-L68100000094184972
Change-Id: If1a171a633ee60692c15ca81d99737148401521f
Change-Id: If1a171a633ee60692c15ca81d99737148401521f
screen_ui: Fix a case that may truncate the last char.
ScreenRecoveryUI::DrawWrappedTextLines() should be called with
kMarginWidth only. Because it's using a line limit of text_cols_,
which is unaware of kMenuIdent.
Bug: 64293520
Test: No missing char with long header text.
Change-Id: Ib4d08de2c56473a483ff9964eb6cec31f8a74c9a
(cherry picked from commit 13aa4a902ba2fa304fc9fe826f797a4e0e2182b7)
ScreenRecoveryUI::DrawWrappedTextLines() should be called with
kMarginWidth only. Because it's using a line limit of text_cols_,
which is unaware of kMenuIdent.
Bug: 64293520
Test: No missing char with long header text.
Change-Id: Ib4d08de2c56473a483ff9964eb6cec31f8a74c9a
(cherry picked from commit 13aa4a902ba2fa304fc9fe826f797a4e0e2182b7)
screen_ui: Word-wrap menu headers.
This CL adds ScreenRecoveryUI::DrawWrappedTextLines() to better handle
long menu header texts. It does a word wrap at spaces, if available.
This avoids fixed-length menu headers being truncated on small screens.
Bug: 64293520
Test: On bullhead, boot into recovery with --prompt_and_wipe_data, and
check the prompt texts.
Change-Id: Ia22746583516dd230567a267584aca558429395e
(cherry picked from commit 2bbc6d642d1fbfb007905d95b629fe5f833b2a1b)
This CL adds ScreenRecoveryUI::DrawWrappedTextLines() to better handle
long menu header texts. It does a word wrap at spaces, if available.
This avoids fixed-length menu headers being truncated on small screens.
Bug: 64293520
Test: On bullhead, boot into recovery with --prompt_and_wipe_data, and
check the prompt texts.
Change-Id: Ia22746583516dd230567a267584aca558429395e
(cherry picked from commit 2bbc6d642d1fbfb007905d95b629fe5f833b2a1b)
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I7e9049129d9a886cac53a1f6438d9c733fb3d3d8
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I7e9049129d9a886cac53a1f6438d9c733fb3d3d8
wear_ui: Expose menu_unusable_rows via Makefile var.
This variable is useful on small screens (e.g. on watches) to handle
long menus. We should have better way to handle this value smartly.
Prior to that, expose the value to be overridable by using the generic
wearable UI module (librecovery_ui_wear).
Bug: 64307776
Test: Define the variable, build and boot into recovery image and check
the UI menu.
Change-Id: I5d7a6baa8bb4cc852bfcc2a7b3cc9686c1c8817e
(cherry picked from commit eea3af3f911d36ac1a82a9fb95d24912cc07e3b1)
This variable is useful on small screens (e.g. on watches) to handle
long menus. We should have better way to handle this value smartly.
Prior to that, expose the value to be overridable by using the generic
wearable UI module (librecovery_ui_wear).
Bug: 64307776
Test: Define the variable, build and boot into recovery image and check
the UI menu.
Change-Id: I5d7a6baa8bb4cc852bfcc2a7b3cc9686c1c8817e
(cherry picked from commit eea3af3f911d36ac1a82a9fb95d24912cc07e3b1)
Allow customizing WearRecoveryUI via Makefile variables.
With the following Makefile variables, we can reduce the work of writing
(copy/pasting) device-specific WearRecoveryUI classes.
The list of Makefile variables (the ones useful for Wear devices):
- TARGET_RECOVERY_UI_MARGIN_HEIGHT (default: 0)
- TARGET_RECOVERY_UI_MARGIN_WIDTH (default: 0)
Specify the margin space that we don't want to display texts. They
replace the former outer_width and outer_height.
- TARGET_RECOVERY_UI_TOUCH_LOW_THRESHOLD (default: 50)
- TARGET_RECOVERY_UI_TOUCH_HIGH_THRESHOLD (default: 90)
Specify the sensitivity of recognizing a swipe. Devices give absolute
positions, so for some devices we need to adjust the thresholds.
- TARGET_RECOVERY_UI_PROGRESS_BAR_BASELINE
Specify the progress bar vertical position, which should be adjusted
to the actual height of a device. It replaces the former
progress_bar_y.
- TARGET_RECOVERY_UI_ANIMATION_FPS (default: 30)
Specify the animation FPS if using device-specific animation images.
It replaces the former animation_fps.
Devices can specify "TARGET_RECOVERY_UI_LIB := librecovery_ui_wear",
with optionally defined Makefile vars above, in BoardConfig.mk to
customize their WearRecoveryUI.
Also remove the obsolete wear_touch.{cpp,h}, which has been merged into
ui.cpp in commit 5f8dd9951d986b65d98d6a9ea38003427e9e46df.
Bug: 64307776
Test: Change the device BoardConfig.mk and test recovery image.
Change-Id: Id0fb2d4e3977ab5ddd31e71f9535470cab70e41b
(cherry picked from commit 0470ceea381775b09eee931858c3320be88cc637)
With the following Makefile variables, we can reduce the work of writing
(copy/pasting) device-specific WearRecoveryUI classes.
The list of Makefile variables (the ones useful for Wear devices):
- TARGET_RECOVERY_UI_MARGIN_HEIGHT (default: 0)
- TARGET_RECOVERY_UI_MARGIN_WIDTH (default: 0)
Specify the margin space that we don't want to display texts. They
replace the former outer_width and outer_height.
- TARGET_RECOVERY_UI_TOUCH_LOW_THRESHOLD (default: 50)
- TARGET_RECOVERY_UI_TOUCH_HIGH_THRESHOLD (default: 90)
Specify the sensitivity of recognizing a swipe. Devices give absolute
positions, so for some devices we need to adjust the thresholds.
- TARGET_RECOVERY_UI_PROGRESS_BAR_BASELINE
Specify the progress bar vertical position, which should be adjusted
to the actual height of a device. It replaces the former
progress_bar_y.
- TARGET_RECOVERY_UI_ANIMATION_FPS (default: 30)
Specify the animation FPS if using device-specific animation images.
It replaces the former animation_fps.
Devices can specify "TARGET_RECOVERY_UI_LIB := librecovery_ui_wear",
with optionally defined Makefile vars above, in BoardConfig.mk to
customize their WearRecoveryUI.
Also remove the obsolete wear_touch.{cpp,h}, which has been merged into
ui.cpp in commit 5f8dd9951d986b65d98d6a9ea38003427e9e46df.
Bug: 64307776
Test: Change the device BoardConfig.mk and test recovery image.
Change-Id: Id0fb2d4e3977ab5ddd31e71f9535470cab70e41b
(cherry picked from commit 0470ceea381775b09eee931858c3320be88cc637)
release-request-68cc9b2a-98ae-4fbf-8b56-3e535855f399-for-git_oc-mr1-release-4269864 snap-temp-L25700000092502312
Change-Id: Id98067953ca0ac14a01276b2387aeaa6a7dfdef8
Change-Id: Id98067953ca0ac14a01276b2387aeaa6a7dfdef8
update_verifier: Support androidboot.veritymode being empty or 'disabled'.
am: 3222dc0d76
Change-Id: I20dc5fce9e5adf002acf0e918d843c681286a8fc
am: 3222dc0d76
Change-Id: I20dc5fce9e5adf002acf0e918d843c681286a8fc
release-request-7f84484c-eec6-4577-8d5a-55079be4f3c5-for-git_oc-mr1-release-4262309 snap-temp-L02100000091441105
Change-Id: I1acbef57e3d5e8dbe11e770522894543f5d06b08
Change-Id: I1acbef57e3d5e8dbe11e770522894543f5d06b08
Merge "tests: Add the missing dependency on libhidlbase." into oc-mr1-dev
tests: Add the missing dependency on libhidlbase.
It fails to build recovery_component_test with the following errors:
out/soong/.intermediates/hardware/interfaces/boot/1.0/android.hardware.boot@1.0_genc++_headers/gen/android/hardware/boot/1.0/types.h:14:
error: undefined reference to 'android::hardware::hidl_string::hidl_string(android::hardware::hidl_string const&)'
out/soong/.intermediates/hardware/interfaces/boot/1.0/android.hardware.boot@1.0_genc++_headers/gen/android/hardware/boot/1.0/types.h:14:
error: undefined reference to 'android::hardware::hidl_string::operator=(android::hardware::hidl_string
const&)'
out/soong/.intermediates/hardware/interfaces/boot/1.0/android.hardware.boot@1.0_genc++_headers/gen/android/hardware/boot/1.0/types.h:14:
error: undefined reference to 'android::hardware::hidl_string::~hidl_string()'
libupdate_verifier includes <android/hardware/boot/1.0/IBootControl.h>,
which includes the 'types.h' above. In 'types.h', it defines struct
CommandResult that's using android::hardware::hidl_string.
Since libhidlbase doesn't have a static library target, remove
'LOCAL_FORCE_STATIC_EXECUTABLE := true', which isn't required for
running tests.
Test: mmma -j bootable/recovery
Bug: 64538692
Change-Id: Iaa7c08adc241128d787274fcaea9b363e7ff93f4
It fails to build recovery_component_test with the following errors:
out/soong/.intermediates/hardware/interfaces/boot/1.0/android.hardware.boot@1.0_genc++_headers/gen/android/hardware/boot/1.0/types.h:14:
error: undefined reference to 'android::hardware::hidl_string::hidl_string(android::hardware::hidl_string const&)'
out/soong/.intermediates/hardware/interfaces/boot/1.0/android.hardware.boot@1.0_genc++_headers/gen/android/hardware/boot/1.0/types.h:14:
error: undefined reference to 'android::hardware::hidl_string::operator=(android::hardware::hidl_string
const&)'
out/soong/.intermediates/hardware/interfaces/boot/1.0/android.hardware.boot@1.0_genc++_headers/gen/android/hardware/boot/1.0/types.h:14:
error: undefined reference to 'android::hardware::hidl_string::~hidl_string()'
libupdate_verifier includes <android/hardware/boot/1.0/IBootControl.h>,
which includes the 'types.h' above. In 'types.h', it defines struct
CommandResult that's using android::hardware::hidl_string.
Since libhidlbase doesn't have a static library target, remove
'LOCAL_FORCE_STATIC_EXECUTABLE := true', which isn't required for
running tests.
Test: mmma -j bootable/recovery
Bug: 64538692
Change-Id: Iaa7c08adc241128d787274fcaea9b363e7ff93f4
update_verifier: verify blocks in parallel
This CL is to change update_verifier to verify blocks in parallel to
maximize storage bandwidth, it also preallocate the buffer to avoid
vector allocation within reading loop.
Test:
care_map.txt:
system
16,0,517,556,32770,33084,98306,98620,163842,164156,229378,229692,294914,295228,483544,524288,524296
vendor
8,0,119,135,32770,32831,96150,98304,98306
With CL:
init: Service 'update_verifier_nonencrypted' (pid 711) exited with status 0 waiting took 2.978424 seconds
Without CL:
init: Service 'update_verifier_nonencrypted' (pid 695) exited with status 0 waiting took 4.466320 seconds
Bug: 63686531
Test: reboot with manual insert care_map.txt
Change-Id: Idf791865f15f6ff6cad89bf7ff230ee46c6adccc
This CL is to change update_verifier to verify blocks in parallel to
maximize storage bandwidth, it also preallocate the buffer to avoid
vector allocation within reading loop.
Test:
care_map.txt:
system
16,0,517,556,32770,33084,98306,98620,163842,164156,229378,229692,294914,295228,483544,524288,524296
vendor
8,0,119,135,32770,32831,96150,98304,98306
With CL:
init: Service 'update_verifier_nonencrypted' (pid 711) exited with status 0 waiting took 2.978424 seconds
Without CL:
init: Service 'update_verifier_nonencrypted' (pid 695) exited with status 0 waiting took 4.466320 seconds
Bug: 63686531
Test: reboot with manual insert care_map.txt
Change-Id: Idf791865f15f6ff6cad89bf7ff230ee46c6adccc
update_verifier: Support androidboot.veritymode being empty or 'disabled'.
Bootloaders using libavb will set androidboot.veritymode=disabled if
the "disable dm-verity" flag has been set. Additionally if the
"disable verification" flag is set androidboot.veritymode will not be
set at all. Handle both cases.
Without this fix we'll end up in a bootloop.
Test: Manually tested on a device using AVB.
(cherry-picked from commit 1a0929cc8aac532dba00b3c98cea22715719a421)
Bug: 64404283
Change-Id: I3adf93f8dfd528fe9b869a63afa775f5730a3f69
Bootloaders using libavb will set androidboot.veritymode=disabled if
the "disable dm-verity" flag has been set. Additionally if the
"disable verification" flag is set androidboot.veritymode will not be
set at all. Handle both cases.
Without this fix we'll end up in a bootloop.
Test: Manually tested on a device using AVB.
(cherry-picked from commit 1a0929cc8aac532dba00b3c98cea22715719a421)
Bug: 64404283
Change-Id: I3adf93f8dfd528fe9b869a63afa775f5730a3f69
release-request-d642586e-3e25-49f4-8b4c-acad0e3f63d8-for-git_oc-mr1-release-4249777 snap-temp-L81500000089724408
Change-Id: I6a93d96f305ef42af2d26578b72ed9e508583289
Change-Id: I6a93d96f305ef42af2d26578b72ed9e508583289
Import translations. DO NOT MERGE
Change-Id: Ia215c30c6912ffa1e3270543f6ff4fc27f4260e4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Change-Id: Ia215c30c6912ffa1e3270543f6ff4fc27f4260e4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
ui: Check for bootreason=recovery_ui.
Some wear bootloaders are passing bootreason=recovery_ui when booting
into recovery from fastboot, or via 'adb reboot recovery'. Allow turning
on text mode with a swipe for such a bootreason. Since we will turn on
text mode automatically for debuggable builds, this bootreason mainly
handles the case for user builds.
Note this change only applies to devices that allow touch screen inputs.
Bug: 36169090
Bug: 64307776
Test: Build and boot into user build recovery image. Toggle on text mode
with a swipe.
Change-Id: I55f19aed7b210352f8370de19935b4772cc12095
(cherry picked from commit 046aae29d9b0d2cdf24ad0567146991c3864c140)
Some wear bootloaders are passing bootreason=recovery_ui when booting
into recovery from fastboot, or via 'adb reboot recovery'. Allow turning
on text mode with a swipe for such a bootreason. Since we will turn on
text mode automatically for debuggable builds, this bootreason mainly
handles the case for user builds.
Note this change only applies to devices that allow touch screen inputs.
Bug: 36169090
Bug: 64307776
Test: Build and boot into user build recovery image. Toggle on text mode
with a swipe.
Change-Id: I55f19aed7b210352f8370de19935b4772cc12095
(cherry picked from commit 046aae29d9b0d2cdf24ad0567146991c3864c140)
ui: Move the support for touch inputs into RecoveryUI.
- Added detection for EV_ABS events in minui/events.cpp, if it's
allowed;
- Added listening and processing touch inputs in ui.cpp;
- Fixed an issue in recognizing swipe with multi-touch protocol A;
- Changed the logic in RecoveryUI::ProcessKey() to be swipe-aware. It
now allows turning on text mode with <power> + <swipe-up>.
The last change also fixed an issue on devices with protocol A: prior
to this CL, user may accidentally toggle the text mode during an OTA.
Because it was considered as a single-button device, a long tap that
sent BTN_TOUCH event would turn on text mode.
Test: Allow detecting touch inputs. Swiping (up, down, enter) works on
angler, angelfish, dorado respectively.
Bug: 36169090
Bug: 64307776
Change-Id: I4bc882b99114ce4ab414f8bdb8f4f7a525b8a8fd
(cherry picked from commit 5f8dd9951d986b65d98d6a9ea38003427e9e46df)
- Added detection for EV_ABS events in minui/events.cpp, if it's
allowed;
- Added listening and processing touch inputs in ui.cpp;
- Fixed an issue in recognizing swipe with multi-touch protocol A;
- Changed the logic in RecoveryUI::ProcessKey() to be swipe-aware. It
now allows turning on text mode with <power> + <swipe-up>.
The last change also fixed an issue on devices with protocol A: prior
to this CL, user may accidentally toggle the text mode during an OTA.
Because it was considered as a single-button device, a long tap that
sent BTN_TOUCH event would turn on text mode.
Test: Allow detecting touch inputs. Swiping (up, down, enter) works on
angler, angelfish, dorado respectively.
Bug: 36169090
Bug: 64307776
Change-Id: I4bc882b99114ce4ab414f8bdb8f4f7a525b8a8fd
(cherry picked from commit 5f8dd9951d986b65d98d6a9ea38003427e9e46df)
release-request-08461da0-a262-4ebb-8c32-784b60a151df-for-git_oc-mr1-release-4216972 snap-temp-L74000000086000437
Change-Id: I5fc9273d564fea92f473c4941bccee266feb7699
Change-Id: I5fc9273d564fea92f473c4941bccee266feb7699
recovery: handle security footer before passing size to mke2fs
am: 5e47d5161a
Change-Id: Iaf9b1b1138425101fa10946a215462ada4700433
am: 5e47d5161a
Change-Id: Iaf9b1b1138425101fa10946a215462ada4700433
recovery: handle security footer before passing size to mke2fs
mke2fs doesn't take negative size as reserved size. If footer is
specified, compute fs size to be
(max partition size - reserved footer size) / block_size
Bug: 23686092
Bug: 63968011
Merged-In: Iac4e143bd26a70cfc81eb52a399d687e19b1049c
Change-Id: Iac4e143bd26a70cfc81eb52a399d687e19b1049c
(cherry picked from commit f3ccad58ddb256150858df55a5e6fe5a906c5754)
mke2fs doesn't take negative size as reserved size. If footer is
specified, compute fs size to be
(max partition size - reserved footer size) / block_size
Bug: 23686092
Bug: 63968011
Merged-In: Iac4e143bd26a70cfc81eb52a399d687e19b1049c
Change-Id: Iac4e143bd26a70cfc81eb52a399d687e19b1049c
(cherry picked from commit f3ccad58ddb256150858df55a5e6fe5a906c5754)
recovery: Fix the flickering when turning on text mode.
When there's no command specified when booting into debuggable builds
(such as using `adb reboot recovery`), we turn on the text mode (i.e.
recovery menu) directly. This CL fixes the issue to avoid showing the
background image in a flash while turning on the text mode.
Bug: 63985334
Test: `fastboot boot $OUT/recovery.img` and it shows the recovery menu
directly without the no command image in a flash.
Change-Id: Id86bbe346ab76c8defc95e2b423e695a86774b09
(cherry picked from commit 7022f33ec8531c742f8f4701552d687233901495)
When there's no command specified when booting into debuggable builds
(such as using `adb reboot recovery`), we turn on the text mode (i.e.
recovery menu) directly. This CL fixes the issue to avoid showing the
background image in a flash while turning on the text mode.
Bug: 63985334
Test: `fastboot boot $OUT/recovery.img` and it shows the recovery menu
directly without the no command image in a flash.
Change-Id: Id86bbe346ab76c8defc95e2b423e695a86774b09
(cherry picked from commit 7022f33ec8531c742f8f4701552d687233901495)
release-request-2b6c1b3d-5e73-4d4a-9a8d-92acb8a1483b-for-git_oc-mr1-release-4212424 snap-temp-L13800000085536241
Change-Id: I9a6e4dc2bb8359230d4ce1e9e12eae9a8878bb2f
Change-Id: I9a6e4dc2bb8359230d4ce1e9e12eae9a8878bb2f
tests: Add a test to cover legacy care_map.txt handling.
This is to cover the code added by commit
5a1dee01df3af346729b5791606b72d59b8e9815, where an O update_verifier
should not reject N care_map.txt.
Bug: 63544345
Test: recovery_component_test passes on marlin.
Change-Id: Ia944e16cba3cc635098b3ffd92842d725b570fec
(cherry picked from commit c319613e06f996aed32da3a1c3e93bf9b04ffa95)
This is to cover the code added by commit
5a1dee01df3af346729b5791606b72d59b8e9815, where an O update_verifier
should not reject N care_map.txt.
Bug: 63544345
Test: recovery_component_test passes on marlin.
Change-Id: Ia944e16cba3cc635098b3ffd92842d725b570fec
(cherry picked from commit c319613e06f996aed32da3a1c3e93bf9b04ffa95)
Merge "update_verifier: Handle legacy care_map.txt gracefully." into oc-mr1-dev
Merge "Fix a case when brotli writer fails to write last few blocks of data" into oc-mr1-dev
update_verifier: Handle legacy care_map.txt gracefully.
update_verifier should be backward compatible to not reject legacy
care_map.txt from old releases, which could otherwise fail to boot into
the new release.
For example, we've changed the care_map format between N and O. An O
update_verifier would fail to work with an N care_map.txt - a) we have
switched update_verifier to read from device mapper in O; b) the last
few blocks that contain metadata can't be read via device mapper. This
could be a result of sideloading an O OTA while the device having a
pending N update.
Bug: 63544345
Test: As follows on sailfish:
1. Flash the device with this CL;
2. Put a copy of N care_map.txt at /data/ota_package/. Restore the
permissions properly ('cache' group);
3. `adb reboot bootloader`;
4. `fastboot set_active <current_slot>`
5. Device boots up into home screen, with a warning in logcat that says
it has skipped legacy care_map.txt.
Change-Id: I6acc88c9e655a9245e6531f176fef7953953935f
(cherry picked from commit 5a1dee01df3af346729b5791606b72d59b8e9815)
update_verifier should be backward compatible to not reject legacy
care_map.txt from old releases, which could otherwise fail to boot into
the new release.
For example, we've changed the care_map format between N and O. An O
update_verifier would fail to work with an N care_map.txt - a) we have
switched update_verifier to read from device mapper in O; b) the last
few blocks that contain metadata can't be read via device mapper. This
could be a result of sideloading an O OTA while the device having a
pending N update.
Bug: 63544345
Test: As follows on sailfish:
1. Flash the device with this CL;
2. Put a copy of N care_map.txt at /data/ota_package/. Restore the
permissions properly ('cache' group);
3. `adb reboot bootloader`;
4. `fastboot set_active <current_slot>`
5. Device boots up into home screen, with a warning in logcat that says
it has skipped legacy care_map.txt.
Change-Id: I6acc88c9e655a9245e6531f176fef7953953935f
(cherry picked from commit 5a1dee01df3af346729b5791606b72d59b8e9815)
release-request-e64ca0c4-2b43-4758-b238-0b8c6fabc365-for-git_oc-mr1-release-4207446 snap-temp-L19600000085022555
Change-Id: I7579fd758d239dc485d7a61f3cf24381b408bb3a
Change-Id: I7579fd758d239dc485d7a61f3cf24381b408bb3a
Avoid crashing recovery with unwritable /cache.
When /cache is unwritable, recovery hits a crash loop. Because it
passes nullptr to fileno(3) when writing back the locale file. This
prevents user from recovering a device - it cannot boot far enough to
recovery menu which allows wiping /cache.
Bug: 63927337
Test: Corrupt /cache and boot into recovery on bullhead:
1. m -j recoveryimage
2. fastboot erase cache
3. fastboot boot $OUT/recovery.img
4. recovery menu shows up.
Change-Id: I1407743f802049eb48add56a36298b665cb86139
(cherry picked from commit ec57903a7ec0bfe3c2f39dd6ee9cfc3de4ed20e6)
When /cache is unwritable, recovery hits a crash loop. Because it
passes nullptr to fileno(3) when writing back the locale file. This
prevents user from recovering a device - it cannot boot far enough to
recovery menu which allows wiping /cache.
Bug: 63927337
Test: Corrupt /cache and boot into recovery on bullhead:
1. m -j recoveryimage
2. fastboot erase cache
3. fastboot boot $OUT/recovery.img
4. recovery menu shows up.
Change-Id: I1407743f802049eb48add56a36298b665cb86139
(cherry picked from commit ec57903a7ec0bfe3c2f39dd6ee9cfc3de4ed20e6)
Fix a case when brotli writer fails to write last few blocks of data
receive_new_data may exit too early if the zip processor has sent all
the raw data. As a result, the last few 'new' commands will fail even
though the brotli decoder has more output in its buffer.
Restruct the code so that 'NewThreadInfo' owns the decoder state solely;
and receive_brotli_new_data is responsible for the decompression.
Also reduce the test data size to 100 blocks to avoid the test timeout.
Bug: 63802629
Test: recovery_component_test. on bullhead, apply full updates with and
w/o brotli compressed entries, apply an incremental update.
Change-Id: Id429b2c2f31951897961525609fa12c3657216b7
(cherry picked from commit 6ed175d5412deeaec9691f85757e45452407b8e3)
receive_new_data may exit too early if the zip processor has sent all
the raw data. As a result, the last few 'new' commands will fail even
though the brotli decoder has more output in its buffer.
Restruct the code so that 'NewThreadInfo' owns the decoder state solely;
and receive_brotli_new_data is responsible for the decompression.
Also reduce the test data size to 100 blocks to avoid the test timeout.
Bug: 63802629
Test: recovery_component_test. on bullhead, apply full updates with and
w/o brotli compressed entries, apply an incremental update.
Change-Id: Id429b2c2f31951897961525609fa12c3657216b7
(cherry picked from commit 6ed175d5412deeaec9691f85757e45452407b8e3)
Build libminui with BOARD_VNDK_VERSION
Use libdrm_platform which is a platform variant of libdrm.
Bug: 63741047
Bug: 37342627
Test: BOARD_VNDK_VERSION=current m -j libminui
Test: ryu recovery graphics test shows various graphics
Change-Id: Ifd2c1432781a96538585cdf818aa728d628a2f5a
Merged-In: Ifd2c1432781a96538585cdf818aa728d628a2f5a
(cherry picked from commit a48c494f138ddb99320583d00120674be1e3297c)
Use libdrm_platform which is a platform variant of libdrm.
Bug: 63741047
Bug: 37342627
Test: BOARD_VNDK_VERSION=current m -j libminui
Test: ryu recovery graphics test shows various graphics
Change-Id: Ifd2c1432781a96538585cdf818aa728d628a2f5a
Merged-In: Ifd2c1432781a96538585cdf818aa728d628a2f5a
(cherry picked from commit a48c494f138ddb99320583d00120674be1e3297c)
release-request-d8901a87-7dd0-4cc8-a44e-d04982e429da-for-git_oc-mr1-release-4198291 snap-temp-L50900000084068812
Change-Id: I1f54fbfc485d7f06464d84f7cdace9442387d91c
Change-Id: I1f54fbfc485d7f06464d84f7cdace9442387d91c
Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea1797 am: 6d8827e0d3 am: 96b5bb9601
am: f2a279adb5
Change-Id: I85c1b30fe78f99a935a19ba28d02841f68216226
am: f2a279adb5
Change-Id: I85c1b30fe78f99a935a19ba28d02841f68216226
Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea1797 am: 6d8827e0d3
am: 96b5bb9601
Change-Id: I55911c112a34797d7c7098e5e325145667b46715
am: 96b5bb9601
Change-Id: I55911c112a34797d7c7098e5e325145667b46715
Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea1797
am: 6d8827e0d3
Change-Id: I0c150dc44b70353f1c4b6ef7dd65b1f601e2ec4b
am: 6d8827e0d3
Change-Id: I0c150dc44b70353f1c4b6ef7dd65b1f601e2ec4b
Merge "Fix the android-cloexec-* warnings in bootable/recovery"
am: 94a8ea1797
Change-Id: I57ae57bab58f603540654bb24df9facca9a7d625
am: 94a8ea1797
Change-Id: I57ae57bab58f603540654bb24df9facca9a7d625
Merge "Fix the android-cloexec-* warnings in bootable/recovery"
Fix the android-cloexec-* warnings in bootable/recovery
Add the O_CLOEXEC or 'e' accordingly.
Bug: 63510015
Test: recovery tests pass
Change-Id: I7094bcc6af22c9687eb535116b2ca6a59178b303
Add the O_CLOEXEC or 'e' accordingly.
Bug: 63510015
Test: recovery tests pass
Change-Id: I7094bcc6af22c9687eb535116b2ca6a59178b303
release-request-05263112-375a-4b1f-a657-a14bb2a5c5a3-for-git_oc-mr1-release-4185249 snap-temp-L63000000082739046
Change-Id: If5b820c31fd15c067850d75cdb9d9518e1e1b666
Change-Id: If5b820c31fd15c067850d75cdb9d9518e1e1b666
Merge "Remove the obsolete reference to /file_contexts."
Merge "Fix the missing char when showing recovery logs." am: 8155a8ba74 am: c61bbe158e am: 762c42d6f6
am: 1a4f9e37dd
Change-Id: I733b98ea22719db36e3bca71cc083be5df403288
am: 1a4f9e37dd
Change-Id: I733b98ea22719db36e3bca71cc083be5df403288
Merge "Fix the missing char when showing recovery logs." am: 8155a8ba74 am: c61bbe158e
am: 762c42d6f6
Change-Id: I8dd98865f38e0cc328f5a908a2c7c092d73e3a61
am: 762c42d6f6
Change-Id: I8dd98865f38e0cc328f5a908a2c7c092d73e3a61
Merge "Fix the missing char when showing recovery logs." am: 8155a8ba74
am: c61bbe158e
Change-Id: Ic38f2132b05642ff8f5e00745fc1a0ac001d9e27
am: c61bbe158e
Change-Id: Ic38f2132b05642ff8f5e00745fc1a0ac001d9e27
Merge "Fix the missing char when showing recovery logs."
am: 8155a8ba74
Change-Id: I237241a661838e914e3c3e5c7bd2ba113e6a0501
am: 8155a8ba74
Change-Id: I237241a661838e914e3c3e5c7bd2ba113e6a0501
Merge "Fix the missing char when showing recovery logs."
Remove the obsolete reference to /file_contexts.
This file no longer exists:
- /file_contexts has been split into plat_file_contexts and
nonplat_file_contexts since commit
b236eb6ca204cefcb926e19bd5682f9dcad4021d (system/sepolicy).
- It was named /file_contexts.bin prior to the split.
'-S file_contexts' is also no longer required by e2fsdroid, since commit
2fff6fb036cbbb6dedd7da3d208b312a9038a5ce (external/e2fsprogs). It will
load the file contexts via libselinux.
Test: Trigger the path by performing a data wipe for converting to FBE.
Change-Id: I179939da409e5c0415ae0ea0bf5ddb23f9e6331e
This file no longer exists:
- /file_contexts has been split into plat_file_contexts and
nonplat_file_contexts since commit
b236eb6ca204cefcb926e19bd5682f9dcad4021d (system/sepolicy).
- It was named /file_contexts.bin prior to the split.
'-S file_contexts' is also no longer required by e2fsdroid, since commit
2fff6fb036cbbb6dedd7da3d208b312a9038a5ce (external/e2fsprogs). It will
load the file contexts via libselinux.
Test: Trigger the path by performing a data wipe for converting to FBE.
Change-Id: I179939da409e5c0415ae0ea0bf5ddb23f9e6331e
Fix the missing char when showing recovery logs.
This is a regression when adding support for margin space in commit
171b4c4c.
We're losing one char when showing long log lines. Because text_ is
aware of kMarginWidth, but not the the added indent (TEXT_INDENT).
Test: 'View recovery logs' on angler, with no missing character.
Change-Id: I284d54681d603e85e69d8e9c25173b1437a704df
This is a regression when adding support for margin space in commit
171b4c4c.
We're losing one char when showing long log lines. Because text_ is
aware of kMarginWidth, but not the the added indent (TEXT_INDENT).
Test: 'View recovery logs' on angler, with no missing character.
Change-Id: I284d54681d603e85e69d8e9c25173b1437a704df
release-request-5ee66a34-3e58-4de0-ba73-1f49074ee497-for-git_oc-mr1-release-4169335 snap-temp-L20600000081126177
Change-Id: Id358b9f673d94846f67a87536ff7db9c3427d077
Change-Id: Id358b9f673d94846f67a87536ff7db9c3427d077
Merge "Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours am: 7e05669aba -s ours" into oc-dr1-dev-plus-aosp
am: c33abb73bc -s ours
Change-Id: I595fc1bbe2235ffcb5809423d94f89383ae82976
am: c33abb73bc -s ours
Change-Id: I595fc1bbe2235ffcb5809423d94f89383ae82976
Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours am: 04e1d6ebd9 -s ours
am: 1efc63d9d4 -s ours
Change-Id: Ie810f9995732ff09b79fb3ac9858059a5596dc17
am: 1efc63d9d4 -s ours
Change-Id: Ie810f9995732ff09b79fb3ac9858059a5596dc17
Merge "Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours am: 7e05669aba -s ours" into oc-dr1-dev-plus-aosp
Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours
am: 7e05669aba -s ours
Change-Id: Ib58bfa4519142c21b4f7440d0a269732172f9e16
am: 7e05669aba -s ours
Change-Id: Ib58bfa4519142c21b4f7440d0a269732172f9e16
Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours
am: 04e1d6ebd9 -s ours
Change-Id: I7a86f732572f2b03220890f096f5881e0f074b25
am: 04e1d6ebd9 -s ours
Change-Id: I7a86f732572f2b03220890f096f5881e0f074b25
Import translations. DO NOT MERGE am: 28b67f8eea -s ours
am: 9839965b25 -s ours
Change-Id: I0b93748069282ecd14fdcba5341c961913df0432
am: 9839965b25 -s ours
Change-Id: I0b93748069282ecd14fdcba5341c961913df0432
Import translations. DO NOT MERGE am: 28b67f8eea -s ours
am: 9839965b25 -s ours
Change-Id: Ib54432253ac2e1db0f9a59fbf18c1fb4ce8dfe04
am: 9839965b25 -s ours
Change-Id: Ib54432253ac2e1db0f9a59fbf18c1fb4ce8dfe04
Import translations. DO NOT MERGE
am: 28b67f8eea -s ours
Change-Id: I1f451ff10f7c09b0d960830f8985515c8bc0ab0b
am: 28b67f8eea -s ours
Change-Id: I1f451ff10f7c09b0d960830f8985515c8bc0ab0b
Merge "Add support to decompress brotli compressed new data" am: 918e6ea1b2 am: 43bdf6cad6 am: 8375ebee37
am: 9f8fd32d95
Change-Id: I6af65721fec0bb2ff47980cbe5125d4a301b4787
am: 9f8fd32d95
Change-Id: I6af65721fec0bb2ff47980cbe5125d4a301b4787
Merge "Add support to decompress brotli compressed new data" am: 918e6ea1b2 am: 43bdf6cad6
am: 8375ebee37
Change-Id: I3eea508486f48d316644b68278f42976ffd4698d
am: 8375ebee37
Change-Id: I3eea508486f48d316644b68278f42976ffd4698d
Merge "Add support to decompress brotli compressed new data" am: 918e6ea1b2
am: 43bdf6cad6
Change-Id: If938b5b33303c52ea815016c42817a62ab9d08d9
am: 43bdf6cad6
Change-Id: If938b5b33303c52ea815016c42817a62ab9d08d9
Merge "Add support to decompress brotli compressed new data"
am: 918e6ea1b2
Change-Id: I4fd9cea71716ad1574ecb4bb7f612bc8734711c5
am: 918e6ea1b2
Change-Id: I4fd9cea71716ad1574ecb4bb7f612bc8734711c5
Merge "Add support to decompress brotli compressed new data"
Import translations. DO NOT MERGE
Change-Id: If9d38fc1db0f4abc498c5229aa6d45150b0ef5e7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Change-Id: If9d38fc1db0f4abc498c5229aa6d45150b0ef5e7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Add support to decompress brotli compressed new data
Add a new writer that can decode the brotli-compressed system/vendor
new data stored in the OTA zip.
Brotli generally gives better compression rate at the cost of slightly
increased time consumption. The patch.dat is already compressed
by BZ; so there's no point to further compress it.
For the given 1.9G bullhead system image:
Size: 875M -> 787M; ~10% reduction of package size.
Time: 147s -> 153s; ~4% increase of the block_image_update execution time.
(I guess I/O takes much longer time than decompression.)
Also it takes 4 minutes to compress the system image on my local
machine, 3 more minutes than zip.
Test: recovery tests pass && apply a full OTA with brotli compressed
system/vendor.new.dat on bullhead
Change-Id: I232335ebf662a9c55579ca073ad45265700a621e
Add a new writer that can decode the brotli-compressed system/vendor
new data stored in the OTA zip.
Brotli generally gives better compression rate at the cost of slightly
increased time consumption. The patch.dat is already compressed
by BZ; so there's no point to further compress it.
For the given 1.9G bullhead system image:
Size: 875M -> 787M; ~10% reduction of package size.
Time: 147s -> 153s; ~4% increase of the block_image_update execution time.
(I guess I/O takes much longer time than decompression.)
Also it takes 4 minutes to compress the system image on my local
machine, 3 more minutes than zip.
Test: recovery tests pass && apply a full OTA with brotli compressed
system/vendor.new.dat on bullhead
Change-Id: I232335ebf662a9c55579ca073ad45265700a621e
release-request-ccd04736-6e66-4825-a227-ecd69d8b5337-for-git_oc-mr1-release-4163697 snap-temp-L79500000080559163
Change-Id: I29a0df65f76250a6ba7359be1bcf28f5798e7d77
Change-Id: I29a0df65f76250a6ba7359be1bcf28f5798e7d77
Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1f am: 233f4b0b4b
am: 79c1562dc9
Change-Id: Ice4f792e23043b595e20110d72cab292edc16041
am: 79c1562dc9
Change-Id: Ice4f792e23043b595e20110d72cab292edc16041
Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1f
am: 233f4b0b4b
Change-Id: If7e81b8e794f34d374d385eb5603353cdfec524f
am: 233f4b0b4b
Change-Id: If7e81b8e794f34d374d385eb5603353cdfec524f
6 years agoMerge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16
Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16
am: 8542502f1f
Change-Id: Iaf46b8d2abad2357975ba6ecedaeed522c20b51e
am: 8542502f1f
Change-Id: Iaf46b8d2abad2357975ba6ecedaeed522c20b51e
Merge "Fix a rare failure for imgdiff when random data equals gzip header"
am: b87a166a16
Change-Id: Ic3c7d102cc7a2b992c699add012076a4bda549c6
am: b87a166a16
Change-Id: Ic3c7d102cc7a2b992c699add012076a4bda549c6
Merge "Fix a rare failure for imgdiff when random data equals gzip header"
Restructure vr_ui am: c392888df7 -s ours
am: 1c8189c851
Change-Id: I40c240c5887fce0b766289c2629258fe40e054ba
am: 1c8189c851
Change-Id: I40c240c5887fce0b766289c2629258fe40e054ba
Introduce VR recovery ui am: edc6b52f00 -s ours
am: 6660c97f07
Change-Id: I95633e944dd3ea8706b794ef07663ee7309e822d
am: 6660c97f07
Change-Id: I95633e944dd3ea8706b794ef07663ee7309e822d
Introduce VR recovery ui am: edc6b52f00 -s ours
am: 6660c97f07
Change-Id: I115b8a1a0c218457a33b1f1031d91eeba39efad1
am: 6660c97f07
Change-Id: I115b8a1a0c218457a33b1f1031d91eeba39efad1
Introduce VR recovery ui
am: edc6b52f00 -s ours
Change-Id: I4b6b4a5c7ffc3ae29c0b35d91f19ed56048ab049
am: edc6b52f00 -s ours
Change-Id: I4b6b4a5c7ffc3ae29c0b35d91f19ed56048ab049
Restructure vr_ui
Get rid of pixel offset variables, and use makefile variables in
BoardConfigs.
Cherry picked from commit 81a8e4cab2a20fd1b1a4716563d4d2586bd1e1de
Bug: 37779982
Test: Verified vr ui has same behavior.
Change-Id: Ifbf44e27d7101aedbe3c0e6db4b8181d56efadfd
Get rid of pixel offset variables, and use makefile variables in
BoardConfigs.
Cherry picked from commit 81a8e4cab2a20fd1b1a4716563d4d2586bd1e1de
Bug: 37779982
Test: Verified vr ui has same behavior.
Change-Id: Ifbf44e27d7101aedbe3c0e6db4b8181d56efadfd
Fix a rare failure for imgdiff when random data equals gzip header
In a rare case, a random chunk will pass both the gzip header check
and the inflation process; but fail the uncompressed length check in the
footer. This leads to a imgdiff failure. So, we should treat this chunk
as 'normal' instead of 'inflated' while generating the patch.
Bug: 63334984
Test: imgdiff generates patch successfully on previous failing images.
Change-Id: Ice84f22d3653bce9756bda91e70528c0d2f264a0
In a rare case, a random chunk will pass both the gzip header check
and the inflation process; but fail the uncompressed length check in the
footer. This leads to a imgdiff failure. So, we should treat this chunk
as 'normal' instead of 'inflated' while generating the patch.
Bug: 63334984
Test: imgdiff generates patch successfully on previous failing images.
Change-Id: Ice84f22d3653bce9756bda91e70528c0d2f264a0
Introduce VR recovery ui
A version of screen ui with specific adjustments for vr device
compatibility.
Cherry picked from commit a44dba7f4e7296077f65fd571232e8a61aed9418
Bug: 37779982
Test: "adb reboot recovery" to view
Change-Id: If6b0f26c1b587f8d0176060685b5efb6c67593b1
A version of screen ui with specific adjustments for vr device
compatibility.
Cherry picked from commit a44dba7f4e7296077f65fd571232e8a61aed9418
Bug: 37779982
Test: "adb reboot recovery" to view
Change-Id: If6b0f26c1b587f8d0176060685b5efb6c67593b1
Merge "Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aosp am: 114b555807 -s ours"
Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 am: 6895d5c44d -s ours"
Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866
am: 6895d5c44d -s ours
Change-Id: I4e242646ec15b2b54c44186770a32cf7b27b356c
am: 6895d5c44d -s ours
Change-Id: I4e242646ec15b2b54c44186770a32cf7b27b356c
Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aosp
am: 114b555807 -s ours
Change-Id: I013b898521c2563d2cf9ed85ce51324c25c0004b
am: 114b555807 -s ours
Change-Id: I013b898521c2563d2cf9ed85ce51324c25c0004b
Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 am: 987c5a98a8 -s ours"
Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866
am: 987c5a98a8 -s ours
Change-Id: I67a9066b3e91c260c8140af729ea935c7537cd21
am: 987c5a98a8 -s ours
Change-Id: I67a9066b3e91c260c8140af729ea935c7537cd21
Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866
am: 987c5a98a8 -s ours
Change-Id: Ia186c727dd25fb7b5aa13914bd1ad72392870e21
am: 987c5a98a8 -s ours
Change-Id: Ia186c727dd25fb7b5aa13914bd1ad72392870e21
Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aosp
Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev
am: bee95d6866
Change-Id: Iafcdb0e0b27090349d17f130bc0bcdb45ff1b8d4
am: bee95d6866
Change-Id: Iafcdb0e0b27090349d17f130bc0bcdb45ff1b8d4
Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev
am: bee95d6866
Change-Id: I2428f35c9c8a67ba8f1de23602b4110641e63a3f
am: bee95d6866
Change-Id: I2428f35c9c8a67ba8f1de23602b4110641e63a3f
Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev
release-request-d9dc98f7-19b2-484c-b4d1-f35dc43e9c05-for-git_oc-mr1-release-4152006 snap-temp-L91700000079405440
Change-Id: Ia32c0e10ab5ce47b60553e08ab528fb8d6471771
Change-Id: Ia32c0e10ab5ce47b60553e08ab528fb8d6471771
Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c am: c24d97fafa am: 7e3b1c00c6
am: 9e62767759
Change-Id: I65581d1580fbb6bc0ee85c980f6f79aedf33d8fe
am: 9e62767759
Change-Id: I65581d1580fbb6bc0ee85c980f6f79aedf33d8fe