diff --git a/hidl/livedisplay/Android.bp b/hidl/livedisplay/Android.bp index dee4188..00fe3bb 100644 --- a/hidl/livedisplay/Android.bp +++ b/hidl/livedisplay/Android.bp @@ -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", diff --git a/hidl/livedisplay/SunlightEnhancement.cpp b/hidl/livedisplay/SunlightEnhancement.cpp index 78d0323..c5e98ff 100644 --- a/hidl/livedisplay/SunlightEnhancement.cpp +++ b/hidl/livedisplay/SunlightEnhancement.cpp @@ -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 SunlightEnhancement::isEnabled() { @@ -50,7 +50,7 @@ Return SunlightEnhancement::setEnabled(bool enabled) { } } // namespace implementation -} // namespace V2_0 +} // namespace V2_1 } // namespace livedisplay } // namespace lineage } // namespace vendor diff --git a/hidl/livedisplay/SunlightEnhancement.h b/hidl/livedisplay/SunlightEnhancement.h index 4fc68be..cc6528a 100644 --- a/hidl/livedisplay/SunlightEnhancement.h +++ b/hidl/livedisplay/SunlightEnhancement.h @@ -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 #include -#include +#include 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 diff --git a/hidl/livedisplay/service.cpp b/hidl/livedisplay/service.cpp index 8230f49..711fcdb 100644 --- a/hidl/livedisplay/service.cpp +++ b/hidl/livedisplay/service.cpp @@ -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 #include #include #include +#include #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; diff --git a/hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.oplus.rc b/hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.oplus.rc deleted file mode 100644 index 1911235..0000000 --- a/hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.oplus.rc +++ /dev/null @@ -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 diff --git a/hidl/livedisplay/vendor.lineage.livedisplay@2.1-service.oplus.rc b/hidl/livedisplay/vendor.lineage.livedisplay@2.1-service.oplus.rc new file mode 100644 index 0000000..7560319 --- /dev/null +++ b/hidl/livedisplay/vendor.lineage.livedisplay@2.1-service.oplus.rc @@ -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 diff --git a/hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.oplus.xml b/hidl/livedisplay/vendor.lineage.livedisplay@2.1-service.oplus.xml similarity index 77% rename from hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.oplus.xml rename to hidl/livedisplay/vendor.lineage.livedisplay@2.1-service.oplus.xml index f29a1b1..77c94f3 100644 --- a/hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.oplus.xml +++ b/hidl/livedisplay/vendor.lineage.livedisplay@2.1-service.oplus.xml @@ -2,10 +2,11 @@ vendor.lineage.livedisplay hwbinder - 2.0 + 2.1 ISunlightEnhancement default + @2.0::IPictureAdjustment/default