From 957e91f39b609f05bee6f72fbfaec3a16c30d784 Mon Sep 17 00:00:00 2001
From: Satish Yalla <satishy@google.com>
Date: Fri, 6 Sep 2024 05:38:48 +0000
Subject: [PATCH] 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
---
 .../config/DefaultProperties.json             | 21 ++++++++-----------
 .../hardware/src/FakeVehicleHardware.cpp      |  4 ----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json b/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
index 489d6387c3..2d1e9ab7fe 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 e182f1c6ea..54dcca24ba 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> FakeVehicleHardware::maybeSetSpecialValue(const VehiclePropValu
     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);