From 165d173e94b99553bb69b6fdb97ea46176694aec Mon Sep 17 00:00:00 2001 From: Keith Mok Date: Tue, 1 Jun 2021 18:51:57 +0000 Subject: [PATCH 1/2] Move vehicle hal to start in early_hal Vehicle HAL required before storage encryption can get unlocked when using vehicle seed binding with ECU. Test: manual, check vehicle-hal starts in early_hal from logcat Bug: 157501579 Change-Id: I88db77fbb1d04577b999b47e6f8dc4df1b300832 --- .../default/android.hardware.automotive.vehicle@2.0-service.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c8c89dc821..44f9134714 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 From 1b32420affbbb9f6b28d2ec8d55c3c5534e79993 Mon Sep 17 00:00:00 2001 From: Keith Mok Date: Wed, 14 Jul 2021 01:17:28 +0000 Subject: [PATCH 2/2] Remove vehicle binding seed property in emulator Emulator does not support vehicle binding seed property, but it reports it supports it. Remove it for now. Otherwise the vehicle binding utilities will try to set the vehicle binding seed but that will not be saved anywhere in the emulator. Test: manual Bug: 157501579 Change-Id: I9e8ad382a49e1108e0e25d6eee94b24d766264e8 Merged-In: I874e94b06fe675a96e5b15c9bff087023b4ea109 --- .../vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h | 8 -------- 1 file changed, 8 deletions(-) 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 a85cdf06a5..f98962b81e 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 @@ -1024,14 +1024,6 @@ const ConfigDeclaration kVehicleProperties[]{ .changeMode = VehiclePropertyChangeMode::ON_CHANGE, }, }, - { - .config = - { - .prop = toInt(VehicleProperty::STORAGE_ENCRYPTION_BINDING_SEED), - .access = VehiclePropertyAccess::READ_WRITE, - .changeMode = VehiclePropertyChangeMode::ON_CHANGE, - }, - }, { .config = {