From 0ef92a4866dd449939131cb424bc57ba65f9978a Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Wed, 23 Sep 2020 04:49:18 -0700 Subject: [PATCH] Hide OTA option on Pixel devices --- app/src/main/java/com/topjohnwu/magisk/core/Info.kt | 1 + .../java/com/topjohnwu/magisk/core/utils/RootInit.kt | 10 ++++++---- app/src/main/res/layout/fragment_install_md2.xml | 2 +- 3 files changed, 8 insertions(+), 5 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 cc63bd2b8..bda2969d9 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/Info.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/Info.kt @@ -33,6 +33,7 @@ object Info { @JvmStatic var ramdisk = false @JvmStatic var hasGMS = true @JvmStatic var crypto = "" + @JvmStatic var isPixel = false val isConnected by lazy { ObservableBoolean(false).also { field -> diff --git a/app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt b/app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt index 9dc776393..dc5495c35 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt @@ -38,14 +38,16 @@ class RootInit : Shell.Initializer() { add("mm_init") }.exec() - fun getvar(name: String) = ShellUtils.fastCmd(shell, "echo \$$name") - fun getBool(name: String) = getvar(name).toBoolean() + fun fastCmd(cmd: String) = ShellUtils.fastCmd(shell, cmd) + fun getVar(name: String) = fastCmd("echo \$$name") + fun getBool(name: String) = getVar(name).toBoolean() - Const.MAGISKTMP = getvar("MAGISKTMP") + Const.MAGISKTMP = getVar("MAGISKTMP") Info.isSAR = getBool("SYSTEM_ROOT") Info.ramdisk = getBool("RAMDISKEXIST") Info.isAB = getBool("ISAB") - Info.crypto = getvar("CRYPTOTYPE") + Info.crypto = getVar("CRYPTOTYPE") + Info.isPixel = fastCmd("getprop ro.product.brand") == "google" // Default presets Config.recovery = getBool("RECOVERYMODE") diff --git a/app/src/main/res/layout/fragment_install_md2.xml b/app/src/main/res/layout/fragment_install_md2.xml index 2ef8c0620..e49de8e25 100644 --- a/app/src/main/res/layout/fragment_install_md2.xml +++ b/app/src/main/res/layout/fragment_install_md2.xml @@ -213,7 +213,7 @@