donjohanliebert/device_xiaomi_sm6150-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sm6150-common: livedisplay: Uprev to 2.1

Browse Source 
Change-Id: Icd9d97078cb339aaff04d7e0a52ce8b9b97d35de
This commit is contained in:
Arian 2021-03-27 17:16:52 +01:00
parent afb4a21c3f
commit 6d05622ab1
No known key found for this signature in database
GPG Key ID: 48029380598CE3B9
11 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
livedisplay/Android.bp
View File

@ -14,10 +14,10 @@
// limitations under the License.
cc_binary {
name: "vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150",
name: "vendor.lineage.livedisplay@2.1-service.xiaomi_sm6150",
defaults: ["hidl_defaults"],
vintf_fragments: ["vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.xml"],
init_rc: ["vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.rc"],
vintf_fragments: ["vendor.lineage.livedisplay@2.1-service.xiaomi_sm6150.xml"],
init_rc: ["vendor.lineage.livedisplay@2.1-service.xiaomi_sm6150.rc"],
relative_install_path: "hw",
srcs: [
"AntiFlicker.cpp",
@ -31,5 +31,6 @@ cc_binary {
"libhidlbase",
"libutils",
"vendor.lineage.livedisplay@2.0",
"vendor.lineage.livedisplay@2.1",
],
}

4
livedisplay/AntiFlicker.cpp
View File

@ -25,7 +25,7 @@
namespace vendor {
namespace lineage {
namespace livedisplay {
namespace V2_0 {
namespace V2_1 {
namespace implementation {
static constexpr const char* kAntiFlickerStatusPath =
@ -49,7 +49,7 @@ Return<bool> AntiFlicker::setEnabled(bool enabled) {
}
} // namespace implementation
} // namespace V2_0
} // namespace V2_1
} // namespace livedisplay
} // namespace lineage
} // namespace vendor

14
livedisplay/AntiFlicker.h
View File

@ -14,17 +14,17 @@
* limitations under the License.
*/
#ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_0_ANTIFLICKER_H
#define VENDOR_LINEAGE_LIVEDISPLAY_V2_0_ANTIFLICKER_H
#ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_1_ANTIFLICKER_H
#define VENDOR_LINEAGE_LIVEDISPLAY_V2_1_ANTIFLICKER_H
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
#include <vendor/lineage/livedisplay/2.0/IAntiFlicker.h>
#include <vendor/lineage/livedisplay/2.1/IAntiFlicker.h>
namespace vendor {
namespace lineage {
namespace livedisplay {
namespace V2_0 {
namespace V2_1 {
namespace implementation {
using ::android::sp;
@ -33,15 +33,15 @@ using ::android::hardware::Void;
class AntiFlicker : public IAntiFlicker {
public:
// Methods from ::vendor::lineage::livedisplay::V2_0::IAntiFlicker follow.
// Methods from ::vendor::lineage::livedisplay::V2_1::IAntiFlicker 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_ANTIFLICKER_H
#endif // VENDOR_LINEAGE_LIVEDISPLAY_V2_1_ANTIFLICKER_H

4
livedisplay/SunlightEnhancement.cpp
View File

@ -25,7 +25,7 @@
namespace vendor {
namespace lineage {
namespace livedisplay {
namespace V2_0 {
namespace V2_1 {
namespace implementation {
static constexpr const char* kHbmStatusPath = "/sys/devices/platform/soc/soc:qcom,dsi-display/hbm";
@ -48,7 +48,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::sp;
@ -33,15 +33,15 @@ using ::android::hardware::Void;
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

10
livedisplay/service.cpp
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150"
#define LOG_TAG "vendor.lineage.livedisplay@2.1-service.xiaomi_sm6150"
#include <android-base/logging.h>
#include <binder/ProcessState.h>
@ -23,10 +23,10 @@
#include "AntiFlicker.h"
#include "SunlightEnhancement.h"
using ::vendor::lineage::livedisplay::V2_0::IAntiFlicker;
using ::vendor::lineage::livedisplay::V2_0::ISunlightEnhancement;
using ::vendor::lineage::livedisplay::V2_0::implementation::AntiFlicker;
using ::vendor::lineage::livedisplay::V2_0::implementation::SunlightEnhancement;
using ::vendor::lineage::livedisplay::V2_1::IAntiFlicker;
using ::vendor::lineage::livedisplay::V2_1::ISunlightEnhancement;
using ::vendor::lineage::livedisplay::V2_1::implementation::AntiFlicker;
using ::vendor::lineage::livedisplay::V2_1::implementation::SunlightEnhancement;
int main() {
android::sp<IAntiFlicker> antiFlicker = new AntiFlicker();

19
livedisplay/vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.xml
View File

@ -1,19 +0,0 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>vendor.lineage.livedisplay</name>
<transport>hwbinder</transport>
<version>2.0</version>
<interface>
<name>IAntiFlicker</name>
<instance>default</instance>
</interface>
<interface>
<name>IPictureAdjustment</name>
<instance>default</instance>
</interface>
<interface>
<name>ISunlightEnhancement</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

2
livedisplay/vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150.rc → livedisplay/vendor.lineage.livedisplay@2.1-service.xiaomi_sm6150.rc
View File

@ -5,7 +5,7 @@ on boot
chmod 0660 /sys/devices/platform/soc/soc:qcom,dsi-display/dc_enable
chmod 0660 /sys/devices/platform/soc/soc:qcom,dsi-display/hbm
service vendor.livedisplay-hal-2-0 /vendor/bin/hw/vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150
service vendor.livedisplay-hal-2-1 /vendor/bin/hw/vendor.lineage.livedisplay@2.1-service.xiaomi_sm6150
class hal
user system
group system

9
livedisplay/vendor.lineage.livedisplay@2.1-service.xiaomi_sm6150.xml Normal file
View File

@ -0,0 +1,9 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>vendor.lineage.livedisplay</name>
<transport>hwbinder</transport>
<fqname>@2.0::IPictureAdjustment/default</fqname>
<fqname>@2.1::IAntiFlicker/default</fqname>
<fqname>@2.1::ISunlightEnhancement/default</fqname>
</hal>
</manifest>

2
sepolicy/vendor/file_contexts vendored
View File

@ -16,7 +16,7 @@
/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.xiaomi_sm6150 u:object_r:hal_fingerprint_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.xiaomi_sm6150-ext u:object_r:hal_fingerprint_default_exec:s0
/vendor/bin/hw/android\.hardware\.light@2\.0-service\.xiaomi_sm6150 u:object_r:hal_light_default_exec:s0
/vendor/bin/hw/vendor\.lineage\.livedisplay@2\.0-service\.xiaomi_sm6150 u:object_r:hal_lineage_livedisplay_qti_exec:s0
/vendor/bin/hw/vendor\.lineage\.livedisplay@2\.1-service\.xiaomi_sm6150 u:object_r:hal_lineage_livedisplay_qti_exec:s0
# Remosaic
/vendor/bin/remosaic_daemon u:object_r:remosaic_daemon_exec:s0

2
sm6150.mk
View File

@ -211,7 +211,7 @@ PRODUCT_PACKAGES += \
# LiveDisplay
PRODUCT_PACKAGES += \
vendor.lineage.livedisplay@2.0-service-sdm \
vendor.lineage.livedisplay@2.0-service.xiaomi_sm6150
vendor.lineage.livedisplay@2.1-service.xiaomi_sm6150
# Media
PRODUCT_PACKAGES += \