From f466c27da9f340ac96518cec35f1cd6273b27547 Mon Sep 17 00:00:00 2001 From: capntrips <31455058+capntrips@users.noreply.github.com> Date: Mon, 27 Dec 2021 00:40:23 -0600 Subject: [PATCH] disable pixel check for noSecondSlot --- app/src/main/java/com/topjohnwu/magisk/core/Info.kt | 1 - .../java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt | 2 +- 2 files changed, 1 insertion(+), 2 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 57e6c7566..c3bb5b5c4 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/Info.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/Info.kt @@ -39,7 +39,6 @@ object Info { var noDataExec = false @JvmField var hasGMS = true - @JvmField val isPixel = Build.BRAND == "google" val isSamsung = Build.MANUFACTURER.equals("samsung", ignoreCase = true) @JvmField val isEmulator = getProperty("ro.kernel.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 052fce210..f71762b1e 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 @@ -28,7 +28,7 @@ class InstallViewModel( val isRooted = Shell.rootAccess() val hideVbmeta = Info.vbmeta || Info.isSamsung || Info.isAB 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 var step = if (skipOptions) 1 else 0