commit 4214c74e90ac0aa75d944f7e3f84b6eb37fc6d09
author Xin Li <delphij@google.com> Wed Nov 10 08:06:06 2021 +0000
committer Xin Li <delphij@google.com> Wed Nov 17 02:21:39 2021 +0000
tree 3c12f70a0e691f7ada1ae5a90b4c34785ec0027f
parent a52808c0d8fb4aec4bfeb1cee78378a4dab53021
parent 09d1b54d8004f6336015b3105a0c02fef3ff9c10

Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: I08790ad8399b6677b944cc5222b29fefdf96d4e4
Change-Id: I4e7ae98899af7233fe640bb09cbcaf579fdf3dbb

init.hardware.rc

diff --git a/init.hardware.rc b/init.hardware.rc
index d935553..1df575b 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -393,9 +393,6 @@
     write /sys/kernel/boot_adsp/boot 1
     write /sys/kernel/boot_cdsp/boot 1
 
-    # Update dm-verity state and set partition.*.verified properties
-    verity_update_state
-
     # Permission for rainbow sensor
     chown cameraserver camera /sys/devices/platform/soc/ac4a000.qcom,cci/ac4a000.qcom,cci:qcom,rainbow@20/rainbow_enable
     chmod 0660 /sys/devices/platform/soc/ac4a000.qcom,cci/ac4a000.qcom,cci:qcom,rainbow@20/rainbow_enable

vf/OWNERS

diff --git a/vf/OWNERS b/vf/OWNERS
index 6c5075e..d3c5d2d 100644
--- a/vf/OWNERS
+++ b/vf/OWNERS
@@ -3,5 +3,4 @@
 chrisgross@google.com
 danielnorman@google.com
 inseob@google.com
-jjdemartino@google.com
 justinyun@google.com