commit 45ca0e0c64b6fbbc590fb033109e4a2350f090b0
author Aaron Tsai <tsaiaaron@google.com> Thu Jul 22 09:49:09 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 22 09:49:09 2021 +0000
tree 8f9c9f30877690c32074e00ea5b21f2fa4c7aacb
parent c5c429e5d736c39962714cd9f61a29dc774d4026
parent 7b5918a273001af9715cf8b88369562e6d9ca5fd

[automerger skipped] Waiting 10s at the beginning of getBarringInfo test if not yet in-service. am: 772801bf8a am: 657041220f -s ours am: 7b5918a273 -s ours

am skip reason: Merged-In I9ae4e7a07b9f47353554ffb63a23b6518aa344b7 with SHA-1 db3c830bc8 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1763370

Change-Id: I4aae37678dd821aef3691ae24abe8c1b8b2d7022

automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc

diff --git a/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc b/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc
index c8c89dc..44f9134 100644
--- a/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc
+++ b/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc
@@ -1,4 +1,4 @@
 service vendor.vehicle-hal-2.0 /vendor/bin/hw/android.hardware.automotive.vehicle@2.0-service
-    class hal
+    class early_hal
     user vehicle_network
     group system inet

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
index a85cdf0..f98962b 100644
--- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
@@ -1027,14 +1027,6 @@
         {
                 .config =
                         {
-                                .prop = toInt(VehicleProperty::STORAGE_ENCRYPTION_BINDING_SEED),
-                                .access = VehiclePropertyAccess::READ_WRITE,
-                                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
-                        },
-        },
-        {
-                .config =
-                        {
                                 .prop = toInt(VehicleProperty::WATCHDOG_ALIVE),
                                 .access = VehiclePropertyAccess::WRITE,
                                 .changeMode = VehiclePropertyChangeMode::ON_CHANGE,