Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d483bc6 authored by Aaqib Ismail's avatar Aaqib Ismail
Browse files

Move VHAL config dirs to protected 

Bug: 291278377
Test: m
Change-Id: I3c67e0b9398e7891bcfecddac5169fb76536cc25
parent b5310066

automotive/vehicle/aidl/impl/fake_impl/hardware/include/FakeVehicleHardware.h

+5 −2
Original line number Diff line number Diff line
@@ -99,12 +99,17 @@ class FakeVehicleHardware : public IVehicleHardware { 
    const std::shared_ptr<VehiclePropValuePool> mValuePool;

    const std::shared_ptr<VehiclePropertyStore> mServerSidePropStore;



    const std::string mDefaultConfigDir;

    const std::string mOverrideConfigDir;



    ValueResultType getValue(

            const aidl::android::hardware::automotive::vehicle::VehiclePropValue& value) const;



    VhalResult<void> setValue(

            const aidl::android::hardware::automotive::vehicle::VehiclePropValue& value);



    bool UseOverrideConfigDir();



  private:

    // Expose private methods to unit test.

    friend class FakeVehicleHardwareTestHelper;
@@ -156,8 +161,6 @@ class FakeVehicleHardware : public IVehicleHardware { 
                                  aidl::android::hardware::automotive::vehicle::SetValueRequest>

            mPendingSetValueRequests;



    const std::string mDefaultConfigDir;

    const std::string mOverrideConfigDir;

    const bool mForceOverride;

    bool mAddExtraTestVendorConfigs;

automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp

+8 −4
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ FakeVehicleHardware::FakeVehicleHardware(std::string defaultConfigDir, 
                                         std::string overrideConfigDir, bool forceOverride)

    : mValuePool(std::make_unique<VehiclePropValuePool>()),

      mServerSidePropStore(new VehiclePropertyStore(mValuePool)),

      mDefaultConfigDir(defaultConfigDir),

      mOverrideConfigDir(overrideConfigDir),

      mFakeObd2Frame(new obd2frame::FakeObd2Frame(mServerSidePropStore)),

      mFakeUserHal(new FakeUserHal(mValuePool)),

      mRecurrentTimer(new RecurrentTimer()),
@@ -247,8 +249,6 @@ FakeVehicleHardware::FakeVehicleHardware(std::string defaultConfigDir, 
              [this](const VehiclePropValue& value) { eventFromVehicleBus(value); })),

      mPendingGetValueRequests(this),

      mPendingSetValueRequests(this),

      mDefaultConfigDir(defaultConfigDir),

      mOverrideConfigDir(overrideConfigDir),

      mForceOverride(forceOverride) {

    init();

}
@@ -259,11 +259,15 @@ FakeVehicleHardware::~FakeVehicleHardware() { 
    mGeneratorHub.reset();

}



bool FakeVehicleHardware::UseOverrideConfigDir() {

    return mForceOverride ||

           android::base::GetBoolProperty(OVERRIDE_PROPERTY, /*default_value=*/false);

}



std::unordered_map<int32_t, ConfigDeclaration> FakeVehicleHardware::loadConfigDeclarations() {

    std::unordered_map<int32_t, ConfigDeclaration> configsByPropId;

    loadPropConfigsFromDir(mDefaultConfigDir, &configsByPropId);

    if (mForceOverride ||

        android::base::GetBoolProperty(OVERRIDE_PROPERTY, /*default_value=*/false)) {

    if (UseOverrideConfigDir()) {

        loadPropConfigsFromDir(mOverrideConfigDir, &configsByPropId);

    }

    return configsByPropId;