commit a9a87ec204b199c0ac798a47b81b754bfb3adff8
author Kelvin Zhang <zhangkelvin@google.com> Wed May 04 16:44:52 2022 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Wed May 04 16:45:14 2022 -0700
tree 3fe63434c7f487af78c0083be0ce877bead59d42
parent c01930f7d7f535b9e96d2db9487ef1c76426e4f5

Disable verity for VABC updates on android R

Bug: 230277030
Test: th
Change-Id: I2872c490c852fb7d3784721e191ece80b4b1fd58

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 374babf..cff7542 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -455,6 +455,11 @@
     return vabc_enabled
 
   @property
+  def is_android_r(self):
+    system_prop = self.info_dict.get("system.build.prop")
+    return system_prop and system_prop.GetProp("ro.build.version.release") == "11"
+
+  @property
   def is_vabc_xor(self):
     vendor_prop = self.info_dict.get("vendor.build.prop")
     vabc_xor_enabled = vendor_prop and \