TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-27 12:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not allow user to configure boot vbmeta patching

Browse Source
This commit is contained in:
topjohnwu 2023-08-28 20:15:17 -07:00
parent 51afe43a30
commit b1363ee479
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
package com.topjohnwu.magisk.core package com.topjohnwu.magisk.core
import android.os.Build
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import com.topjohnwu.magisk.StubApk import com.topjohnwu.magisk.StubApk
@ -39,7 +38,6 @@ object Info {
var isRooted = false var isRooted = false
@JvmField var hasGMS = true @JvmField var hasGMS = 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" ||
getProperty("ro.boot.qemu", "0") == "1" getProperty("ro.boot.qemu", "0") == "1"

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

@ -37,8 +37,7 @@ import java.io.IOException
class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel() { class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel() {
val isRooted get() = Info.isRooted val isRooted get() = Info.isRooted
val hideVbmeta = Info.vbmeta || Info.isSamsung || Info.isAB val skipOptions = Info.isEmulator || (Info.isSAR && !Info.isFDE && Info.ramdisk)
val skipOptions = Info.isEmulator || (Info.isSAR && !Info.isFDE && hideVbmeta && Info.ramdisk)
val noSecondSlot = !isRooted || !Info.isAB || Info.isEmulator val noSecondSlot = !isRooted || !Info.isAB || Info.isEmulator
@get:Bindable @get:Bindable

9
app/src/main/res/layout/fragment_install_md2.xml
View File

@ -108,15 +108,6 @@
android:text="@string/keep_force_encryption" android:text="@string/keep_force_encryption"
app:tint="?colorPrimary" /> app:tint="?colorPrimary" />
<CheckBox
style="@style/WidgetFoundation.Checkbox"
gone="@{viewModel.hideVbmeta}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="@={Config.patchVbmeta}"
android:text="@string/patch_vbmeta"
app:tint="?colorPrimary" />
<CheckBox <CheckBox
style="@style/WidgetFoundation.Checkbox" style="@style/WidgetFoundation.Checkbox"
gone="@{Info.ramdisk}" gone="@{Info.ramdisk}"