Piteball/android_hardware_samsung
1
0
Fork 0
mirror of https://github.com/team-infusion-developers/android_hardware_samsung.git synced 2024-11-06 21:55:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

lineagehw: hidl: livedisplay: run clang-format

Browse source 
Change-Id: I2abd96bb87321c8cfb86aa155b5423665dfb5c2e
This commit is contained in:
Jan Altensen 2019-07-20 01:01:03 +02:00 committed by Paul Keith
parent 6f3af5aed8
commit 0003f594ef
16 changed files with 54 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lineagehw/hidl/livedisplay/.clang-format Normal file
View file

@ -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

2
lineagehw/hidl/livedisplay/AdaptiveBacklight.cpp
View file

@ -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);

3
lineagehw/hidl/livedisplay/AdaptiveBacklight.h
View file

@ -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

2
lineagehw/hidl/livedisplay/DisplayColorCalibrationExynos.cpp
View file

@ -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);

3
lineagehw/hidl/livedisplay/DisplayColorCalibrationExynos.h
View file

@ -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

7
lineagehw/hidl/livedisplay/DisplayModes.cpp
View file

@ -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)
modes.push_back({entry.first, entry.second});
if (entry.first < value) 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

2
lineagehw/hidl/livedisplay/DisplayModes.h
View file

@ -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 {

3
lineagehw/hidl/livedisplay/ReadingEnhancement.cpp
View file

@ -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

3
lineagehw/hidl/livedisplay/ReadingEnhancement.h
View file

@ -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

5
lineagehw/hidl/livedisplay/SunlightEnhancement.cpp
View file

@ -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 *kSREPath = "/sys/class/mdnie/mdnie/outdoor";
static constexpr const char* kHBMPath = "/sys/class/lcd/panel/panel/auto_brightness";
static constexpr const char* kSREPath = "/sys/class/mdnie/mdnie/outdoor";
// Methods from ::vendor::lineage::livedisplay::V2_0::ISunlightEnhancement follow.
bool SunlightEnhancement::isSupported() {

2
lineagehw/hidl/livedisplay/SunlightEnhancement.h
View file

@ -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 {

3
lineagehw/hidl/livedisplay/SunlightEnhancementExynos.cpp
View file

@ -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() {

3
lineagehw/hidl/livedisplay/SunlightEnhancementExynos.h
View file

@ -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

20
lineagehw/hidl/livedisplay/service.cpp
View file

@ -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,8 +91,7 @@ int main() {
if (adaptiveBacklight->isSupported()) {
status = adaptiveBacklight->registerAsService();
if (status != OK) {
LOG(ERROR)
<< "Could not register service for LiveDisplay HAL AdaptiveBacklight Iface ("
LOG(ERROR) << "Could not register service for LiveDisplay HAL AdaptiveBacklight Iface ("
<< status << ")";
goto shutdown;
}
@ -107,8 +110,7 @@ int main() {
if (displayModes->isSupported()) {
status = displayModes->registerAsService();
if (status != OK) {
LOG(ERROR)
<< "Could not register service for LiveDisplay HAL DisplayModes Iface ("
LOG(ERROR) << "Could not register service for LiveDisplay HAL DisplayModes Iface ("
<< 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

20
lineagehw/hidl/livedisplay/serviceExynos.cpp
View file

@ -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,8 +91,7 @@ int main() {
if (adaptiveBacklight->isSupported()) {
status = adaptiveBacklight->registerAsService();
if (status != OK) {
LOG(ERROR)
<< "Could not register service for LiveDisplay HAL AdaptiveBacklight Iface ("
LOG(ERROR) << "Could not register service for LiveDisplay HAL AdaptiveBacklight Iface ("
<< status << ")";
goto shutdown;
}
@ -107,8 +110,7 @@ int main() {
if (displayModes->isSupported()) {
status = displayModes->registerAsService();
if (status != OK) {
LOG(ERROR)
<< "Could not register service for LiveDisplay HAL DisplayModes Iface ("
LOG(ERROR) << "Could not register service for LiveDisplay HAL DisplayModes Iface ("
<< 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