Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
053f4d48
Commit
053f4d48
authored
Jan 16, 2022
by
capntrips
Committed by
John Wu
Jan 18, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
disable virtualAB check for noSecondSlot
parent
f466c27d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
Info.kt
app/src/main/java/com/topjohnwu/magisk/core/Info.kt
+0
-1
InstallViewModel.kt
.../java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/core/Info.kt
View file @
053f4d48
...
@@ -30,7 +30,6 @@ object Info {
...
@@ -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
...
...
app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
View file @
053f4d48
...
@@ -28,7 +28,7 @@ class InstallViewModel(
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment