Skip to content

Commit 3e22a7e

Browse files
committed
Fix 4: Enable Both slot Flash options
1 parent 6efcfb2 commit 3e22a7e

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

app/src/main/assets/flash_ak3.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ TMP=$F/tmp;
1313

1414
$F/busybox rm -rf $TMP 2>/dev/null;
1515
$F/busybox mkdir -p $TMP;
16-
$F/busybox sed -i "/export ZIPFILE=\"\$3\";/a export SLOT=\"\$4\";" $F/update-binary;
16+
$F/busybox sed -i "/export ZIPFILE=\"\$3\";/a export STATE=\"\$4\";\nexport SLOT=\"\$5\";" $F/update-binary;
1717
$F/busybox sed -i 's/\[ -e \/dev\/block\/$byname\/system \] || slot=\$(find_slot);/[ -e \/dev\/block\/$byname\/system ] || slot=$SLOT;/' $F/update-binary;
18+
$F/busybox sed -i '/setup_env;/i sed -i "/is_slot_device=auto/i SLOT_SELECT=$4" anykernel.sh' $F/update-binary;
19+
$F/busybox sed -i '/setup_env;/i sed -i '\''s/is_slot_device=auto/is_slot_device=1/'\'' anykernel.sh' $F/update-binary;
1820

1921
# update-binary <RECOVERY_API_VERSION> <OUTFD> <ZIPFILE>
20-
AKHOME=$TMP/anykernel $F/busybox ash $F/update-binary 3 1 "$Z" "$S";
22+
AKHOME=$TMP/anykernel $F/busybox ash $F/update-binary 3 1 "$Z" "$S" "$P";
2123
RC=$?;
2224

2325
$F/busybox rm -rf $TMP;

app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/slot/SlotViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,8 @@ class SlotViewModel(
507507
_wasFlashSuccess.value = false
508508
val files = File(context.filesDir.canonicalPath)
509509
val flashScript = File(files, "flash_ak3.sh")
510-
val result = Shell.Builder.create().setFlags(Shell.FLAG_MOUNT_MASTER or Shell.FLAG_REDIRECT_STDERR).build().newJob().add("F=$files Z=\"$zip\" S=\"slotSuffix\" /system/bin/sh $flashScript").to(flashOutput).exec()
510+
val slot_inactive_state = isActive ? "active" : "inactive"
511+
val result = Shell.Builder.create().setFlags(Shell.FLAG_MOUNT_MASTER or Shell.FLAG_REDIRECT_STDERR).build().newJob().add("F=$files Z=\"$zip\" S=\"slot_inactive_state\" P=\"slot_suffix\" /system/bin/sh $flashScript").to(flashOutput).exec()
511512
if (result.isSuccess) {
512513
log(context, "Kernel flashed successfully")
513514
_wasFlashSuccess.value = true

0 commit comments

Comments
 (0)