gts3l-common: livedisplay: Remove unsupported features
Remove these features - AdaptiveBacklight - DisplayColorCalibration - SunlightEnhancement Signed-off-by: Deokgyu Yang <secugyu@gmail.com> Change-Id: I892ce422e98b3f8b7c355e178ef42aadf26bb4c8
This commit is contained in:
parent
e564a02a7b
commit
19d84a995c
9 changed files with 0 additions and 454 deletions
|
@ -1,61 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2019 The LineageOS Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <android-base/file.h>
|
||||
#include <android-base/strings.h>
|
||||
|
||||
#include <fstream>
|
||||
|
||||
#include "AdaptiveBacklight.h"
|
||||
|
||||
using android::base::ReadFileToString;
|
||||
using android::base::Trim;
|
||||
using android::base::WriteStringToFile;
|
||||
|
||||
namespace vendor {
|
||||
namespace lineage {
|
||||
namespace livedisplay {
|
||||
namespace V2_0 {
|
||||
namespace samsung {
|
||||
|
||||
static constexpr const char* kBacklightPath = "/sys/class/lcd/panel/power_reduce";
|
||||
|
||||
bool AdaptiveBacklight::isSupported() {
|
||||
std::fstream backlight(kBacklightPath, backlight.in | backlight.out);
|
||||
return backlight.good();
|
||||
}
|
||||
|
||||
// Methods from ::vendor::lineage::livedisplay::V2_0::IAdaptiveBacklight follow.
|
||||
Return<bool> AdaptiveBacklight::isEnabled() {
|
||||
std::string tmp;
|
||||
int32_t contents = 0;
|
||||
|
||||
if (ReadFileToString(kBacklightPath, &tmp)) {
|
||||
contents = std::stoi(Trim(tmp));
|
||||
}
|
||||
|
||||
return contents > 0;
|
||||
}
|
||||
|
||||
Return<bool> AdaptiveBacklight::setEnabled(bool enabled) {
|
||||
return WriteStringToFile(enabled ? "1" : "0", kBacklightPath, true);
|
||||
}
|
||||
|
||||
} // namespace samsung
|
||||
} // namespace V2_0
|
||||
} // namespace livedisplay
|
||||
} // namespace lineage
|
||||
} // namespace vendor
|
|
@ -1,55 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2019 The LineageOS Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_0_ADAPTIVEBACKLIGHT_H
|
||||
#define VENDOR_LINEAGE_LIVEDISPLAY_V2_0_ADAPTIVEBACKLIGHT_H
|
||||
|
||||
#include <hidl/MQDescriptor.h>
|
||||
#include <hidl/Status.h>
|
||||
#include <vendor/lineage/livedisplay/2.0/IAdaptiveBacklight.h>
|
||||
|
||||
namespace vendor {
|
||||
namespace lineage {
|
||||
namespace livedisplay {
|
||||
namespace V2_0 {
|
||||
namespace samsung {
|
||||
|
||||
using ::android::hardware::hidl_array;
|
||||
using ::android::hardware::hidl_memory;
|
||||
using ::android::hardware::hidl_string;
|
||||
using ::android::hardware::hidl_vec;
|
||||
using ::android::hardware::Return;
|
||||
using ::android::hardware::Void;
|
||||
using ::android::sp;
|
||||
|
||||
class AdaptiveBacklight : public IAdaptiveBacklight {
|
||||
public:
|
||||
bool isSupported();
|
||||
|
||||
// Methods from ::vendor::lineage::livedisplay::V2_0::IAdaptiveBacklight follow.
|
||||
Return<bool> isEnabled() override;
|
||||
Return<bool> setEnabled(bool enabled) override;
|
||||
|
||||
// Methods from ::android::hidl::base::V1_0::IBase follow.
|
||||
};
|
||||
|
||||
} // namespace samsung
|
||||
} // namespace V2_0
|
||||
} // namespace livedisplay
|
||||
} // namespace lineage
|
||||
} // namespace vendor
|
||||
|
||||
#endif // VENDOR_LINEAGE_LIVEDISPLAY_V2_0_ADAPTIVEBACKLIGHT_H
|
|
@ -17,11 +17,8 @@ cc_defaults {
|
|||
defaults: ["hidl_defaults"],
|
||||
relative_install_path: "hw",
|
||||
srcs: [
|
||||
"AdaptiveBacklight.cpp",
|
||||
"DisplayColorCalibration.cpp",
|
||||
"DisplayModes.cpp",
|
||||
"ReadingEnhancement.cpp",
|
||||
"SunlightEnhancement.cpp",
|
||||
"service.cpp",
|
||||
],
|
||||
shared_libs: [
|
||||
|
|
|
@ -1,79 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2019 The LineageOS Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#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;
|
||||
using android::base::WriteStringToFile;
|
||||
|
||||
namespace vendor {
|
||||
namespace lineage {
|
||||
namespace livedisplay {
|
||||
namespace V2_0 {
|
||||
namespace samsung {
|
||||
|
||||
bool DisplayColorCalibration::isSupported() {
|
||||
std::fstream rgb(FILE_RGB, rgb.in | rgb.out);
|
||||
|
||||
return rgb.good();
|
||||
}
|
||||
|
||||
// Methods from ::vendor::lineage::livedisplay::V2_0::IDisplayColorCalibration follow.
|
||||
Return<int32_t> DisplayColorCalibration::getMaxValue() {
|
||||
return 255;
|
||||
}
|
||||
|
||||
Return<int32_t> DisplayColorCalibration::getMinValue() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
Return<void> DisplayColorCalibration::getCalibration(getCalibration_cb _hidl_cb) {
|
||||
std::vector<int32_t> rgb;
|
||||
std::string tmp;
|
||||
|
||||
if (ReadFileToString(FILE_RGB, &tmp)) {
|
||||
std::vector<std::string> colors = Split(Trim(tmp), " ");
|
||||
for (const std::string& color : colors) {
|
||||
rgb.push_back(std::stoi(color));
|
||||
}
|
||||
}
|
||||
|
||||
_hidl_cb(rgb);
|
||||
return Void();
|
||||
}
|
||||
|
||||
Return<bool> DisplayColorCalibration::setCalibration(const hidl_vec<int32_t>& rgb) {
|
||||
std::string contents;
|
||||
|
||||
for (const int32_t& color : rgb) {
|
||||
contents += std::to_string(color) + " ";
|
||||
}
|
||||
|
||||
return WriteStringToFile(Trim(contents), FILE_RGB, true);
|
||||
}
|
||||
|
||||
} // namespace samsung
|
||||
} // namespace V2_0
|
||||
} // namespace livedisplay
|
||||
} // namespace lineage
|
||||
} // namespace vendor
|
|
@ -1,51 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2019 The LineageOS Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_0_DISPLAYCOLORCALIBRATION_H
|
||||
#define VENDOR_LINEAGE_LIVEDISPLAY_V2_0_DISPLAYCOLORCALIBRATION_H
|
||||
|
||||
#include <vendor/lineage/livedisplay/2.0/IDisplayColorCalibration.h>
|
||||
|
||||
namespace vendor {
|
||||
namespace lineage {
|
||||
namespace livedisplay {
|
||||
namespace V2_0 {
|
||||
namespace samsung {
|
||||
|
||||
using ::android::hardware::hidl_vec;
|
||||
using ::android::hardware::Return;
|
||||
using ::android::hardware::Void;
|
||||
|
||||
#define FILE_RGB "/sys/class/mdnie/mdnie/sensorRGB"
|
||||
|
||||
class DisplayColorCalibration : public IDisplayColorCalibration {
|
||||
public:
|
||||
bool isSupported();
|
||||
|
||||
// Methods from ::vendor::lineage::livedisplay::V2_0::IDisplayColorCalibration follow.
|
||||
Return<int32_t> getMaxValue() override;
|
||||
Return<int32_t> getMinValue() override;
|
||||
Return<void> getCalibration(getCalibration_cb _hidl_cb) override;
|
||||
Return<bool> setCalibration(const hidl_vec<int32_t>& rgb) override;
|
||||
};
|
||||
|
||||
} // namespace samsung
|
||||
} // namespace V2_0
|
||||
} // namespace livedisplay
|
||||
} // namespace lineage
|
||||
} // namespace vendor
|
||||
|
||||
#endif // VENDOR_LINEAGE_LIVEDISPLAY_V2_0_DISPLAYCOLORCALIBRATION_H
|
|
@ -1,77 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2019 The LineageOS Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#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;
|
||||
|
||||
namespace vendor {
|
||||
namespace lineage {
|
||||
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";
|
||||
|
||||
// Methods from ::vendor::lineage::livedisplay::V2_0::ISunlightEnhancement follow.
|
||||
bool SunlightEnhancement::isSupported() {
|
||||
std::fstream sre(kSREPath, sre.in | sre.out);
|
||||
std::fstream hbm(kHBMPath, hbm.in | hbm.out);
|
||||
|
||||
if (hbm.good()) {
|
||||
mHasHBM = true;
|
||||
}
|
||||
|
||||
return sre.good();
|
||||
}
|
||||
|
||||
// Methods from ::vendor::lineage::livedisplay::V2_0::IAdaptiveBacklight follow.
|
||||
Return<bool> SunlightEnhancement::isEnabled() {
|
||||
std::string tmp;
|
||||
int32_t statusSRE = 0;
|
||||
int32_t statusHBM = 0;
|
||||
if (ReadFileToString(kSREPath, &tmp)) {
|
||||
statusSRE = std::stoi(Trim(tmp));
|
||||
}
|
||||
|
||||
if (mHasHBM && ReadFileToString(kHBMPath, &tmp)) {
|
||||
statusHBM = std::stoi(Trim(tmp));
|
||||
}
|
||||
|
||||
return ((statusSRE == 1 && statusHBM == 6) || statusSRE == 1);
|
||||
}
|
||||
|
||||
Return<bool> SunlightEnhancement::setEnabled(bool enabled) {
|
||||
if (mHasHBM) {
|
||||
WriteStringToFile(enabled ? "6" : "0", kHBMPath, true);
|
||||
}
|
||||
|
||||
return WriteStringToFile(enabled ? "1" : "0", kSREPath, true);
|
||||
}
|
||||
|
||||
} // namespace samsung
|
||||
} // namespace V2_0
|
||||
} // namespace livedisplay
|
||||
} // namespace lineage
|
||||
} // namespace vendor
|
|
@ -1,57 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2019 The LineageOS Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_0_SUNLIGHTENHANCEMENT_H
|
||||
#define VENDOR_LINEAGE_LIVEDISPLAY_V2_0_SUNLIGHTENHANCEMENT_H
|
||||
|
||||
#include <hidl/MQDescriptor.h>
|
||||
#include <hidl/Status.h>
|
||||
#include <vendor/lineage/livedisplay/2.0/ISunlightEnhancement.h>
|
||||
|
||||
namespace vendor {
|
||||
namespace lineage {
|
||||
namespace livedisplay {
|
||||
namespace V2_0 {
|
||||
namespace samsung {
|
||||
|
||||
using ::android::hardware::hidl_array;
|
||||
using ::android::hardware::hidl_memory;
|
||||
using ::android::hardware::hidl_string;
|
||||
using ::android::hardware::hidl_vec;
|
||||
using ::android::hardware::Return;
|
||||
using ::android::hardware::Void;
|
||||
using ::android::sp;
|
||||
|
||||
class SunlightEnhancement : public ISunlightEnhancement {
|
||||
public:
|
||||
bool isSupported();
|
||||
|
||||
// Methods from ::vendor::lineage::livedisplay::V2_0::ISunlightEnhancement follow.
|
||||
Return<bool> isEnabled() override;
|
||||
Return<bool> setEnabled(bool enabled) override;
|
||||
|
||||
// Methods from ::android::hidl::base::V1_0::IBase follow.
|
||||
private:
|
||||
bool mHasHBM = false;
|
||||
};
|
||||
|
||||
} // namespace samsung
|
||||
} // namespace V2_0
|
||||
} // namespace livedisplay
|
||||
} // namespace lineage
|
||||
} // namespace vendor
|
||||
|
||||
#endif // VENDOR_LINEAGE_LIVEDISPLAY_V2_0_SUNLIGHTENHANCEMENT_H
|
|
@ -24,11 +24,8 @@
|
|||
#include <binder/ProcessState.h>
|
||||
#include <hidl/HidlTransportSupport.h>
|
||||
|
||||
#include "AdaptiveBacklight.h"
|
||||
#include "DisplayColorCalibration.h"
|
||||
#include "DisplayModes.h"
|
||||
#include "ReadingEnhancement.h"
|
||||
#include "SunlightEnhancement.h"
|
||||
|
||||
using android::hardware::configureRpcThreadpool;
|
||||
using android::hardware::joinRpcThreadpool;
|
||||
|
@ -36,36 +33,16 @@ using android::sp;
|
|||
using android::status_t;
|
||||
using android::OK;
|
||||
|
||||
using vendor::lineage::livedisplay::V2_0::samsung::AdaptiveBacklight;
|
||||
using vendor::lineage::livedisplay::V2_0::samsung::DisplayColorCalibration;
|
||||
using vendor::lineage::livedisplay::V2_0::samsung::DisplayModes;
|
||||
using vendor::lineage::livedisplay::V2_0::samsung::ReadingEnhancement;
|
||||
using vendor::lineage::livedisplay::V2_0::samsung::SunlightEnhancement;
|
||||
|
||||
int main() {
|
||||
sp<AdaptiveBacklight> adaptiveBacklight;
|
||||
sp<DisplayColorCalibration> displayColorCalibration;
|
||||
sp<DisplayModes> displayModes;
|
||||
sp<ReadingEnhancement> readingEnhancement;
|
||||
sp<SunlightEnhancement> sunlightEnhancement;
|
||||
status_t status;
|
||||
|
||||
LOG(INFO) << "LiveDisplay HAL service is starting.";
|
||||
|
||||
adaptiveBacklight = new AdaptiveBacklight();
|
||||
if (adaptiveBacklight == nullptr) {
|
||||
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.";
|
||||
goto shutdown;
|
||||
}
|
||||
|
||||
displayModes = new DisplayModes();
|
||||
if (displayModes == nullptr) {
|
||||
LOG(ERROR) << "Can not create an instance of LiveDisplay HAL DisplayModes Iface, exiting.";
|
||||
|
@ -79,34 +56,8 @@ int main() {
|
|||
goto shutdown;
|
||||
}
|
||||
|
||||
sunlightEnhancement = new SunlightEnhancement();
|
||||
if (sunlightEnhancement == nullptr) {
|
||||
LOG(ERROR)
|
||||
<< "Can not create an instance of LiveDisplay HAL SunlightEnhancement Iface, exiting.";
|
||||
goto shutdown;
|
||||
}
|
||||
|
||||
configureRpcThreadpool(1, true /*callerWillJoin*/);
|
||||
|
||||
if (adaptiveBacklight->isSupported()) {
|
||||
status = adaptiveBacklight->registerAsService();
|
||||
if (status != OK) {
|
||||
LOG(ERROR) << "Could not register service for LiveDisplay HAL AdaptiveBacklight Iface ("
|
||||
<< status << ")";
|
||||
goto shutdown;
|
||||
}
|
||||
}
|
||||
|
||||
if (displayColorCalibration->isSupported()) {
|
||||
status = displayColorCalibration->registerAsService();
|
||||
if (status != OK) {
|
||||
LOG(ERROR)
|
||||
<< "Could not register service for LiveDisplay HAL DisplayColorCalibration Iface ("
|
||||
<< status << ")";
|
||||
goto shutdown;
|
||||
}
|
||||
}
|
||||
|
||||
if (displayModes->isSupported()) {
|
||||
status = displayModes->registerAsService();
|
||||
if (status != OK) {
|
||||
|
@ -126,16 +77,6 @@ int main() {
|
|||
}
|
||||
}
|
||||
|
||||
if (sunlightEnhancement->isSupported()) {
|
||||
status = sunlightEnhancement->registerAsService();
|
||||
if (status != OK) {
|
||||
LOG(ERROR)
|
||||
<< "Could not register service for LiveDisplay HAL SunlightEnhancement Iface ("
|
||||
<< status << ")";
|
||||
goto shutdown;
|
||||
}
|
||||
}
|
||||
|
||||
LOG(INFO) << "LiveDisplay HAL service is ready.";
|
||||
joinRpcThreadpool();
|
||||
// Should not pass this line
|
||||
|
|
12
manifest.xml
12
manifest.xml
|
@ -266,14 +266,6 @@
|
|||
<name>vendor.lineage.livedisplay</name>
|
||||
<transport>hwbinder</transport>
|
||||
<version>2.0</version>
|
||||
<interface>
|
||||
<name>IDisplayColorCalibration</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
<interface>
|
||||
<name>IAdaptiveBacklight</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
<interface>
|
||||
<name>IDisplayModes</name>
|
||||
<instance>default</instance>
|
||||
|
@ -282,10 +274,6 @@
|
|||
<name>IReadingEnhancement</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
<interface>
|
||||
<name>ISunlightEnhancement</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
</hal>
|
||||
<hal format="hidl">
|
||||
<name>vendor.qti.gnss</name>
|
||||
|
|
Loading…
Reference in a new issue