BOBtheBlinker/android_device_oneplus_dre
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sm8250-common: livedisplay: Uprev to 2.1

Browse source 
Change-Id: I98b2ea16ed342339ee652d5cb79dcfd22f8c0a0d
This commit is contained in:
LuK1337 2021-03-27 17:42:18 +01:00 committed by Łukasz Patron
parent 880e595f0d
commit 335e820c4c
11 changed files with 37 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common.mk
View file

@ -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 += \

2
device_framework_matrix.xml
View file

@ -195,7 +195,7 @@
</hal>
<hal format="hidl" optional="true">
<name>vendor.lineage.livedisplay</name>
<version>2.0</version>
<version>2.1</version>
<interface>
<name>IDisplayModes</name>
<instance>default</instance>

7
livedisplay/Android.bp
View file

@ -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",

8
livedisplay/DisplayModes.cpp
View file

@ -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<void> DisplayModes::getDisplayModes(getDisplayModes_cb resultCb) {
std::vector<DisplayMode> modes;
std::vector<V2_0::DisplayMode> modes;
for (const auto& entry : kModeMap) {
modes.push_back({entry.first, entry.second.name});
@ -136,7 +136,7 @@ Return<bool> DisplayModes::setDisplayMode(int32_t modeID, bool makeDefault) {
}
} // namespace implementation
} // namespace V2_0
} // namespace V2_1
} // namespace livedisplay
} // namespace lineage
} // namespace vendor

14
livedisplay/DisplayModes.h
View file

@ -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 <hidl/MQDescriptor.h>
#include <hidl/Status.h>
#include <vendor/lineage/livedisplay/2.0/IDisplayModes.h>
#include <vendor/lineage/livedisplay/2.1/IDisplayModes.h>
#include <map>
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<void> getDisplayModes(getDisplayModes_cb resultCb) override;
Return<void> getCurrentDisplayMode(getCurrentDisplayMode_cb resultCb) override;
Return<void> 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

4
livedisplay/SunlightEnhancement.cpp
View file

@ -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<bool> SunlightEnhancement::setEnabled(bool enabled) {
}
} // namespace implementation
} // namespace V2_0
} // namespace V2_1
} // namespace livedisplay
} // namespace lineage
} // namespace vendor

14
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;
@ -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<bool> isEnabled() override;
Return<bool> 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

13
livedisplay/service.cpp
View file

@ -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 <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 "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;

2
livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc → livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc
View file

@ -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

7
livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.xml → livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.xml
View file

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

2
sepolicy/vendor/file_contexts vendored
View file

@ -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