From a6da6565a0fd42734f2c2d468c49d23fe031702f Mon Sep 17 00:00:00 2001 From: Chaosmaster Date: Fri, 7 Feb 2020 19:58:10 +0100 Subject: [PATCH] Add info that flashing AB zip will flash to the inactive slot Also inform user, that a reboot is required to switch slots Change-Id: I7d609ee3d231e5d38d9145962e979e012d9a0ac8 (cherry picked from commit 5343a3ca2afcdd895677c5c3ff16a83af372c7b7) --- gui/theme/common/languages/en.xml | 2 ++ twinstall.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml index 3769da50..ac9472ea 100755 --- a/gui/theme/common/languages/en.xml +++ b/gui/theme/common/languages/en.xml @@ -722,5 +722,7 @@ Unmount System before installing a ZIP Unmounting System... Failed unmounting System + Flashing A/B zip to inactive slot: {1} + To flash additional zips, please reboot recovery to switch to the updated slot. diff --git a/twinstall.cpp b/twinstall.cpp index 4143cf28..b550be1d 100755 --- a/twinstall.cpp +++ b/twinstall.cpp @@ -443,6 +443,7 @@ int TWinstall_zip(const char* path, int* wipe_cache) { } else { if (Zip.EntryExists(AB_OTA)) { LOGINFO("AB zip\n"); + gui_msg(Msg(msg::kHighlight, "flash_ab_inactive=Flashing A/B zip to inactive slot: {1}")(PartitionManager.Get_Active_Slot_Display()=="A"?"B":"A")); // We need this so backuptool can do its magic bool system_mount_state = PartitionManager.Is_Mounted_By_Path(PartitionManager.Get_Android_Root_Path()); bool vendor_mount_state = PartitionManager.Is_Mounted_By_Path("/vendor"); @@ -457,6 +458,7 @@ int TWinstall_zip(const char* path, int* wipe_cache) { PartitionManager.UnMount_By_Path("/vendor", true); if (!system_mount_state) PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), true); + gui_warn("flash_ab_reboot=To flash additional zips, please reboot recovery to switch to the updated slot."); } else { if (Zip.EntryExists("ui.xml")) {