manager.sh: add ro.boot.vbmeta.size + ro.product.ab_ota_partitions to…

… vbmeta check ro.boot.vbmeta.device doesn't seem to be in use on all A/B devices
topjohnwu · Aug 28, 2023 · 474268a · 474268a
1 parent eadb030
commit 474268a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/src/main/res/raw/manager.sh b/app/src/main/res/raw/manager.sh
@@ -202,10 +202,11 @@ get_flags() {
   ISENCRYPTED=false
   [ "$(getprop ro.crypto.state)" = "encrypted" ] && ISENCRYPTED=true
   KEEPFORCEENCRYPT=$ISENCRYPTED
-  if [ -n "$(getprop ro.boot.vbmeta.device)" ]; then
+  VBMETAEXIST=false
+  if [ -n "$(getprop ro.boot.vbmeta.device)" -o -n "$(getprop ro.boot.vbmeta.size)" ]; then
+    VBMETAEXIST=true
+  elif getprop ro.product.ab_ota_partitions | grep -wq vbmeta; then
     VBMETAEXIST=true
-  else
-    VBMETAEXIST=false
   fi
   # Preset PATCHVBMETAFLAG to false in the non-root case
   PATCHVBMETAFLAG=false