lineagehw: hidl: livedisplay: run clang-format

Change-Id: I2abd96bb87321c8cfb86aa155b5423665dfb5c2e

lineagehw/hidl/livedisplay/.clang-format

@@ -0,0 +1,11 @@
+BasedOnStyle: Google
+AccessModifierOffset: -2
+AllowShortFunctionsOnASingleLine: Inline
+ColumnLimit: 100
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+IndentWidth: 4
+PointerAlignment: Left
+TabWidth: 4
+UseTab: Never
+PenaltyExcessCharacter: 32

lineagehw/hidl/livedisplay/AdaptiveBacklight.cpp

@@ -31,7 +31,7 @@ namespace livedisplay {
 namespace V2_0 {
 namespace samsung {
 
-static constexpr const char *kBacklightPath = "/sys/class/lcd/panel/power_reduce";
+static constexpr const char* kBacklightPath = "/sys/class/lcd/panel/power_reduce";
 
 bool AdaptiveBacklight::isSupported() {
     std::fstream backlight(kBacklightPath, backlight.in | backlight.out);

lineagehw/hidl/livedisplay/AdaptiveBacklight.h

@@ -17,9 +17,9 @@
 #ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_0_ADAPTIVEBACKLIGHT_H
 #define VENDOR_LINEAGE_LIVEDISPLAY_V2_0_ADAPTIVEBACKLIGHT_H
 
-#include <vendor/lineage/livedisplay/2.0/IAdaptiveBacklight.h>
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
+#include <vendor/lineage/livedisplay/2.0/IAdaptiveBacklight.h>
 
 namespace vendor {
 namespace lineage {
@@ -44,7 +44,6 @@ class AdaptiveBacklight : public IAdaptiveBacklight {
     Return<bool> setEnabled(bool enabled) override;
 
     // Methods from ::android::hidl::base::V1_0::IBase follow.
-
 };
 
 }  // namespace samsung

lineagehw/hidl/livedisplay/DisplayColorCalibration.h

@@ -32,7 +32,7 @@ using ::android::hardware::Void;
 #define FILE_RGB "/sys/class/graphics/fb0/rgb"
 
 class DisplayColorCalibration : public IDisplayColorCalibration {
-   public:
+  public:
     bool isSupported();
 
     // Methods from ::vendor::lineage::livedisplay::V2_0::IDisplayColorCalibration follow.

lineagehw/hidl/livedisplay/DisplayColorCalibrationExynos.cpp

@@ -32,7 +32,7 @@ namespace livedisplay {
 namespace V2_0 {
 namespace samsung {
 
-static constexpr const char *kColorPath = "/sys/class/mdnie/mdnie/sensorRGB";
+static constexpr const char* kColorPath = "/sys/class/mdnie/mdnie/sensorRGB";
 
 bool DisplayColorCalibrationExynos::isSupported() {
     std::fstream rgb(kColorPath, rgb.in | rgb.out);

lineagehw/hidl/livedisplay/DisplayColorCalibrationExynos.h

@@ -17,9 +17,9 @@
 #ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_0_DISPLAYCOLORCALIBRATIONEXYNOS_H
 #define VENDOR_LINEAGE_LIVEDISPLAY_V2_0_DISPLAYCOLORCALIBRATIONEXYNOS_H
 
-#include <vendor/lineage/livedisplay/2.0/IDisplayColorCalibration.h>
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
+#include <vendor/lineage/livedisplay/2.0/IDisplayColorCalibration.h>
 
 namespace vendor {
 namespace lineage {
@@ -46,7 +46,6 @@ class DisplayColorCalibrationExynos : public IDisplayColorCalibration {
     Return<bool> setCalibration(const hidl_vec<int32_t>& rgb) override;
 
     // Methods from ::android::hidl::base::V1_0::IBase follow.
-
 };
 
 }  // namespace samsung

lineagehw/hidl/livedisplay/DisplayModes.cpp

@@ -26,18 +26,19 @@ namespace livedisplay {
 namespace V2_0 {
 namespace samsung {
 
-
 static constexpr const char* kModePath = "/sys/class/mdnie/mdnie/mode";
 static constexpr const char* kModeMaxPath = "/sys/class/mdnie/mdnie/mode_max";
 static constexpr const char* kDefaultPath = "/data/vendor/display/.displaymodedefault";
 
 const std::map<int32_t, std::string> DisplayModes::kModeMap = {
+    // clang-format off
     {0, "Dynamic"},
     {1, "Standard"},
     {2, "Natural"},
     {3, "Cinema"},
     {4, "Adaptive"},
     {5, "Reading"},
+    // clang-format on
 };
 
 DisplayModes::DisplayModes() : mDefaultModeId(0) {
@@ -76,8 +77,7 @@ Return<void> DisplayModes::getDisplayModes(getDisplayModes_cb resultCb) {
         value = kModeMap.size();
     }
     for (const auto& entry : kModeMap) {
-        if (entry.first < value)
+        if (entry.first < value) modes.push_back({entry.first, entry.second});
-            modes.push_back({entry.first, entry.second});
     }
     resultCb(modes);
     return Void();
@@ -127,7 +127,6 @@ Return<bool> DisplayModes::setDisplayMode(int32_t modeID, bool makeDefault) {
     return true;
 }
 
-
 // Methods from ::android::hidl::base::V1_0::IBase follow.
 
 }  // namespace samsung

lineagehw/hidl/livedisplay/DisplayModes.h

@@ -17,9 +17,9 @@
 #ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_0_DISPLAYMODES_H
 #define VENDOR_LINEAGE_LIVEDISPLAY_V2_0_DISPLAYMODES_H
 
-#include <vendor/lineage/livedisplay/2.0/IDisplayModes.h>
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
+#include <vendor/lineage/livedisplay/2.0/IDisplayModes.h>
 
 namespace vendor {
 namespace lineage {

lineagehw/hidl/livedisplay/ReadingEnhancement.cpp

@@ -31,7 +31,7 @@ namespace livedisplay {
 namespace V2_0 {
 namespace samsung {
 
-static constexpr const char *kREPath = "/sys/class/mdnie/mdnie/accessibility";
+static constexpr const char* kREPath = "/sys/class/mdnie/mdnie/accessibility";
 
 // Methods from ::vendor::lineage::livedisplay::V2_0::ISunlightEnhancement follow.
 bool ReadingEnhancement::isSupported() {
@@ -54,7 +54,6 @@ Return<bool> ReadingEnhancement::setEnabled(bool enabled) {
     return WriteStringToFile(enabled ? "4" : "0", kREPath, true);
 }
 
-
 // Methods from ::android::hidl::base::V1_0::IBase follow.
 
 }  // namespace samsung

lineagehw/hidl/livedisplay/ReadingEnhancement.h

@@ -17,9 +17,9 @@
 #ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_0_READINGENHANCEMENT_H
 #define VENDOR_LINEAGE_LIVEDISPLAY_V2_0_READINGENHANCEMENT_H
 
-#include <vendor/lineage/livedisplay/2.0/IReadingEnhancement.h>
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
+#include <vendor/lineage/livedisplay/2.0/IReadingEnhancement.h>
 
 namespace vendor {
 namespace lineage {
@@ -44,7 +44,6 @@ class ReadingEnhancement : public IReadingEnhancement {
     Return<bool> setEnabled(bool) override;
 
     // Methods from ::android::hidl::base::V1_0::IBase follow.
-
 };
 
 }  // namespace samsung

lineagehw/hidl/livedisplay/SunlightEnhancement.cpp

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 #include <android-base/file.h>
 #include <android-base/strings.h>
 
@@ -32,8 +31,8 @@ namespace livedisplay {
 namespace V2_0 {
 namespace samsung {
 
-static constexpr const char *kHBMPath = "/sys/class/lcd/panel/panel/auto_brightness";
+static constexpr const char* kHBMPath = "/sys/class/lcd/panel/panel/auto_brightness";
-static constexpr const char *kSREPath = "/sys/class/mdnie/mdnie/outdoor";
+static constexpr const char* kSREPath = "/sys/class/mdnie/mdnie/outdoor";
 
 // Methods from ::vendor::lineage::livedisplay::V2_0::ISunlightEnhancement follow.
 bool SunlightEnhancement::isSupported() {
@@ -59,7 +58,7 @@ Return<bool> SunlightEnhancement::isEnabled() {
     if (mHasHBM && ReadFileToString(kHBMPath, &tmp)) {
         statusHBM = std::stoi(Trim(tmp));
     }
-    
+
     return ((statusSRE == 1 && statusHBM == 6) || statusSRE == 1);
 }
 

lineagehw/hidl/livedisplay/SunlightEnhancement.h

@@ -17,9 +17,9 @@
 #ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_0_SUNLIGHTENHANCEMENT_H
 #define VENDOR_LINEAGE_LIVEDISPLAY_V2_0_SUNLIGHTENHANCEMENT_H
 
-#include <vendor/lineage/livedisplay/2.0/ISunlightEnhancement.h>
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
+#include <vendor/lineage/livedisplay/2.0/ISunlightEnhancement.h>
 
 namespace vendor {
 namespace lineage {

lineagehw/hidl/livedisplay/SunlightEnhancementExynos.cpp

@@ -21,7 +21,6 @@
 
 #include "SunlightEnhancementExynos.h"
 
-
 using android::base::ReadFileToString;
 using android::base::Trim;
 using android::base::WriteStringToFile;
@@ -32,7 +31,7 @@ namespace livedisplay {
 namespace V2_0 {
 namespace samsung {
 
-static constexpr const char *kLUXPath = "/sys/class/mdnie/mdnie/lux";
+static constexpr const char* kLUXPath = "/sys/class/mdnie/mdnie/lux";
 
 // Methods from ::vendor::lineage::livedisplay::V2_0::ISunlightEnhancement follow.
 bool SunlightEnhancementExynos::isSupported() {

lineagehw/hidl/livedisplay/SunlightEnhancementExynos.h

@@ -17,9 +17,9 @@
 #ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_0_SUNLIGHTENHANCEMENTEXYNOS_H
 #define VENDOR_LINEAGE_LIVEDISPLAY_V2_0_SUNLIGHTENHANCEMENTEXYNOS_H
 
-#include <vendor/lineage/livedisplay/2.0/ISunlightEnhancement.h>
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
+#include <vendor/lineage/livedisplay/2.0/ISunlightEnhancement.h>
 
 namespace vendor {
 namespace lineage {
@@ -44,7 +44,6 @@ class SunlightEnhancementExynos : public ISunlightEnhancement {
     Return<bool> setEnabled(bool enabled) override;
 
     // Methods from ::android::hidl::base::V1_0::IBase follow.
-
 };
 
 }  // namespace samsung

lineagehw/hidl/livedisplay/service.cpp

@@ -54,13 +54,15 @@ int main() {
 
     adaptiveBacklight = new AdaptiveBacklight();
     if (adaptiveBacklight == nullptr) {
-        LOG(ERROR) << "Can not create an instance of LiveDisplay HAL AdaptiveBacklight Iface, exiting.";
+        LOG(ERROR)
+            << "Can not create an instance of LiveDisplay HAL AdaptiveBacklight Iface, exiting.";
         goto shutdown;
     }
 
     displayColorCalibration = new DisplayColorCalibration();
     if (displayColorCalibration == nullptr) {
-        LOG(ERROR) << "Can not create an instance of LiveDisplay HAL DisplayColorCalibration Iface, exiting.";
+        LOG(ERROR) << "Can not create an instance of LiveDisplay HAL DisplayColorCalibration "
+                      "Iface, exiting.";
         goto shutdown;
     }
 
@@ -72,13 +74,15 @@ int main() {
 
     readingEnhancement = new ReadingEnhancement();
     if (readingEnhancement == nullptr) {
-        LOG(ERROR) << "Can not create an instance of LiveDisplay HAL ReadingEnhancement Iface, exiting.";
+        LOG(ERROR)
+            << "Can not create an instance of LiveDisplay HAL ReadingEnhancement Iface, exiting.";
         goto shutdown;
     }
 
     sunlightEnhancement = new SunlightEnhancement();
     if (sunlightEnhancement == nullptr) {
-        LOG(ERROR) << "Can not create an instance of LiveDisplay HAL SunlightEnhancement Iface, exiting.";
+        LOG(ERROR)
+            << "Can not create an instance of LiveDisplay HAL SunlightEnhancement Iface, exiting.";
         goto shutdown;
     }
 
@@ -87,9 +91,8 @@ int main() {
     if (adaptiveBacklight->isSupported()) {
         status = adaptiveBacklight->registerAsService();
         if (status != OK) {
-            LOG(ERROR)
+            LOG(ERROR) << "Could not register service for LiveDisplay HAL AdaptiveBacklight Iface ("
-                << "Could not register service for LiveDisplay HAL AdaptiveBacklight Iface ("
+                       << status << ")";
-                << status << ")";
             goto shutdown;
         }
     }
@@ -107,9 +110,8 @@ int main() {
     if (displayModes->isSupported()) {
         status = displayModes->registerAsService();
         if (status != OK) {
-            LOG(ERROR)
+            LOG(ERROR) << "Could not register service for LiveDisplay HAL DisplayModes Iface ("
-                << "Could not register service for LiveDisplay HAL DisplayModes Iface ("
+                       << status << ")";
-                << status << ")";
             goto shutdown;
         }
     }
@@ -136,7 +138,7 @@ int main() {
 
     LOG(INFO) << "LiveDisplay HAL service is ready.";
     joinRpcThreadpool();
-    // Should not pass this line
+// Should not pass this line
 
 shutdown:
     // In normal operation, we don't expect the thread pool to shutdown

lineagehw/hidl/livedisplay/serviceExynos.cpp

@@ -54,13 +54,15 @@ int main() {
 
     adaptiveBacklight = new AdaptiveBacklight();
     if (adaptiveBacklight == nullptr) {
-        LOG(ERROR) << "Can not create an instance of LiveDisplay HAL AdaptiveBacklight Iface, exiting.";
+        LOG(ERROR)
+            << "Can not create an instance of LiveDisplay HAL AdaptiveBacklight Iface, exiting.";
         goto shutdown;
     }
 
     displayColorCalibrationExynos = new DisplayColorCalibrationExynos();
     if (displayColorCalibrationExynos == nullptr) {
-        LOG(ERROR) << "Can not create an instance of LiveDisplay HAL DisplayColorCalibration Iface, exiting.";
+        LOG(ERROR) << "Can not create an instance of LiveDisplay HAL DisplayColorCalibration "
+                      "Iface, exiting.";
         goto shutdown;
     }
 
@@ -72,13 +74,15 @@ int main() {
 
     readingEnhancement = new ReadingEnhancement();
     if (readingEnhancement == nullptr) {
-        LOG(ERROR) << "Can not create an instance of LiveDisplay HAL ReadingEnhancement Iface, exiting.";
+        LOG(ERROR)
+            << "Can not create an instance of LiveDisplay HAL ReadingEnhancement Iface, exiting.";
         goto shutdown;
     }
 
     sunlightEnhancementExynos = new SunlightEnhancementExynos();
     if (sunlightEnhancementExynos == nullptr) {
-        LOG(ERROR) << "Can not create an instance of LiveDisplay HAL SunlightEnhancement Iface, exiting.";
+        LOG(ERROR)
+            << "Can not create an instance of LiveDisplay HAL SunlightEnhancement Iface, exiting.";
         goto shutdown;
     }
 
@@ -87,9 +91,8 @@ int main() {
     if (adaptiveBacklight->isSupported()) {
         status = adaptiveBacklight->registerAsService();
         if (status != OK) {
-            LOG(ERROR)
+            LOG(ERROR) << "Could not register service for LiveDisplay HAL AdaptiveBacklight Iface ("
-                << "Could not register service for LiveDisplay HAL AdaptiveBacklight Iface ("
+                       << status << ")";
-                << status << ")";
             goto shutdown;
         }
     }
@@ -107,9 +110,8 @@ int main() {
     if (displayModes->isSupported()) {
         status = displayModes->registerAsService();
         if (status != OK) {
-            LOG(ERROR)
+            LOG(ERROR) << "Could not register service for LiveDisplay HAL DisplayModes Iface ("
-                << "Could not register service for LiveDisplay HAL DisplayModes Iface ("
+                       << status << ")";
-                << status << ")";
             goto shutdown;
         }
     }
@@ -136,7 +138,7 @@ int main() {
 
     LOG(INFO) << "LiveDisplay HAL service is ready.";
     joinRpcThreadpool();
-    // Should not pass this line
+// Should not pass this line
 
 shutdown:
     // In normal operation, we don't expect the thread pool to shutdown