TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-01-13 05:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable virtualAB check for noSecondSlot

Browse Source
This commit is contained in:
capntrips 2022-01-15 23:15:21 -06:00 committed by John Wu
parent f466c27da9
commit 053f4d481d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/topjohnwu/magisk/core/Info.kt
View File

@ -30,7 +30,6 @@ object Info {
@JvmStatic val env by lazy { loadState() } @JvmStatic val env by lazy { loadState() }
@JvmField var isSAR = false @JvmField var isSAR = false
var isAB = false var isAB = false
val isVirtualAB = getProperty("ro.virtual_ab.enabled", "false") == "true"
@JvmField val isZygiskEnabled = System.getenv("ZYGISK_ENABLED") == "1" @JvmField val isZygiskEnabled = System.getenv("ZYGISK_ENABLED") == "1"
@JvmStatic val isFDE get() = crypto == "block" @JvmStatic val isFDE get() = crypto == "block"
@JvmField var ramdisk = false @JvmField var ramdisk = false

2
app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
View File

@ -28,7 +28,7 @@ class InstallViewModel(
val isRooted = Shell.rootAccess() val isRooted = Shell.rootAccess()
val hideVbmeta = Info.vbmeta || Info.isSamsung || Info.isAB val hideVbmeta = Info.vbmeta || Info.isSamsung || Info.isAB
val skipOptions = Info.isEmulator || (Info.isSAR && !Info.isFDE && hideVbmeta && Info.ramdisk) val skipOptions = Info.isEmulator || (Info.isSAR && !Info.isFDE && hideVbmeta && Info.ramdisk)
val noSecondSlot = !isRooted || Info.isVirtualAB || !Info.isAB || Info.isEmulator val noSecondSlot = !isRooted || !Info.isAB || Info.isEmulator
@get:Bindable @get:Bindable
var step = if (skipOptions) 1 else 0 var step = if (skipOptions) 1 else 0