Skip to content

Commit 1ca341b

Browse files
committed
minor fixes
1 parent 436e4a3 commit 1ca341b

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

openandroidinstaller/assets/configs/FP4.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ steps:
4040
content: Turn on your device. Once the device is fully booted, you need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
4141
command: adb_reboot_bootloader
4242
- type: call_button
43-
content: Once the device is in fastboot mode, flash the custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
43+
content: Once the device is in fastboot mode, boot the custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
4444
command: fastboot_boot_recovery
4545
- type: confirm_button
4646
content: >

openandroidinstaller/assets/configs/starlte.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ steps:
1616
Then press 'Confirm and run' to reboot into the bootloader. Continue once it's done.
1717
command: adb_reboot_download
1818
- type: call_button
19-
content: In this step, you need to boot a custom recovery on your device. Press 'Confirm and run' to start the process. Confirm afterwards to continue.
19+
content: In this step, you need to flash a custom recovery on your device. Press 'Confirm and run' to start the process. Confirm afterwards to continue.
2020
command: heimdall_flash_recovery
2121
- type: confirm_button
2222
content: >

openandroidinstaller/tooling.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,8 @@ def adb_twrp_install_addons(
271271
"""
272272
logger.info("Install addons with twrp.")
273273
sleep(0.5)
274+
if is_ab:
275+
adb_wait_for_recovery(bin_path=bin_path)
274276
logger.info("Sideload and install addons.")
275277
for addon in addons:
276278
# activate sideload
@@ -358,6 +360,7 @@ def fastboot_boot_recovery(
358360
bin_path: Path, recovery: str, is_ab: bool = True
359361
) -> TerminalResponse:
360362
"""Temporarily, boot custom recovery with fastboot."""
363+
# TODO: this can be unified now
361364
if is_ab:
362365
logger.info("Boot custom recovery with fastboot.")
363366
for line in run_command(
@@ -387,7 +390,7 @@ def fastboot_flash_boot(bin_path: Path, recovery: str) -> TerminalResponse:
387390
"""Temporarily, flash custom recovery with fastboot to boot partition."""
388391
logger.info("Flash custom recovery with fastboot.")
389392
for line in run_command(
390-
"fastboot flash boot", target="f{recovery}", bin_path=bin_path
393+
"fastboot flash boot", target=f"{recovery}", bin_path=bin_path
391394
):
392395
yield line
393396
if (type(line) == bool) and not line:
@@ -424,8 +427,7 @@ def heimdall_flash_recovery(bin_path: Path, recovery: str) -> TerminalResponse:
424427
for line in run_command(
425428
"heimdall flash --no-reboot --RECOVERY", target=f"{recovery}", bin_path=bin_path
426429
):
427-
boot_recovery
428-
yield line
430+
yield line
429431

430432

431433
def search_device(platform: str, bin_path: Path) -> Optional[str]:

0 commit comments

Comments
 (0)