diff options
author | LuK1337 <priv.luk@gmail.com> | 2020-01-07 14:15:27 +0100 |
---|---|---|
committer | Bruno Martins <bgcngm@gmail.com> | 2020-01-07 15:19:57 +0100 |
commit | 588974a3debcd29c08fae450b80477358ba3c234 (patch) | |
tree | 8c86105207955ddacc0a5f444bf65596340a8b08 | |
parent | 302ee59211fdee592e67948c6ad9d9aa02803285 (diff) | |
download | android_hardware_lineage_livedisplay-588974a3debcd29c08fae450b80477358ba3c234.tar.gz android_hardware_lineage_livedisplay-588974a3debcd29c08fae450b80477358ba3c234.tar.bz2 android_hardware_lineage_livedisplay-588974a3debcd29c08fae450b80477358ba3c234.zip |
livedisplay: clang-format all files
Change-Id: Ia7f7f7acdecc8d407f53bf6a7ea1e0a2e63c5fe7
-rw-r--r-- | legacymm/DisplayModes.cpp | 17 | ||||
-rw-r--r-- | legacymm/DisplayModes.h | 4 | ||||
-rw-r--r-- | legacymm/PictureAdjustment.cpp | 26 | ||||
-rw-r--r-- | legacymm/PictureAdjustment.h | 6 | ||||
-rw-r--r-- | legacymm/service.cpp | 4 | ||||
-rw-r--r-- | sdm/AdaptiveBacklight.cpp | 6 | ||||
-rw-r--r-- | sdm/AdaptiveBacklight.h | 4 | ||||
-rw-r--r-- | sdm/DisplayModes.cpp | 31 | ||||
-rw-r--r-- | sdm/DisplayModes.h | 4 | ||||
-rw-r--r-- | sdm/PictureAdjustment.cpp | 23 | ||||
-rw-r--r-- | sdm/PictureAdjustment.h | 6 | ||||
-rw-r--r-- | sdm/Utils.cpp | 8 | ||||
-rw-r--r-- | sdm/Utils.h | 2 | ||||
-rw-r--r-- | sdm/service.cpp | 18 | ||||
-rw-r--r-- | sysfs/AdaptiveBacklight.cpp | 4 | ||||
-rw-r--r-- | sysfs/AdaptiveBacklight.h | 4 | ||||
-rw-r--r-- | sysfs/AutoContrast.cpp | 4 | ||||
-rw-r--r-- | sysfs/AutoContrast.h | 2 | ||||
-rw-r--r-- | sysfs/ColorEnhancement.cpp | 4 | ||||
-rw-r--r-- | sysfs/ColorEnhancement.h | 2 | ||||
-rw-r--r-- | sysfs/DisplayColorCalibration.cpp | 4 | ||||
-rw-r--r-- | sysfs/DisplayColorCalibration.h | 2 | ||||
-rw-r--r-- | sysfs/ReadingEnhancement.cpp | 4 | ||||
-rw-r--r-- | sysfs/ReadingEnhancement.h | 2 | ||||
-rw-r--r-- | sysfs/SunlightEnhancement.cpp | 4 | ||||
-rw-r--r-- | sysfs/SunlightEnhancement.h | 4 | ||||
-rw-r--r-- | sysfs/service.cpp | 14 |
27 files changed, 109 insertions, 104 deletions
diff --git a/legacymm/DisplayModes.cpp b/legacymm/DisplayModes.cpp index bc9e2cb..3bdbe0d 100644 --- a/legacymm/DisplayModes.cpp +++ b/legacymm/DisplayModes.cpp @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "DisplayModes.h" + #include <dlfcn.h> #include "Constants.h" -#include "DisplayModes.h" #include "PictureAdjustment.h" #include "Types.h" @@ -30,19 +31,19 @@ namespace legacymm { DisplayModes::DisplayModes(void* libHandle) { mLibHandle = libHandle; disp_api_supported = - reinterpret_cast<int (*)(int32_t, int32_t)>(dlsym(mLibHandle, "disp_api_supported")); + reinterpret_cast<int (*)(int32_t, int32_t)>(dlsym(mLibHandle, "disp_api_supported")); disp_api_get_num_display_modes = reinterpret_cast<int (*)(int32_t, int32_t, int*)>( - dlsym(mLibHandle, "disp_api_get_num_display_modes")); + dlsym(mLibHandle, "disp_api_get_num_display_modes")); disp_api_get_display_modes = reinterpret_cast<int (*)(int32_t, int32_t, void*, int)>( - dlsym(mLibHandle, "disp_api_get_display_modes")); + dlsym(mLibHandle, "disp_api_get_display_modes")); disp_api_get_active_display_mode = reinterpret_cast<int (*)(int32_t, int*, uint32_t*)>( - dlsym(mLibHandle, "disp_api_get_active_display_mode")); + dlsym(mLibHandle, "disp_api_get_active_display_mode")); disp_api_set_active_display_mode = reinterpret_cast<int (*)(int32_t, int)>( - dlsym(mLibHandle, "disp_api_set_active_display_mode")); + dlsym(mLibHandle, "disp_api_set_active_display_mode")); disp_api_get_default_display_mode = reinterpret_cast<int (*)(int32_t, int*)>( - dlsym(mLibHandle, "disp_api_get_default_display_mode")); + dlsym(mLibHandle, "disp_api_get_default_display_mode")); disp_api_set_default_display_mode = reinterpret_cast<int (*)(int32_t, int)>( - dlsym(mLibHandle, "disp_api_set_default_display_mode")); + dlsym(mLibHandle, "disp_api_set_default_display_mode")); } bool DisplayModes::isSupported() { diff --git a/legacymm/DisplayModes.h b/legacymm/DisplayModes.h index c3655cd..ff3b394 100644 --- a/legacymm/DisplayModes.h +++ b/legacymm/DisplayModes.h @@ -29,7 +29,7 @@ using ::android::hardware::Return; using ::android::hardware::Void; class DisplayModes : public IDisplayModes { - public: + public: DisplayModes(void* libHandle); bool isSupported(); @@ -40,7 +40,7 @@ class DisplayModes : public IDisplayModes { Return<void> getDefaultDisplayMode(getDefaultDisplayMode_cb _hidl_cb) override; Return<bool> setDisplayMode(int32_t modeID, bool makeDefault) override; - private: + private: void* mLibHandle; int (*disp_api_supported)(int32_t, int32_t); diff --git a/legacymm/PictureAdjustment.cpp b/legacymm/PictureAdjustment.cpp index 38a307d..0bc7955 100644 --- a/legacymm/PictureAdjustment.cpp +++ b/legacymm/PictureAdjustment.cpp @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "PictureAdjustment.h" + #include <dlfcn.h> #include "Constants.h" -#include "PictureAdjustment.h" #include "Types.h" namespace vendor { @@ -33,13 +34,13 @@ PictureAdjustment::PictureAdjustment(void* libHandle) { mLibHandle = libHandle; disp_api_supported = - reinterpret_cast<int (*)(int32_t, int32_t)>(dlsym(mLibHandle, "disp_api_supported")); + reinterpret_cast<int (*)(int32_t, int32_t)>(dlsym(mLibHandle, "disp_api_supported")); disp_api_get_pa_range = - reinterpret_cast<int (*)(int32_t, void*)>(dlsym(mLibHandle, "disp_api_get_pa_range")); + reinterpret_cast<int (*)(int32_t, void*)>(dlsym(mLibHandle, "disp_api_get_pa_range")); disp_api_get_pa_config = - reinterpret_cast<int (*)(int32_t, void*)>(dlsym(mLibHandle, "disp_api_get_pa_config")); + reinterpret_cast<int (*)(int32_t, void*)>(dlsym(mLibHandle, "disp_api_get_pa_config")); disp_api_set_pa_config = - reinterpret_cast<int (*)(int32_t, void*)>(dlsym(mLibHandle, "disp_api_set_pa_config")); + reinterpret_cast<int (*)(int32_t, void*)>(dlsym(mLibHandle, "disp_api_set_pa_config")); memset(&mDefaultPictureAdjustment, 0, sizeof(HSIC)); } @@ -64,10 +65,11 @@ HSIC PictureAdjustment::getPictureAdjustmentInternal() { if (disp_api_get_pa_config != nullptr) { if (disp_api_get_pa_config(0, &config) == 0) { - return HSIC{ - static_cast<float>(config.data.hue), static_cast<float>(config.data.saturation), - static_cast<float>(config.data.intensity), static_cast<float>(config.data.contrast), - static_cast<float>(config.data.saturationThreshold)}; + return HSIC{static_cast<float>(config.data.hue), + static_cast<float>(config.data.saturation), + static_cast<float>(config.data.intensity), + static_cast<float>(config.data.contrast), + static_cast<float>(config.data.saturationThreshold)}; } } @@ -146,7 +148,7 @@ Return<void> PictureAdjustment::getContrastRange(getContrastRange_cb _hidl_cb) { } Return<void> PictureAdjustment::getSaturationThresholdRange( - getSaturationThresholdRange_cb _hidl_cb) { + getSaturationThresholdRange_cb _hidl_cb) { FloatRange range{}; mm_pa_range r{}; @@ -168,13 +170,13 @@ Return<void> PictureAdjustment::getPictureAdjustment(getPictureAdjustment_cb _hi } Return<void> PictureAdjustment::getDefaultPictureAdjustment( - getDefaultPictureAdjustment_cb _hidl_cb) { + getDefaultPictureAdjustment_cb _hidl_cb) { _hidl_cb(mDefaultPictureAdjustment); return Void(); } Return<bool> PictureAdjustment::setPictureAdjustment( - const ::vendor::lineage::livedisplay::V2_0::HSIC& hsic) { + const ::vendor::lineage::livedisplay::V2_0::HSIC& hsic) { mm_pa_config config = {0xF, {static_cast<int>(hsic.hue), static_cast<int>(hsic.saturation), static_cast<int>(hsic.intensity), static_cast<int>(hsic.contrast), diff --git a/legacymm/PictureAdjustment.h b/legacymm/PictureAdjustment.h index a578075..b88975d 100644 --- a/legacymm/PictureAdjustment.h +++ b/legacymm/PictureAdjustment.h @@ -30,7 +30,7 @@ using ::android::hardware::Return; using ::android::hardware::Void; class PictureAdjustment : public IPictureAdjustment { - public: + public: PictureAdjustment(void* libHandle); bool isSupported(); @@ -45,11 +45,11 @@ class PictureAdjustment : public IPictureAdjustment { Return<void> getPictureAdjustment(getPictureAdjustment_cb _hidl_cb) override; Return<void> getDefaultPictureAdjustment(getDefaultPictureAdjustment_cb _hidl_cb) override; Return<bool> setPictureAdjustment( - const ::vendor::lineage::livedisplay::V2_0::HSIC& hsic) override; + const ::vendor::lineage::livedisplay::V2_0::HSIC& hsic) override; static void updateDefaultPictureAdjustment(); - private: + private: void* mLibHandle; int (*disp_api_supported)(int32_t, int32_t); diff --git a/legacymm/service.cpp b/legacymm/service.cpp index e668699..2668f77 100644 --- a/legacymm/service.cpp +++ b/legacymm/service.cpp @@ -77,8 +77,8 @@ int main() { pa = new PictureAdjustment(libHandle); if (pa == nullptr) { - LOG(ERROR) - << "Can not create an instance of LiveDisplay HAL PictureAdjustment Iface, exiting."; + LOG(ERROR) << "Can not create an instance of LiveDisplay HAL PictureAdjustment Iface, " + "exiting."; goto shutdown; } diff --git a/sdm/AdaptiveBacklight.cpp b/sdm/AdaptiveBacklight.cpp index 7d9c8b3..7a947d5 100644 --- a/sdm/AdaptiveBacklight.cpp +++ b/sdm/AdaptiveBacklight.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include <stdio.h> -#include <string.h> +#include "AdaptiveBacklight.h" #include <android-base/properties.h> +#include <stdio.h> +#include <string.h> -#include "AdaptiveBacklight.h" #include "Constants.h" #include "Types.h" #include "Utils.h" diff --git a/sdm/AdaptiveBacklight.h b/sdm/AdaptiveBacklight.h index 006cefa..5f87987 100644 --- a/sdm/AdaptiveBacklight.h +++ b/sdm/AdaptiveBacklight.h @@ -28,7 +28,7 @@ namespace sdm { using ::android::hardware::Return; class AdaptiveBacklight : public IAdaptiveBacklight { - public: + public: AdaptiveBacklight(); bool isSupported(); @@ -37,7 +37,7 @@ class AdaptiveBacklight : public IAdaptiveBacklight { Return<bool> isEnabled() override; Return<bool> setEnabled(bool enabled) override; - private: + private: bool mEnabled; }; diff --git a/sdm/DisplayModes.cpp b/sdm/DisplayModes.cpp index ac9c8d9..2d334bf 100644 --- a/sdm/DisplayModes.cpp +++ b/sdm/DisplayModes.cpp @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "DisplayModes.h" + #include <dlfcn.h> #include "Constants.h" -#include "DisplayModes.h" #include "PictureAdjustment.h" #include "Types.h" @@ -31,26 +32,26 @@ DisplayModes::DisplayModes(void* libHandle, uint64_t cookie) { mLibHandle = libHandle; mCookie = cookie; disp_api_get_feature_version = - reinterpret_cast<int32_t (*)(uint64_t, uint32_t, void*, uint32_t*)>( - dlsym(mLibHandle, "disp_api_get_feature_version")); + reinterpret_cast<int32_t (*)(uint64_t, uint32_t, void*, uint32_t*)>( + dlsym(mLibHandle, "disp_api_get_feature_version")); disp_api_get_num_display_modes = - reinterpret_cast<int32_t (*)(uint64_t, uint32_t, int32_t, int32_t*, uint32_t*)>( - dlsym(mLibHandle, "disp_api_get_num_display_modes")); + reinterpret_cast<int32_t (*)(uint64_t, uint32_t, int32_t, int32_t*, uint32_t*)>( + dlsym(mLibHandle, "disp_api_get_num_display_modes")); disp_api_get_display_modes = - reinterpret_cast<int32_t (*)(uint64_t, uint32_t, int32_t, void*, int32_t, uint32_t*)>( - dlsym(mLibHandle, "disp_api_get_display_modes")); + reinterpret_cast<int32_t (*)(uint64_t, uint32_t, int32_t, void*, int32_t, uint32_t*)>( + dlsym(mLibHandle, "disp_api_get_display_modes")); disp_api_get_active_display_mode = - reinterpret_cast<int32_t (*)(uint64_t, uint32_t, int32_t*, uint32_t*, uint32_t*)>( - dlsym(mLibHandle, "disp_api_get_active_display_mode")); + reinterpret_cast<int32_t (*)(uint64_t, uint32_t, int32_t*, uint32_t*, uint32_t*)>( + dlsym(mLibHandle, "disp_api_get_active_display_mode")); disp_api_set_active_display_mode = - reinterpret_cast<int32_t (*)(uint64_t, uint32_t, int32_t, uint32_t)>( - dlsym(mLibHandle, "disp_api_set_active_display_mode")); + reinterpret_cast<int32_t (*)(uint64_t, uint32_t, int32_t, uint32_t)>( + dlsym(mLibHandle, "disp_api_set_active_display_mode")); disp_api_get_default_display_mode = - reinterpret_cast<int32_t (*)(uint64_t, uint32_t, int32_t*, uint32_t*)>( - dlsym(mLibHandle, "disp_api_get_default_display_mode")); + reinterpret_cast<int32_t (*)(uint64_t, uint32_t, int32_t*, uint32_t*)>( + dlsym(mLibHandle, "disp_api_get_default_display_mode")); disp_api_set_default_display_mode = - reinterpret_cast<int32_t (*)(uint64_t, uint32_t, int32_t, uint32_t)>( - dlsym(mLibHandle, "disp_api_set_default_display_mode")); + reinterpret_cast<int32_t (*)(uint64_t, uint32_t, int32_t, uint32_t)>( + dlsym(mLibHandle, "disp_api_set_default_display_mode")); #ifdef LIVES_IN_SYSTEM if (isSupported()) { diff --git a/sdm/DisplayModes.h b/sdm/DisplayModes.h index 0dc8904..6012cb9 100644 --- a/sdm/DisplayModes.h +++ b/sdm/DisplayModes.h @@ -29,7 +29,7 @@ using ::android::hardware::Return; using ::android::hardware::Void; class DisplayModes : public IDisplayModes { - public: + public: DisplayModes(void* libHandle, uint64_t cookie); bool isSupported(); @@ -40,7 +40,7 @@ class DisplayModes : public IDisplayModes { Return<void> getDefaultDisplayMode(getDefaultDisplayMode_cb _hidl_cb) override; Return<bool> setDisplayMode(int32_t modeID, bool makeDefault) override; - private: + private: void* mLibHandle; uint64_t mCookie; diff --git a/sdm/PictureAdjustment.cpp b/sdm/PictureAdjustment.cpp index 4fa7313..ca0f14b 100644 --- a/sdm/PictureAdjustment.cpp +++ b/sdm/PictureAdjustment.cpp @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "PictureAdjustment.h" + #include <dlfcn.h> #include "Constants.h" -#include "PictureAdjustment.h" #include "Types.h" namespace vendor { @@ -34,16 +35,16 @@ PictureAdjustment::PictureAdjustment(void* libHandle, uint64_t cookie) { mLibHandle = libHandle; mCookie = cookie; disp_api_get_feature_version = - reinterpret_cast<int32_t (*)(uint64_t, uint32_t, void*, uint32_t*)>( - dlsym(mLibHandle, "disp_api_get_feature_version")); + reinterpret_cast<int32_t (*)(uint64_t, uint32_t, void*, uint32_t*)>( + dlsym(mLibHandle, "disp_api_get_feature_version")); disp_api_get_global_pa_range = reinterpret_cast<int32_t (*)(uint64_t, uint32_t, void*)>( - dlsym(mLibHandle, "disp_api_get_global_pa_range")); + dlsym(mLibHandle, "disp_api_get_global_pa_range")); disp_api_get_global_pa_config = - reinterpret_cast<int32_t (*)(uint64_t, uint32_t, uint32_t*, void*)>( - dlsym(mLibHandle, "disp_api_get_global_pa_config")); + reinterpret_cast<int32_t (*)(uint64_t, uint32_t, uint32_t*, void*)>( + dlsym(mLibHandle, "disp_api_get_global_pa_config")); disp_api_set_global_pa_config = - reinterpret_cast<int32_t (*)(uint64_t, uint32_t, uint32_t, void*)>( - dlsym(mLibHandle, "disp_api_set_global_pa_config")); + reinterpret_cast<int32_t (*)(uint64_t, uint32_t, uint32_t, void*)>( + dlsym(mLibHandle, "disp_api_set_global_pa_config")); memset(&mDefaultPictureAdjustment, 0, sizeof(HSIC)); } @@ -168,7 +169,7 @@ Return<void> PictureAdjustment::getContrastRange(getContrastRange_cb _hidl_cb) { } Return<void> PictureAdjustment::getSaturationThresholdRange( - getSaturationThresholdRange_cb _hidl_cb) { + getSaturationThresholdRange_cb _hidl_cb) { FloatRange range{}; hsic_ranges r{}; @@ -190,13 +191,13 @@ Return<void> PictureAdjustment::getPictureAdjustment(getPictureAdjustment_cb _hi } Return<void> PictureAdjustment::getDefaultPictureAdjustment( - getDefaultPictureAdjustment_cb _hidl_cb) { + getDefaultPictureAdjustment_cb _hidl_cb) { _hidl_cb(mDefaultPictureAdjustment); return Void(); } Return<bool> PictureAdjustment::setPictureAdjustment( - const ::vendor::lineage::livedisplay::V2_0::HSIC& hsic) { + const ::vendor::lineage::livedisplay::V2_0::HSIC& hsic) { hsic_config config = {0, {static_cast<int32_t>(hsic.hue), hsic.saturation, hsic.intensity, hsic.contrast, hsic.saturationThreshold}}; diff --git a/sdm/PictureAdjustment.h b/sdm/PictureAdjustment.h index 6eec20c..e3657d4 100644 --- a/sdm/PictureAdjustment.h +++ b/sdm/PictureAdjustment.h @@ -30,7 +30,7 @@ using ::android::hardware::Return; using ::android::hardware::Void; class PictureAdjustment : public IPictureAdjustment { - public: + public: PictureAdjustment(void* libHandle, uint64_t cookie); bool isSupported(); @@ -44,11 +44,11 @@ class PictureAdjustment : public IPictureAdjustment { Return<void> getPictureAdjustment(getPictureAdjustment_cb _hidl_cb) override; Return<void> getDefaultPictureAdjustment(getDefaultPictureAdjustment_cb _hidl_cb) override; Return<bool> setPictureAdjustment( - const ::vendor::lineage::livedisplay::V2_0::HSIC& hsic) override; + const ::vendor::lineage::livedisplay::V2_0::HSIC& hsic) override; static void updateDefaultPictureAdjustment(); - private: + private: void* mLibHandle; uint64_t mCookie; diff --git a/sdm/Utils.cpp b/sdm/Utils.cpp index add3bdf..e180629 100644 --- a/sdm/Utils.cpp +++ b/sdm/Utils.cpp @@ -15,6 +15,9 @@ * limitations under the License. */ +#include "Utils.h" + +#include <cutils/sockets.h> #include <errno.h> #include <fcntl.h> #include <poll.h> @@ -22,11 +25,8 @@ #include <stdio.h> #include <sys/stat.h> #include <unistd.h> -#include <string> -#include <cutils/sockets.h> - -#include "Utils.h" +#include <string> namespace vendor { namespace lineage { diff --git a/sdm/Utils.h b/sdm/Utils.h index 3624b87..4f4496d 100644 --- a/sdm/Utils.h +++ b/sdm/Utils.h @@ -27,7 +27,7 @@ namespace V2_0 { namespace sdm { class Utils { - public: + public: static int sendDPPSCommand(char* buf, size_t len); }; diff --git a/sdm/service.cpp b/sdm/service.cpp index 087698e..73e4f39 100644 --- a/sdm/service.cpp +++ b/sdm/service.cpp @@ -32,10 +32,10 @@ constexpr const char* SDM_DISP_LIBS[]{ #ifdef LIVES_IN_SYSTEM - "libsdm-disp-apis.qti.so", - "libsdm-disp-apis.so", + "libsdm-disp-apis.qti.so", + "libsdm-disp-apis.so", #else - "libsdm-disp-vndapis.so", + "libsdm-disp-vndapis.so", #endif }; @@ -91,14 +91,14 @@ int main() { } disp_api_init = - reinterpret_cast<int32_t (*)(uint64_t*, uint32_t)>(dlsym(libHandle, "disp_api_init")); + reinterpret_cast<int32_t (*)(uint64_t*, uint32_t)>(dlsym(libHandle, "disp_api_init")); if (disp_api_init == nullptr) { LOG(ERROR) << "Can not get disp_api_init from " << libName << " (" << dlerror() << ")"; goto shutdown; } disp_api_deinit = - reinterpret_cast<int32_t (*)(uint64_t, uint32_t)>(dlsym(libHandle, "disp_api_deinit")); + reinterpret_cast<int32_t (*)(uint64_t, uint32_t)>(dlsym(libHandle, "disp_api_deinit")); if (disp_api_deinit == nullptr) { LOG(ERROR) << "Can not get disp_api_deinit from " << libName << " (" << dlerror() << ")"; goto shutdown; @@ -112,8 +112,8 @@ int main() { ab = new AdaptiveBacklight(); if (ab == 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; } @@ -125,8 +125,8 @@ int main() { pa = new PictureAdjustment(libHandle, cookie); if (pa == nullptr) { - LOG(ERROR) - << "Can not create an instance of LiveDisplay HAL PictureAdjustment Iface, exiting."; + LOG(ERROR) << "Can not create an instance of LiveDisplay HAL PictureAdjustment Iface, " + "exiting."; goto shutdown; } diff --git a/sysfs/AdaptiveBacklight.cpp b/sysfs/AdaptiveBacklight.cpp index 6225e0e..a535e4d 100644 --- a/sysfs/AdaptiveBacklight.cpp +++ b/sysfs/AdaptiveBacklight.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ +#include "AdaptiveBacklight.h" + #include <android-base/file.h> #include <android-base/properties.h> #include <android-base/strings.h> #include <fstream> -#include "AdaptiveBacklight.h" - using android::base::GetBoolProperty; using android::base::ReadFileToString; using android::base::Trim; diff --git a/sysfs/AdaptiveBacklight.h b/sysfs/AdaptiveBacklight.h index 3137ff3..88fb69c 100644 --- a/sysfs/AdaptiveBacklight.h +++ b/sysfs/AdaptiveBacklight.h @@ -34,14 +34,14 @@ using ::android::hardware::Void; #define FILE_CABC "/sys/class/graphics/fb0/cabc" class AdaptiveBacklight : public IAdaptiveBacklight { - public: + public: bool isSupported(); // Methods from ::vendor::lineage::livedisplay::V2_0::IAdaptiveBacklight follow. Return<bool> isEnabled() override; Return<bool> setEnabled(bool enabled) override; - private: + private: std::string mFile; }; diff --git a/sysfs/AutoContrast.cpp b/sysfs/AutoContrast.cpp index 906f6a1..3d83589 100644 --- a/sysfs/AutoContrast.cpp +++ b/sysfs/AutoContrast.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ +#include "AutoContrast.h" + #include <android-base/file.h> #include <android-base/strings.h> #include <fstream> -#include "AutoContrast.h" - using android::base::ReadFileToString; using android::base::Trim; using android::base::WriteStringToFile; diff --git a/sysfs/AutoContrast.h b/sysfs/AutoContrast.h index 71ca9b5..63ce9f3 100644 --- a/sysfs/AutoContrast.h +++ b/sysfs/AutoContrast.h @@ -31,7 +31,7 @@ using ::android::hardware::Void; #define FILE_ACO "/sys/class/graphics/fb0/aco" class AutoContrast : public IAutoContrast { - public: + public: bool isSupported(); // Methods from ::vendor::lineage::livedisplay::V2_0::IAutoContrast follow. diff --git a/sysfs/ColorEnhancement.cpp b/sysfs/ColorEnhancement.cpp index 757d257..e635cb5 100644 --- a/sysfs/ColorEnhancement.cpp +++ b/sysfs/ColorEnhancement.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ +#include "ColorEnhancement.h" + #include <android-base/file.h> #include <android-base/strings.h> #include <fstream> -#include "ColorEnhancement.h" - using android::base::ReadFileToString; using android::base::Trim; using android::base::WriteStringToFile; diff --git a/sysfs/ColorEnhancement.h b/sysfs/ColorEnhancement.h index 780009f..ca4d0ad 100644 --- a/sysfs/ColorEnhancement.h +++ b/sysfs/ColorEnhancement.h @@ -31,7 +31,7 @@ using ::android::hardware::Void; #define FILE_CE "/sys/class/graphics/fb0/color_enhance" class ColorEnhancement : public IColorEnhancement { - public: + public: bool isSupported(); // Methods from ::vendor::lineage::livedisplay::V2_0::IColorEnhancement follow. diff --git a/sysfs/DisplayColorCalibration.cpp b/sysfs/DisplayColorCalibration.cpp index 1a4802e..5d7bd6d 100644 --- a/sysfs/DisplayColorCalibration.cpp +++ b/sysfs/DisplayColorCalibration.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ +#include "DisplayColorCalibration.h" + #include <android-base/file.h> #include <android-base/strings.h> #include <fstream> -#include "DisplayColorCalibration.h" - using android::base::ReadFileToString; using android::base::Split; using android::base::Trim; diff --git a/sysfs/DisplayColorCalibration.h b/sysfs/DisplayColorCalibration.h index f69d8c4..4767d90 100644 --- a/sysfs/DisplayColorCalibration.h +++ b/sysfs/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. diff --git a/sysfs/ReadingEnhancement.cpp b/sysfs/ReadingEnhancement.cpp index 0e4b92d..79e7d2f 100644 --- a/sysfs/ReadingEnhancement.cpp +++ b/sysfs/ReadingEnhancement.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ +#include "ReadingEnhancement.h" + #include <android-base/file.h> #include <android-base/strings.h> #include <fstream> -#include "ReadingEnhancement.h" - using android::base::ReadFileToString; using android::base::Trim; using android::base::WriteStringToFile; diff --git a/sysfs/ReadingEnhancement.h b/sysfs/ReadingEnhancement.h index cf4149e..6d35042 100644 --- a/sysfs/ReadingEnhancement.h +++ b/sysfs/ReadingEnhancement.h @@ -31,7 +31,7 @@ using ::android::hardware::Void; #define FILE_RE "/sys/class/graphics/fb0/reading_mode" class ReadingEnhancement : public IReadingEnhancement { - public: + public: bool isSupported(); // Methods from ::vendor::lineage::livedisplay::V2_0::IReadingEnhancement follow. diff --git a/sysfs/SunlightEnhancement.cpp b/sysfs/SunlightEnhancement.cpp index be97795..153b662 100644 --- a/sysfs/SunlightEnhancement.cpp +++ b/sysfs/SunlightEnhancement.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ +#include "SunlightEnhancement.h" + #include <android-base/file.h> #include <android-base/strings.h> #include <fstream> -#include "SunlightEnhancement.h" - using android::base::ReadFileToString; using android::base::Trim; using android::base::WriteStringToFile; diff --git a/sysfs/SunlightEnhancement.h b/sysfs/SunlightEnhancement.h index 6156e15..e32e4bf 100644 --- a/sysfs/SunlightEnhancement.h +++ b/sysfs/SunlightEnhancement.h @@ -32,14 +32,14 @@ using ::android::hardware::Void; #define FILE_SRE "/sys/class/graphics/fb0/sre" class SunlightEnhancement : public ISunlightEnhancement { - public: + public: bool isSupported(); // Methods from ::vendor::lineage::livedisplay::V2_0::ISunlightEnhancement follow. Return<bool> isEnabled() override; Return<bool> setEnabled(bool enabled) override; - private: + private: std::string mFile; int32_t mEnabledMode; }; diff --git a/sysfs/service.cpp b/sysfs/service.cpp index 72e953a..caae87d 100644 --- a/sysfs/service.cpp +++ b/sysfs/service.cpp @@ -65,8 +65,8 @@ int main() { ab = new AdaptiveBacklight(); if (ab == 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; } @@ -79,7 +79,7 @@ int main() { ce = new ColorEnhancement(); if (ce == nullptr) { LOG(ERROR) - << "Can not create an instance of LiveDisplay HAL ColorEnhancement Iface, exiting."; + << "Can not create an instance of LiveDisplay HAL ColorEnhancement Iface, exiting."; goto shutdown; } @@ -92,15 +92,15 @@ int main() { re = new ReadingEnhancement(); if (re == 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; } se = new SunlightEnhancement(); if (se == 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; } |