commit 2e2cba22a1e6b2b86e4dc189b8facbd78b45c9d0
author Keith Mok <keithmok@google.com> Thu Jul 22 00:40:12 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 22 00:40:12 2021 +0000
tree b0e3446c91a73bfa8c9d5baef09ac06ffa68d73b
parent 1d82ab8a79c259052e673747f8983d20d770719a
parent db1f6dc6d528a30299769f7970031b7fecfed4cb

Merge changes from topic "add-vehicle-binding-util-sc-v2-dev" into sc-v2-dev am: db1f6dc6d5

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

Change-Id: Ia3ec9aa451f4a2aa29884d80a4d87a914291afe2

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,