am 5e34b3ab: am 72488aa0: Merge "perfboot.py: warn if dm-verity is disabled"

* commit '5e34b3abdb3cbc167fa86dab7a746c94f2bd4c6f':
  perfboot.py: warn if dm-verity is disabled
diff --git a/init/perfboot.py b/init/perfboot.py
index 2cd4699..13da328 100755
--- a/init/perfboot.py
+++ b/init/perfboot.py
@@ -205,6 +205,16 @@
     atexit.register(cleanup)
 
 
+def check_dm_verity_settings(device):
+    device.wait()
+    for partition in ['system', 'vendor']:
+        verity_mode = device.get_prop('partition.%s.verified' % partition)
+        if verity_mode is None:
+            logging.warning('dm-verity is not enabled for /%s. Did you run '
+                            'adb disable-verity? That may skew the result.',
+                            partition)
+
+
 def read_event_tags(tags_file):
     """Reads event tags from |tags_file|."""
     if not tags_file:
@@ -393,6 +403,7 @@
         args.output = 'perf-%s-%s.tsv' % (
             device.get_prop('ro.build.flavor'),
             device.get_prop('ro.build.version.incremental'))
+    check_dm_verity_settings(device)
 
     record_list = []
     event_tags = read_event_tags(args.tags)