Revert "Support PER_DISPLAY_BRIGHTNESS."
This reverts commit 50db0356a65bc8e00c6b231d701e4c937865eec0.
Reason for revert: Droidmonitor created revert due to b/364980281. Will be verifying through ABTD before submission.
Change-Id: I763eb6fd662beedf180be32715ddca4c63e8216f
diff --git a/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json b/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
index 489d638..2d1e9ab 100644
--- a/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
+++ b/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
@@ -3195,22 +3195,19 @@
}
},
{
- "property": "VehicleProperty::PER_DISPLAY_BRIGHTNESS"
- },
- {
- "property": "VehicleProperty::PER_DISPLAY_MAX_BRIGHTNESS",
+ "property": "VehicleProperty::DISPLAY_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 e182f1c..54dcca2 100644
--- a/automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp
+++ b/automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp
@@ -1047,10 +1047,6 @@
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);