TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-24 02:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable pixel check for noSecondSlot

Browse Source
This commit is contained in:
capntrips 2021-12-27 00:40:23 -06:00 committed by John Wu
parent bfe6bc3095
commit f466c27da9
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

@ -39,7 +39,6 @@ object Info {
var noDataExec = false var noDataExec = false
@JvmField var hasGMS = true @JvmField var hasGMS = true
@JvmField val isPixel = Build.BRAND == "google"
val isSamsung = Build.MANUFACTURER.equals("samsung", ignoreCase = true) val isSamsung = Build.MANUFACTURER.equals("samsung", ignoreCase = true)
@JvmField val isEmulator = @JvmField val isEmulator =
getProperty("ro.kernel.qemu", "0") == "1" || getProperty("ro.kernel.qemu", "0") == "1" ||

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.isPixel || Info.isVirtualAB || !Info.isAB || Info.isEmulator val noSecondSlot = !isRooted || Info.isVirtualAB || !Info.isAB || Info.isEmulator
@get:Bindable @get:Bindable
var step = if (skipOptions) 1 else 0 var step = if (skipOptions) 1 else 0