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

Commit 67534538 authored by Yu Shan's avatar Yu Shan
Browse files

Remove default value for AP_POWER_STATE_REQ. 

Remove the default value for AP_POWER_STATE_REQ because initially the
device should be in an OFF state, but there is no such
AP_POWER_STATE_REQ. If we set the default value to ON, then when
VHAL set the value to ON, it would cause no value update event to
inform CarService.

Test: atest FakeVehicleHardwareTest.
Manually run audio test on cf target.
Bug: 218924258

Change-Id: I3552a38bf2433015767c2254e42871cee5c9e716
parent ebe7ed39

automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h

+1 −2
Original line number Diff line number Diff line
@@ -754,8 +754,7 @@ const std::vector<ConfigDeclaration> kVehicleProperties = { 
        {.config = {.prop = toInt(VehicleProperty::AP_POWER_STATE_REQ),

                    .access = VehiclePropertyAccess::READ,

                    .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                    .configArray = {3}},

         .initialValue = {.int32Values = {toInt(VehicleApPowerStateReq::ON), 0}}},

                    .configArray = {3}}},



        {.config = {.prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                    .access = VehiclePropertyAccess::READ_WRITE,

automotive/vehicle/aidl/impl/fake_impl/hardware/test/FakeVehicleHardwareTest.cpp

+36 −37
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ using ::android::base::unexpected; 
using ::testing::ContainerEq;

using ::testing::ContainsRegex;

using ::testing::Eq;

using ::testing::IsSubsetOf;

using ::testing::WhenSortedBy;



constexpr int INVALID_PROP_ID = 0;
@@ -634,17 +633,17 @@ std::vector<SetSpecialValueTestCase> setSpecialValueTestCases() { 
                            },

                    .expectedValuesToGet =

                            {

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::DEEP_SLEEP_EXIT)},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REQ),

                                            .status = VehiclePropertyStatus::AVAILABLE,

                                            .value.int32Values = {toInt(VehicleApPowerStateReq::ON),

                                                                  0},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::DEEP_SLEEP_EXIT)},

                                    },

                            },

            },

            SetSpecialValueTestCase{
@@ -659,17 +658,17 @@ std::vector<SetSpecialValueTestCase> setSpecialValueTestCases() { 
                            },

                    .expectedValuesToGet =

                            {

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::HIBERNATION_EXIT)},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REQ),

                                            .status = VehiclePropertyStatus::AVAILABLE,

                                            .value.int32Values = {toInt(VehicleApPowerStateReq::ON),

                                                                  0},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::HIBERNATION_EXIT)},

                                    },

                            },

            },

            SetSpecialValueTestCase{
@@ -684,17 +683,17 @@ std::vector<SetSpecialValueTestCase> setSpecialValueTestCases() { 
                            },

                    .expectedValuesToGet =

                            {

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::SHUTDOWN_CANCELLED)},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REQ),

                                            .status = VehiclePropertyStatus::AVAILABLE,

                                            .value.int32Values = {toInt(VehicleApPowerStateReq::ON),

                                                                  0},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::SHUTDOWN_CANCELLED)},

                                    },

                            },

            },

            SetSpecialValueTestCase{
@@ -709,17 +708,17 @@ std::vector<SetSpecialValueTestCase> setSpecialValueTestCases() { 
                            },

                    .expectedValuesToGet =

                            {

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::WAIT_FOR_VHAL)},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REQ),

                                            .status = VehiclePropertyStatus::AVAILABLE,

                                            .value.int32Values = {toInt(VehicleApPowerStateReq::ON),

                                                                  0},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::WAIT_FOR_VHAL)},

                                    },

                            },

            },

            SetSpecialValueTestCase{
@@ -734,17 +733,17 @@ std::vector<SetSpecialValueTestCase> setSpecialValueTestCases() { 
                            },

                    .expectedValuesToGet =

                            {

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::DEEP_SLEEP_ENTRY)},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REQ),

                                            .status = VehiclePropertyStatus::AVAILABLE,

                                            .value.int32Values =

                                                    {toInt(VehicleApPowerStateReq::FINISHED), 0},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::DEEP_SLEEP_ENTRY)},

                                    },

                            },

            },

            SetSpecialValueTestCase{
@@ -759,17 +758,17 @@ std::vector<SetSpecialValueTestCase> setSpecialValueTestCases() { 
                            },

                    .expectedValuesToGet =

                            {

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::HIBERNATION_ENTRY)},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REQ),

                                            .status = VehiclePropertyStatus::AVAILABLE,

                                            .value.int32Values =

                                                    {toInt(VehicleApPowerStateReq::FINISHED), 0},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::HIBERNATION_ENTRY)},

                                    },

                            },

            },

            SetSpecialValueTestCase{
@@ -784,17 +783,17 @@ std::vector<SetSpecialValueTestCase> setSpecialValueTestCases() { 
                            },

                    .expectedValuesToGet =

                            {

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::SHUTDOWN_START)},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REQ),

                                            .status = VehiclePropertyStatus::AVAILABLE,

                                            .value.int32Values =

                                                    {toInt(VehicleApPowerStateReq::FINISHED), 0},

                                    },

                                    VehiclePropValue{

                                            .prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),

                                            .value.int32Values = {toInt(

                                                    VehicleApPowerStateReport::SHUTDOWN_START)},

                                    },

                            },

            },

            SetSpecialValueTestCase{
@@ -915,7 +914,7 @@ TEST_P(FakeVehicleHardwareSpecialValuesTest, testSetSpecialProperties) { 
    // Some of the updated properties might be the same as default config, thus not causing

    // a property change event. So the changed properties should be a subset of all the updated

    // properties.

    ASSERT_THAT(getChangedProperties(), WhenSortedBy(mPropValueCmp, IsSubsetOf(gotValues)));

    ASSERT_THAT(getChangedProperties(), WhenSortedBy(mPropValueCmp, Eq(gotValues)));

}



INSTANTIATE_TEST_SUITE_P(