sdm845-common: Replace lineagehw implementation by HIDL services

Move DisplayModeControl and SunlightEnhancement into a livedisplay service, and TouchscreenGestures into a touch one. Change-Id: I5f46671633a13ddc6733a47f4ea5a6515d6d6c98
sailfish-oneplus6 · Feb 4, 2019 · e3ee15e · e3ee15e
1 parent eaa9bbc
commit e3ee15e
Show file tree

Hide file tree

Showing 29 changed files with 702 additions and 356 deletions.
diff --git a/Android.bp b/Android.bp
@@ -1,4 +1,6 @@
 subdirs = [
     "lights",
+    "livedisplay",
+    "touch",
     "tri-state-key"
 ]
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
@@ -83,9 +83,8 @@ TARGET_USES_HWC2 := true
 # DRM
 TARGET_ENABLE_MEDIADRM_64 := true
 
-# Lineage Hardware
-JAVA_SOURCE_OVERLAYS := \
-    org.lineageos.hardware|$(COMMON_PATH)/lineagehw|**/*.java
+# HIDL
+DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml
 
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864

diff --git a/common.mk b/common.mk
@@ -88,6 +88,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     [email protected]_sdm845
 
+# LiveDisplay
+PRODUCT_PACKAGES += \
+    [email protected]_sdm845
+
 # Media
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/media_profiles_vendor.xml:system/etc/media_profiles_vendor.xml
@@ -113,6 +117,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_BOOT_JARS += \
     telephony-ext
 
+# Touch
+PRODUCT_PACKAGES += \
+    [email protected]_sdm845
+
 # tri-state-key
 PRODUCT_PACKAGES += \
     KeyHandler \

diff --git a/framework_manifest.xml b/framework_manifest.xml
@@ -0,0 +1,24 @@
+<manifest version="1.0" type="framework">
+    <hal format="hidl">
+        <name>vendor.lineage.livedisplay</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IDisplayModes</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>ISunlightEnhancement</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.lineage.touch</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ITouchscreenGesture</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/lineagehw/src/org/lineageos/hardware/DisplayModeControl.java b/lineagehw/src/org/lineageos/hardware/DisplayModeControl.java
diff --git a/lineagehw/src/org/lineageos/hardware/SunlightEnhancement.java b/lineagehw/src/org/lineageos/hardware/SunlightEnhancement.java
diff --git a/lineagehw/src/org/lineageos/hardware/TouchscreenGestures.java b/lineagehw/src/org/lineageos/hardware/TouchscreenGestures.java
diff --git a/livedisplay/.clang-format b/livedisplay/.clang-format
@@ -0,0 +1,11 @@
+BasedOnStyle: Google
+AccessModifierOffset: -2
+AllowShortFunctionsOnASingleLine: Inline
+ColumnLimit: 100
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+IndentWidth: 4
+PointerAlignment: Left
+TabWidth: 4
+UseTab: Never
+PenaltyExcessCharacter: 32