From 4d5510be4fbd9755966064f7d678cad3b3dadf90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=8B=E9=A1=B5?= Date: Mon, 22 Jan 2024 16:40:19 +0800 Subject: [PATCH] Prompt users to use reboot button in System Updates So the update engine can write verify info of partitions which fixes bootloop on newer Pixel devices --- .../java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt | 5 +++-- .../java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt b/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt index 170949bbf..0302c4573 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt @@ -521,9 +521,10 @@ abstract class MagiskInstallImpl protected constructor( return false } - console.add("***************************************") + console.add("*************************************************************") console.add(" Next reboot will boot to second slot!") - console.add("***************************************") + console.add(" Go back to System Updates and press Restart to complete OTA") + console.add("*************************************************************") return true } diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt index 4e4622dca..8ca0ba1d7 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt @@ -72,6 +72,7 @@ class FlashViewModel : BaseViewModel() { MagiskInstaller.Direct(outItems, logItems).exec() } Const.Value.FLASH_INACTIVE_SLOT -> { + showReboot = false MagiskInstaller.SecondSlot(outItems, logItems).exec() } Const.Value.PATCH_FILE -> {