From 335e820c4c4469d0c19707b886f2f42c0c3684c1 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 27 Mar 2021 17:42:18 +0100 Subject: [PATCH] sm8250-common: livedisplay: Uprev to 2.1 Change-Id: I98b2ea16ed342339ee652d5cb79dcfd22f8c0a0d --- common.mk | 2 +- device_framework_matrix.xml | 2 +- livedisplay/Android.bp | 7 ++++--- livedisplay/DisplayModes.cpp | 8 ++++---- livedisplay/DisplayModes.h | 14 +++++++------- livedisplay/SunlightEnhancement.cpp | 4 ++-- livedisplay/SunlightEnhancement.h | 14 +++++++------- livedisplay/service.cpp | 13 +++++++------ ...ineage.livedisplay@2.1-service.oneplus_kona.rc} | 2 +- ...neage.livedisplay@2.1-service.oneplus_kona.xml} | 7 ++----- sepolicy/vendor/file_contexts | 2 +- 11 files changed, 37 insertions(+), 38 deletions(-) rename livedisplay/{vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc => vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc} (93%) rename livedisplay/{vendor.lineage.livedisplay@2.0-service.oneplus_kona.xml => vendor.lineage.livedisplay@2.1-service.oneplus_kona.xml} (72%) diff --git a/common.mk b/common.mk index 8230d1b..d684f95 100644 --- a/common.mk +++ b/common.mk @@ -319,7 +319,7 @@ PRODUCT_PACKAGES += \ # LiveDisplay PRODUCT_PACKAGES += \ - vendor.lineage.livedisplay@2.0-service.oneplus_kona + vendor.lineage.livedisplay@2.1-service.oneplus_kona # Media PRODUCT_COPY_FILES += \ diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml index 8edfc8a..63985ae 100644 --- a/device_framework_matrix.xml +++ b/device_framework_matrix.xml @@ -195,7 +195,7 @@ vendor.lineage.livedisplay - 2.0 + 2.1 IDisplayModes default diff --git a/livedisplay/Android.bp b/livedisplay/Android.bp index bdd6f27..a4c736d 100644 --- a/livedisplay/Android.bp +++ b/livedisplay/Android.bp @@ -14,9 +14,9 @@ // limitations under the License. cc_binary { - name: "vendor.lineage.livedisplay@2.0-service.oneplus_kona", - init_rc: ["vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc"], - vintf_fragments: ["vendor.lineage.livedisplay@2.0-service.oneplus_kona.xml"], + name: "vendor.lineage.livedisplay@2.1-service.oneplus_kona", + init_rc: ["vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc"], + vintf_fragments: ["vendor.lineage.livedisplay@2.1-service.oneplus_kona.xml"], defaults: ["hidl_defaults"], relative_install_path: "hw", srcs: [ @@ -32,6 +32,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/livedisplay/DisplayModes.cpp b/livedisplay/DisplayModes.cpp index b95eec4..f3bf27f 100644 --- a/livedisplay/DisplayModes.cpp +++ b/livedisplay/DisplayModes.cpp @@ -26,7 +26,7 @@ namespace vendor { namespace lineage { namespace livedisplay { -namespace V2_0 { +namespace V2_1 { namespace implementation { static constexpr const char* kDisplayModeProp = "vendor.display.mode"; @@ -60,9 +60,9 @@ DisplayModes::DisplayModes() : mDefaultModeId(0) { } } -// Methods from ::vendor::lineage::livedisplay::V2_0::IDisplayModes follow. +// Methods from ::vendor::lineage::livedisplay::V2_1::IDisplayModes follow. Return DisplayModes::getDisplayModes(getDisplayModes_cb resultCb) { - std::vector modes; + std::vector modes; for (const auto& entry : kModeMap) { modes.push_back({entry.first, entry.second.name}); @@ -136,7 +136,7 @@ Return DisplayModes::setDisplayMode(int32_t modeID, bool makeDefault) { } } // namespace implementation -} // namespace V2_0 +} // namespace V2_1 } // namespace livedisplay } // namespace lineage } // namespace vendor diff --git a/livedisplay/DisplayModes.h b/livedisplay/DisplayModes.h index c0554d9..a0eaa03 100644 --- a/livedisplay/DisplayModes.h +++ b/livedisplay/DisplayModes.h @@ -14,18 +14,18 @@ * limitations under the License. */ -#ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_0_DISPLAYMODES_H -#define VENDOR_LINEAGE_LIVEDISPLAY_V2_0_DISPLAYMODES_H +#ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_1_DISPLAYMODES_H +#define VENDOR_LINEAGE_LIVEDISPLAY_V2_1_DISPLAYMODES_H #include #include -#include +#include #include namespace vendor { namespace lineage { namespace livedisplay { -namespace V2_0 { +namespace V2_1 { namespace implementation { using ::android::hardware::Return; @@ -36,7 +36,7 @@ class DisplayModes : public IDisplayModes { public: DisplayModes(); - // Methods from ::vendor::lineage::livedisplay::V2_0::IDisplayModes follow. + // Methods from ::vendor::lineage::livedisplay::V2_1::IDisplayModes follow. Return getDisplayModes(getDisplayModes_cb resultCb) override; Return getCurrentDisplayMode(getCurrentDisplayMode_cb resultCb) override; Return getDefaultDisplayMode(getDefaultDisplayMode_cb ResultCb) override; @@ -52,9 +52,9 @@ class DisplayModes : public IDisplayModes { }; } // namespace implementation -} // namespace V2_0 +} // namespace V2_1 } // namespace livedisplay } // namespace lineage } // namespace vendor -#endif // VENDOR_LINEAGE_LIVEDISPLAY_V2_0_DISPLAYMODES_H +#endif // VENDOR_LINEAGE_LIVEDISPLAY_V2_1_DISPLAYMODES_H diff --git a/livedisplay/SunlightEnhancement.cpp b/livedisplay/SunlightEnhancement.cpp index e51cf7d..f773732 100644 --- a/livedisplay/SunlightEnhancement.cpp +++ b/livedisplay/SunlightEnhancement.cpp @@ -23,7 +23,7 @@ namespace vendor { namespace lineage { namespace livedisplay { -namespace V2_0 { +namespace V2_1 { namespace implementation { static constexpr const char* kHbmPath = @@ -45,7 +45,7 @@ Return SunlightEnhancement::setEnabled(bool enabled) { } } // namespace implementation -} // namespace V2_0 +} // namespace V2_1 } // namespace livedisplay } // namespace lineage } // namespace vendor diff --git a/livedisplay/SunlightEnhancement.h b/livedisplay/SunlightEnhancement.h index 60c64dc..80d361a 100644 --- a/livedisplay/SunlightEnhancement.h +++ b/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; @@ -33,15 +33,15 @@ using ::android::sp; class SunlightEnhancement : public ISunlightEnhancement { public: - // Methods from ::vendor::lineage::livedisplay::V2_0::ISunlightEnhancement follow. + // Methods from ::vendor::lineage::livedisplay::V2_1::ISunlightEnhancement follow. Return isEnabled() override; Return setEnabled(bool enabled) override; }; } // 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/livedisplay/service.cpp b/livedisplay/service.cpp index 1733727..c4dc161 100644 --- a/livedisplay/service.cpp +++ b/livedisplay/service.cpp @@ -14,12 +14,13 @@ * limitations under the License. */ -#define LOG_TAG "vendor.lineage.livedisplay@2.0-service.oneplus_kona" +#define LOG_TAG "vendor.lineage.livedisplay@2.1-service.oneplus_kona" #include #include #include #include +#include #include "DisplayModes.h" #include "SunlightEnhancement.h" @@ -30,13 +31,13 @@ using android::status_t; using android::hardware::configureRpcThreadpool; using android::hardware::joinRpcThreadpool; -using ::vendor::lineage::livedisplay::V2_0::IDisplayModes; -using ::vendor::lineage::livedisplay::V2_0::IPictureAdjustment; -using ::vendor::lineage::livedisplay::V2_0::ISunlightEnhancement; -using ::vendor::lineage::livedisplay::V2_0::implementation::DisplayModes; -using ::vendor::lineage::livedisplay::V2_0::implementation::SunlightEnhancement; using ::vendor::lineage::livedisplay::V2_0::sdm::PictureAdjustment; using ::vendor::lineage::livedisplay::V2_0::sdm::SDMController; +using ::vendor::lineage::livedisplay::V2_1::IDisplayModes; +using ::vendor::lineage::livedisplay::V2_1::IPictureAdjustment; +using ::vendor::lineage::livedisplay::V2_1::ISunlightEnhancement; +using ::vendor::lineage::livedisplay::V2_1::implementation::DisplayModes; +using ::vendor::lineage::livedisplay::V2_1::implementation::SunlightEnhancement; int main() { status_t status = OK; diff --git a/livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc b/livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc similarity index 93% rename from livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc rename to livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc index 9f2986c..12d8e41 100644 --- a/livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc +++ b/livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc @@ -14,7 +14,7 @@ on init chmod 0666 /sys/class/drm/card0-DSI-1/native_display_srgb_color_mode chmod 0666 /sys/class/drm/card0-DSI-1/native_display_wide_color_mode -service vendor.livedisplay-hal-2-0 /vendor/bin/hw/vendor.lineage.livedisplay@2.0-service.oneplus_kona +service vendor.livedisplay-hal-2-1 /vendor/bin/hw/vendor.lineage.livedisplay@2.1-service.oneplus_kona class hal user system group system diff --git a/livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.xml b/livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.xml similarity index 72% rename from livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.xml rename to livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.xml index 9e02776..0e3a630 100644 --- a/livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.xml +++ b/livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.xml @@ -2,18 +2,15 @@ vendor.lineage.livedisplay hwbinder - 2.0 + 2.1 IDisplayModes default - - IPictureAdjustment - default - ISunlightEnhancement default + @2.0::IPictureAdjustment/default diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 17459c3..462e0ec 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -50,7 +50,7 @@ # HALs /(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.oneplus_kona u:object_r:hal_fingerprint_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.biometrics\.fingerprint\.inscreen@1\.0-service\.oneplus_kona u:object_r:hal_lineage_fod_default_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.0-service\.oneplus_kona u:object_r:hal_lineage_livedisplay_qti_exec:s0 +/(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.1-service\.oneplus_kona u:object_r:hal_lineage_livedisplay_qti_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.powershare@1\.0-service\.oneplus_kona u:object_r:hal_lineage_powershare_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.oneplus_kona u:object_r:hal_lineage_touch_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.camera@1\.0-service u:object_r:hal_cameraHIDL_default_exec:s0