psmattas/hardware_oplus-CherishOS
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

livedisplay: Uprev to 2.1

Browse Source 
Change-Id: I98b2ea16ed342339ee652d5cb79dcfd22f8c0a0d
This commit is contained in:
LuK1337
2021-03-27 17:42:18 +01:00
parent 21edb37c1f
commit 9e7b514023
7 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hidl/livedisplay/Android.bp
View File

@@ -13,10 +13,10 @@
// limitations under the License.
cc_binary {
name: "vendor.lineage.livedisplay@2.0-service.oplus",
name: "vendor.lineage.livedisplay@2.1-service.oplus",
defaults: ["hidl_defaults"],
init_rc: ["vendor.lineage.livedisplay@2.0-service.oplus.rc"],
vintf_fragments: ["vendor.lineage.livedisplay@2.0-service.oplus.xml"],
init_rc: ["vendor.lineage.livedisplay@2.1-service.oplus.rc"],
vintf_fragments: ["vendor.lineage.livedisplay@2.1-service.oplus.xml"],
relative_install_path: "hw",
srcs: [
":vendor.lineage.livedisplay@2.0-sdm-pa",
@@ -30,6 +30,7 @@ cc_binary {
"libhidlbase",
"libutils",
"vendor.lineage.livedisplay@2.0",
"vendor.lineage.livedisplay@2.1",
],
header_libs: [
"vendor.lineage.livedisplay@2.0-sdm-headers",

4
hidl/livedisplay/SunlightEnhancement.cpp
View File

@@ -31,7 +31,7 @@ constexpr const char* kHbmPath = "/sys/kernel/oplus_display/hbm";
namespace vendor {
namespace lineage {
namespace livedisplay {
namespace V2_0 {
namespace V2_1 {
namespace implementation {
Return<bool> SunlightEnhancement::isEnabled() {
@@ -50,7 +50,7 @@ Return<bool> SunlightEnhancement::setEnabled(bool enabled) {
}
} // namespace implementation
} // namespace V2_0
} // namespace V2_1
} // namespace livedisplay
} // namespace lineage
} // namespace vendor

12
hidl/livedisplay/SunlightEnhancement.h
View File

@@ -14,17 +14,17 @@
* limitations under the License.
*/
#ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_0_SUNLIGHTENHANCEMENT_H
#define VENDOR_LINEAGE_LIVEDISPLAY_V2_0_SUNLIGHTENHANCEMENT_H
#ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_1_SUNLIGHTENHANCEMENT_H
#define VENDOR_LINEAGE_LIVEDISPLAY_V2_1_SUNLIGHTENHANCEMENT_H
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
#include <vendor/lineage/livedisplay/2.0/ISunlightEnhancement.h>
#include <vendor/lineage/livedisplay/2.1/ISunlightEnhancement.h>
namespace vendor {
namespace lineage {
namespace livedisplay {
namespace V2_0 {
namespace V2_1 {
namespace implementation {
using ::android::hardware::Return;
@@ -39,9 +39,9 @@ class SunlightEnhancement : public ISunlightEnhancement {
};
} // namespace implementation
} // namespace V2_0
} // namespace V2_1
} // namespace livedisplay
} // namespace lineage
} // namespace vendor
#endif // VENDOR_LINEAGE_LIVEDISPLAY_V2_0_SUNLIGHTENHANCEMENT_H
#endif // VENDOR_LINEAGE_LIVEDISPLAY_V2_1_SUNLIGHTENHANCEMENT_H

8
hidl/livedisplay/service.cpp
View File

@@ -14,12 +14,13 @@
* limitations under the License.
*/
#define LOG_TAG "vendor.lineage.livedisplay@2.0-service-oplus"
#define LOG_TAG "vendor.lineage.livedisplay@2.1-service-oplus"
#include <android-base/logging.h>
#include <binder/ProcessState.h>
#include <hidl/HidlTransportSupport.h>
#include <livedisplay/sdm/PictureAdjustment.h>
#include <vendor/lineage/livedisplay/2.1/IPictureAdjustment.h>
#include "SunlightEnhancement.h"
@@ -31,8 +32,9 @@ using ::android::hardware::joinRpcThreadpool;
using ::vendor::lineage::livedisplay::V2_0::sdm::PictureAdjustment;
using ::vendor::lineage::livedisplay::V2_0::sdm::SDMController;
using ::vendor::lineage::livedisplay::V2_0::ISunlightEnhancement;
using ::vendor::lineage::livedisplay::V2_0::implementation::SunlightEnhancement;
using ::vendor::lineage::livedisplay::V2_1::IPictureAdjustment;
using ::vendor::lineage::livedisplay::V2_1::ISunlightEnhancement;
using ::vendor::lineage::livedisplay::V2_1::implementation::SunlightEnhancement;
int main() {
status_t status = OK;

4
hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.oplus.rc
View File

@@ -1,4 +0,0 @@
service vendor.livedisplay-hal-2-0 /vendor/bin/hw/vendor.lineage.livedisplay@2.0-service.oplus
class hal
user system
group system

4
hidl/livedisplay/vendor.lineage.livedisplay@2.1-service.oplus.rc Normal file
View File

@@ -0,0 +1,4 @@
service vendor.livedisplay-hal-2-1 /vendor/bin/hw/vendor.lineage.livedisplay@2.1-service.oplus
class hal
user system
group system

3
hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.oplus.xml → hidl/livedisplay/vendor.lineage.livedisplay@2.1-service.oplus.xml
View File

@@ -2,10 +2,11 @@
<hal format="hidl">
<name>vendor.lineage.livedisplay</name>
<transport>hwbinder</transport>
<version>2.0</version>
<version>2.1</version>
<interface>
<name>ISunlightEnhancement</name>
<instance>default</instance>
</interface>
<fqname>@2.0::IPictureAdjustment/default</fqname>
</hal>
</manifest>