From b1363ee47913eb2462d0555699865a3b8e21f092 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Mon, 28 Aug 2023 20:15:17 -0700 Subject: [PATCH] Do not allow user to configure boot vbmeta patching --- app/src/main/java/com/topjohnwu/magisk/core/Info.kt | 2 -- .../com/topjohnwu/magisk/ui/install/InstallViewModel.kt | 3 +-- app/src/main/res/layout/fragment_install_md2.xml | 9 --------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Info.kt b/app/src/main/java/com/topjohnwu/magisk/core/Info.kt index 5168598b8..270e0780f 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/Info.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/Info.kt @@ -1,6 +1,5 @@ package com.topjohnwu.magisk.core -import android.os.Build import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.topjohnwu.magisk.StubApk @@ -39,7 +38,6 @@ object Info { var isRooted = false @JvmField var hasGMS = true - val isSamsung = Build.MANUFACTURER.equals("samsung", ignoreCase = true) @JvmField val isEmulator = getProperty("ro.kernel.qemu", "0") == "1" || getProperty("ro.boot.qemu", "0") == "1" diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt index af355941d..d134bb71e 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt @@ -37,8 +37,7 @@ import java.io.IOException class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel() { val isRooted get() = Info.isRooted - 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 && Info.ramdisk) val noSecondSlot = !isRooted || !Info.isAB || Info.isEmulator @get:Bindable diff --git a/app/src/main/res/layout/fragment_install_md2.xml b/app/src/main/res/layout/fragment_install_md2.xml index 64bd12709..7a7364379 100644 --- a/app/src/main/res/layout/fragment_install_md2.xml +++ b/app/src/main/res/layout/fragment_install_md2.xml @@ -108,15 +108,6 @@ android:text="@string/keep_force_encryption" app:tint="?colorPrimary" /> - -