Revert^2 "Support PER_DISPLAY_BRIGHTNESS."
This reverts commit 957e91f39b609f05bee6f72fbfaec3a16c30d784.
Reason for revert: Will add the broken test to presubmit and verify it passes.
Flag: EXEMPT HAL change
Bug: 336831738
Test: atest --host CarServiceHostUnitTest
Change-Id: I36c07520891eaebc61464abcd398799bd6c2cfda
diff --git a/automotive/vehicle/aidl/impl/default_config/TEST_MAPPING b/automotive/vehicle/aidl/impl/default_config/TEST_MAPPING
new file mode 100644
index 0000000..15ac9cb
--- /dev/null
+++ b/automotive/vehicle/aidl/impl/default_config/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+ "ravenwood-presubmit": [
+ {
+ "name": "CarServiceHostUnitTest",
+ "host": true
+ }
+ ]
+}
diff --git a/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json b/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
index 2d1e9ab..489d638 100644
--- a/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
+++ b/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
@@ -3195,19 +3195,22 @@
}
},
{
- "property": "VehicleProperty::DISPLAY_BRIGHTNESS",
+ "property": "VehicleProperty::PER_DISPLAY_BRIGHTNESS"
+ },
+ {
+ "property": "VehicleProperty::PER_DISPLAY_MAX_BRIGHTNESS",
"defaultValue": {
"int32Values": [
+ 0,
+ 100,
+ 1,
+ 100,
+ 2,
+ 100,
+ 3,
100
]
- },
- "areas": [
- {
- "areaId": 0,
- "minInt32Value": 0,
- "maxInt32Value": 100
- }
- ]
+ }
},
{
"property": "VehicleProperty::VALET_MODE_ENABLED",
diff --git a/automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp b/automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp
index 54dcca2..e182f1c 100644
--- a/automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp
+++ b/automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp
@@ -1047,6 +1047,10 @@
VhalResult<void> isAdasPropertyAvailableResult;
VhalResult<bool> isCruiseControlTypeStandardResult;
switch (propId) {
+ case toInt(VehicleProperty::DISPLAY_BRIGHTNESS):
+ case toInt(VehicleProperty::PER_DISPLAY_BRIGHTNESS):
+ ALOGD("DISPLAY_BRIGHTNESS: %s", value.toString().c_str());
+ return {};
case toInt(VehicleProperty::AP_POWER_STATE_REPORT):
*isSpecialValue = true;
return setApPowerStateReport(value);