support installation to inactive slot on Pixel devices

Co-authored-by: vvb2060 <vvb2060@gmail.com>
topjohnwu · Jan 6, 2022 · c67e187 · c67e187
1 parent 558710b
commit c67e187
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 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
@@ -1,6 +1,5 @@
 package com.topjohnwu.magisk.core
 
-import android.os.Build
 import androidx.databinding.ObservableBoolean
 import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.core.model.UpdateInfo
@@ -28,14 +27,12 @@ object Info {
 
     // Device state
     @JvmStatic val env by lazy { loadState() }
-    @JvmStatic var isSAR = false
+    @JvmField var isSAR = false
     var isAB = false
-    val isVirtualAB = getProperty("ro.virtual_ab.enabled", "false") == "true"
     @JvmField val isZygiskEnabled = System.getenv("ZYGISK_ENABLED") == "1"
     @JvmStatic val isFDE get() = crypto == "block"
     @JvmField var ramdisk = false
     @JvmField var hasGMS = true
-    @JvmField val isPixel = Build.BRAND == "google"
     @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
@@ -27,7 +27,7 @@ class InstallViewModel(
 
     val isRooted = Shell.rootAccess()
     val skipOptions = Info.isEmulator || (Info.ramdisk && !Info.isFDE && Info.isSAR)
-    val noSecondSlot = !isRooted || Info.isPixel || Info.isVirtualAB || !Info.isAB || Info.isEmulator
+    val noSecondSlot = !isRooted || !Info.isAB || Info.isEmulator
 
     @get:Bindable
     var step = if (skipOptions) 1 else 0

diff --git a/app/src/main/res/raw/manager.sh b/app/src/main/res/raw/manager.sh
@@ -94,6 +94,11 @@ post_ota() {
   cd $NVBASE
   cp -f $1 bootctl
   rm -f $1
+  if [ -f "/system/lib64/android.hardware.boot@1.2.so" ]; then
+    sed -i 's/android.hardware.boot@1.0.so/android.hardware.boot@1.2.so/' bootctl
+  elif [ -f "/system/lib64/android.hardware.boot@1.1.so" ]; then
+    sed -i 's/android.hardware.boot@1.0.so/android.hardware.boot@1.1.so/' bootctl
+  fi
   chmod 755 bootctl
   ./bootctl hal-info || return
   [ $(./bootctl get-current-slot) -eq 0 ] && SLOT_NUM=1 || SLOT_NUM=0