PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add info that flashing AB zip will flash to the inactive slot

Browse Source 
Also inform user, that a reboot is required to switch slots

Change-Id: I7d609ee3d231e5d38d9145962e979e012d9a0ac8
(cherry picked from commit 5343a3ca2afcdd895677c5c3ff16a83af372c7b7)
This commit is contained in:
Chaosmaster
2020-02-07 19:58:10 +01:00
committed by bigbiff
parent c79f86ef94
commit a6da6565a0
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/theme/common/languages/en.xml
+2
View File
@@ -722,5 +722,7 @@
<string name="unmount_sys_install">Unmount System before installing a ZIP</string>
<string name="unmount_system">Unmounting System...</string>
<string name="unmount_system_err">Failed unmounting System</string>
<string name="flash_ab_inactive">Flashing A/B zip to inactive slot: {1}</string>
<string name="flash_ab_reboot">To flash additional zips, please reboot recovery to switch to the updated slot.</string>
</resources>
</language>
twinstall.cpp
+2
View File
@@ -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")) {