zenfone9: Drop Pixelworks and switch to OSS display
Change-Id: I93de5fe14b8f5b4f326d55502cc4321bbf8ff80e
diff --git a/manifest/asus_framework_matrix.xml b/manifest/asus_framework_matrix.xml
index 77b8725..6f4c085 100644
--- a/manifest/asus_framework_matrix.xml
+++ b/manifest/asus_framework_matrix.xml
@@ -18,22 +18,6 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>vendor.pixelworks.hardware.display</name>
- <version>1.1</version>
- <interface>
- <name>IIris</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
- <name>vendor.pixelworks.hardware.feature</name>
- <version>1.0</version>
- <interface>
- <name>IIrisFeature</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
<name>vendor.qti.sla.service</name>
<version>1.0</version>
<interface>
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index 6224ca3..d5257bf 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -134,14 +134,11 @@
vendor/bin/hw/qvrservice
vendor/bin/hw/sxrservice
vendor/bin/hw/vendor.display.color@1.0-service
-vendor/bin/hw/vendor.pixelworks.hardware.display.iris-service
-vendor/bin/hw/vendor.pixelworks.hardware.feature.irisfeature-service
vendor/bin/hw/vendor.qti.camera.provider@2.7-service_64
vendor/bin/hw/vendor.qti.esepowermanager@1.1-service
vendor/bin/hw/vendor.qti.hardware.AGMIPC@1.0-service
vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service
-vendor/bin/hw/vendor.qti.hardware.display.composer-service
vendor/bin/hw/vendor.qti.hardware.eid@1.0-service
vendor/bin/hw/vendor.qti.hardware.factory@1.0-service
vendor/bin/hw/vendor.qti.hardware.iop@2.0-service
@@ -190,7 +187,6 @@
vendor/bin/init.qti.write.sh
vendor/bin/ipacm
vendor/bin/ipacm-diag
-vendor/bin/irisConfig
vendor/bin/ks
vendor/bin/lightsensor_calibration_data
vendor/bin/lightsensor_calibration_start
@@ -530,8 +526,6 @@
vendor/etc/init/trusteduilistener.rc
vendor/etc/init/vendor.display.color@1.0-service.rc
vendor/etc/init/vendor.dpmd.rc
-vendor/etc/init/vendor.pixelworks.hardware.display.iris-service.rc
-vendor/etc/init/vendor.pixelworks.hardware.feature.irisfeature-service.rc
vendor/etc/init/vendor.qti.adsprpc-guestos-service.rc
vendor/etc/init/vendor.qti.audio-adsprpc-service.rc
vendor/etc/init/vendor.qti.camera.provider@2.7-service_64.rc
@@ -541,7 +535,6 @@
vendor/etc/init/vendor.qti.hardware.AGMIPC@1.0-service.rc
vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc
vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc
-vendor/etc/init/vendor.qti.hardware.display.composer-service.rc
vendor/etc/init/vendor.qti.hardware.dsp@1.0-service.rc
vendor/etc/init/vendor.qti.hardware.eid@1.0-service.rc
vendor/etc/init/vendor.qti.hardware.factory@1.0-service.rc
@@ -569,77 +562,6 @@
vendor/etc/init/vmmgr.rc
vendor/etc/init/vppservice.rc
vendor/etc/init/wfdvndservice.rc
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/ModifyHistory.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm.lst
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm1.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm10.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm11.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm12.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm13.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm14.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm15.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm16.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm17.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm18.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm19.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm2.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm20.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm21.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm22.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm23.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm24.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm25.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm26.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm27.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm28.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm29.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm3.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm30.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm31.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm32.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm33.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm34.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm35.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm36.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm37.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm38.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm39.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm4.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm5.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm6.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm7.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm8.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/inParm9.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/mcfCheck.txt
-vendor/etc/inparm/irissoft/inparm_ai2201_mp/mcfCheck_low.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/Release.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm.lst
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm1.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm10.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm11.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm12.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm13.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm14.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm15.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm16.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm17.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm18.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm2.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm3.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm4.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm5.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm6.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm7.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm8.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/inParm9.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/mcfCheck.txt
-vendor/etc/inparm/irissoft/inparm_ai2202_mp/mcfCheck_low.txt
-vendor/etc/iris_configs.xml
-vendor/etc/irissoft_ASUS_ams592YP01_cmd_mode_dsc_fhd_plus_panel.dat
-vendor/etc/irissoft_ASUS_ams592YP01_cmd_mode_dsc_fhd_plus_panel.xml
-vendor/etc/irissoft_ASUS_ams678_er2_cmd_mode_dsc_fhd_plus_panel.dat
-vendor/etc/irissoft_ASUS_ams678_er2_cmd_mode_dsc_fhd_plus_panel.xml
-vendor/etc/irissoft_ai2201.fw
vendor/etc/irissoft_ai2202.fw
vendor/etc/izat.conf
vendor/etc/libese-nxp.conf
@@ -1247,11 +1169,8 @@
-vendor/etc/vintf/manifest/manifest_non_qmaa_extn.xml
-vendor/etc/vintf/manifest/memtrack_qti.xml
-vendor/etc/vintf/manifest/qtiradio-saidl.xml
--vendor/etc/vintf/manifest/vendor.pixelworks.hardware.display.iris-service.xml
--vendor/etc/vintf/manifest/vendor.pixelworks.hardware.feature.irisfeature-service.xml
-vendor/etc/vintf/manifest/vendor.qti.diag.hal.service.xml
-vendor/etc/vintf/manifest/vendor.qti.gnss-service.xml
--vendor/etc/vintf/manifest/vendor.qti.hardware.display.composer-service.xml
-vendor/etc/vintf/manifest/vendor.qti.hardware.limits-service.xml
-vendor/etc/vintf/manifest/vendor.qti.hardware.perf.xml
-vendor/etc/vintf/manifest/vendor.qti.hardware.power.powermodule.xml
@@ -2198,15 +2117,6 @@
vendor/lib/libprotobuf-cpp-full-3.9.1.so
vendor/lib/libprotobuf-cpp-lite-3.9.1.so
vendor/lib/libpsmoptfeature.so
-vendor/lib/libpwirisIoctlWrapper.so
-vendor/lib/libpwirisPCS.so
-vendor/lib/libpwiriscalibrate.so
-vendor/lib/libpwirisfeature.so
-vendor/lib/libpwirishalwrapper.so
-vendor/lib/libpwirispq.so
-vendor/lib/libpwirisservice.so
-vendor/lib/libpwirissoft.so
-vendor/lib/libpwsoftirisPCS.so
vendor/lib/libq3dtools_adreno.so
vendor/lib/libqc2audio_base.so
vendor/lib/libqc2audio_basecodec.so
@@ -2315,13 +2225,10 @@
vendor/lib/libscveObjectSegmentation_stub.so
vendor/lib/libscveObjectTracker.so
vendor/lib/libscveObjectTracker_stub.so
-vendor/lib/libsdedrm.so
vendor/lib/libsdm-color.so
vendor/lib/libsdm-colormgr-algo.so
vendor/lib/libsdm-disp-vndapis.so
-vendor/lib/libsdmcore.so
vendor/lib/libsdmextension.so
-vendor/lib/libsdmutils.so
vendor/lib/libsdsprpc.so
vendor/lib/libsecureui_svcsock.so
vendor/lib/libsensorcal.so
@@ -2529,9 +2436,6 @@
vendor/lib/vendor.nxp.nxpese@1.0.so
vendor/lib/vendor.nxp.nxpnfc@2.0.so
vendor/lib/vendor.nxp.nxpnfclegacy@1.0.so
-vendor/lib/vendor.pixelworks.hardware.display@1.0.so
-vendor/lib/vendor.pixelworks.hardware.display@1.1.so
-vendor/lib/vendor.pixelworks.hardware.feature@1.0.so
vendor/lib/vendor.qti.data.factory@2.0.so
vendor/lib/vendor.qti.data.factory@2.1.so
vendor/lib/vendor.qti.data.factory@2.2.so
@@ -3332,15 +3236,6 @@
vendor/lib64/libprotobuf-cpp-full-3.9.1.so
vendor/lib64/libprotobuf-cpp-lite-3.9.1.so
vendor/lib64/libpsmoptfeature.so
-vendor/lib64/libpwirisIoctlWrapper.so
-vendor/lib64/libpwirisPCS.so
-vendor/lib64/libpwiriscalibrate.so
-vendor/lib64/libpwirisfeature.so
-vendor/lib64/libpwirishalwrapper.so
-vendor/lib64/libpwirispq.so
-vendor/lib64/libpwirisservice.so
-vendor/lib64/libpwirissoft.so
-vendor/lib64/libpwsoftirisPCS.so
vendor/lib64/libq3dtools_adreno.so
vendor/lib64/libqapesdk.so
vendor/lib64/libqc2audio_base.so
@@ -3462,13 +3357,10 @@
vendor/lib64/libscveObjectSegmentation_stub.so
vendor/lib64/libscveObjectTracker.so
vendor/lib64/libscveObjectTracker_stub.so
-vendor/lib64/libsdedrm.so
vendor/lib64/libsdm-color.so
vendor/lib64/libsdm-colormgr-algo.so
vendor/lib64/libsdm-disp-vndapis.so
-vendor/lib64/libsdmcore.so
vendor/lib64/libsdmextension.so
-vendor/lib64/libsdmutils.so
vendor/lib64/libsdsprpc.so
vendor/lib64/libsecureui_svcsock.so
vendor/lib64/libsensor_calibration.so
@@ -3629,9 +3521,6 @@
vendor/lib64/vendor.nxp.nxpese@1.0.so
vendor/lib64/vendor.nxp.nxpnfc@2.0.so
vendor/lib64/vendor.nxp.nxpnfclegacy@1.0.so
-vendor/lib64/vendor.pixelworks.hardware.display@1.0.so
-vendor/lib64/vendor.pixelworks.hardware.display@1.1.so
-vendor/lib64/vendor.pixelworks.hardware.feature@1.0.so
vendor/lib64/vendor.qti.data.factory@2.0.so
vendor/lib64/vendor.qti.data.factory@2.1.so
vendor/lib64/vendor.qti.data.factory@2.2.so
diff --git a/regen-vendor.sh b/regen-vendor.sh
index e235be7..220de56 100755
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
@@ -585,6 +585,119 @@
"lib64/libqservice.so"
"lib/libfilefinder.so"
"lib64/libfilefinder.so"
+ "bin/hw/vendor.qti.hardware.display.composer-service"
+ "etc/init/vendor.qti.hardware.display.composer-service.rc"
+ "etc/vintf/manifest/vendor.qti.hardware.display.composer-service.xml"
+ "lib/libsdedrm.so"
+ "lib/libsdmcore.so"
+ "lib/libsdmutils.so"
+ "lib64/libsdedrm.so"
+ "lib64/libsdmcore.so"
+ "lib64/libsdmutils.so"
+
+ # Display (PixelWorks)
+ "bin/hw/vendor.pixelworks.hardware.display.iris-service"
+ "bin/hw/vendor.pixelworks.hardware.feature.irisfeature-service"
+ "etc/init/vendor.pixelworks.hardware.display.iris-service.rc"
+ "etc/init/vendor.pixelworks.hardware.feature.irisfeature-service.rc"
+ "etc/vintf/manifest/vendor.pixelworks.hardware.display.iris-service.xml"
+ "etc/vintf/manifest/vendor.pixelworks.hardware.feature.irisfeature-service.xml"
+ "lib/vendor.pixelworks.hardware.display@1.0.so"
+ "lib/vendor.pixelworks.hardware.display@1.1.so"
+ "lib/vendor.pixelworks.hardware.feature@1.0.so"
+ "lib64/vendor.pixelworks.hardware.display@1.0.so"
+ "lib64/vendor.pixelworks.hardware.display@1.1.so"
+ "lib64/vendor.pixelworks.hardware.feature@1.0.so"
+ "bin/irisConfig"
+ "etc/inparm/irissoft/inparm_ai2201_mp/ModifyHistory.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm.lst"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm1.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm10.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm11.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm12.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm13.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm14.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm15.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm16.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm17.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm18.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm19.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm2.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm20.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm21.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm22.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm23.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm24.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm25.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm26.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm27.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm28.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm29.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm3.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm30.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm31.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm32.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm33.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm34.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm35.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm36.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm37.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm38.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm39.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm4.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm5.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm6.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm7.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm8.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/inParm9.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/mcfCheck.txt"
+ "etc/inparm/irissoft/inparm_ai2201_mp/mcfCheck_low.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/Release.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm.lst"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm1.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm10.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm11.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm12.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm13.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm14.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm15.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm16.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm17.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm18.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm2.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm3.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm4.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm5.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm6.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm7.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm8.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/inParm9.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/mcfCheck.txt"
+ "etc/inparm/irissoft/inparm_ai2202_mp/mcfCheck_low.txt"
+ "etc/iris_configs.xml"
+ "etc/irissoft_ASUS_ams592YP01_cmd_mode_dsc_fhd_plus_panel.dat"
+ "etc/irissoft_ASUS_ams592YP01_cmd_mode_dsc_fhd_plus_panel.xml"
+ "etc/irissoft_ASUS_ams678_er2_cmd_mode_dsc_fhd_plus_panel.dat"
+ "etc/irissoft_ASUS_ams678_er2_cmd_mode_dsc_fhd_plus_panel.xml"
+ "etc/irissoft_ai2201.fw"
+ "lib/libpwirisIoctlWrapper.so"
+ "lib/libpwirisPCS.so"
+ "lib/libpwiriscalibrate.so"
+ "lib/libpwirisfeature.so"
+ "lib/libpwirishalwrapper.so"
+ "lib/libpwirispq.so"
+ "lib/libpwirisservice.so"
+ "lib/libpwirissoft.so"
+ "lib/libpwsoftirisPCS.so"
+ "lib64/libpwirisIoctlWrapper.so"
+ "lib64/libpwirisPCS.so"
+ "lib64/libpwiriscalibrate.so"
+ "lib64/libpwirisfeature.so"
+ "lib64/libpwirishalwrapper.so"
+ "lib64/libpwirispq.so"
+ "lib64/libpwirisservice.so"
+ "lib64/libpwirissoft.so"
+ "lib64/libpwsoftirisPCS.so"
# fstab
"etc/fstab.qcom"
@@ -1024,8 +1137,6 @@
as_module "etc/vintf/manifest/android.hardware.thermal@2.0-service.qti.xml"
as_module "etc/vintf/manifest/android.hardware.usb@1.2-service.xml"
as_module "etc/vintf/manifest/c2_manifest_vendor.xml"
-as_module "etc/vintf/manifest/vendor.pixelworks.hardware.display.iris-service.xml"
-as_module "etc/vintf/manifest/vendor.pixelworks.hardware.feature.irisfeature-service.xml"
as_module "etc/vintf/manifest/vendor.qti.diag.hal.service.xml"
as_module "etc/vintf/manifest/vendor.qti.hardware.servicetracker@1.2-service.xml"
as_module "etc/vintf/manifest/android.hardware.gnss-aidl-service-qti.xml"
@@ -1045,7 +1156,6 @@
as_module "etc/vintf/manifest/ozonotify-1.0.xml"
as_module "etc/vintf/manifest/qtiradio-saidl.xml"
as_module "etc/vintf/manifest/vendor.qti.gnss-service.xml"
-as_module "etc/vintf/manifest/vendor.qti.hardware.display.composer-service.xml"
as_module "etc/vintf/manifest/vendor.qti.hardware.limits-service.xml"
as_module "etc/vintf/manifest/vendor.qti.hardware.perf.xml"
as_module "etc/vintf/manifest/vendor.qti.hardware.power.powermodule.xml"
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index ec6637e..40266da 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -27,9 +27,6 @@
/sys/devices/virtual/extcon-asus/battery_id/state u:object_r:vendor_sysfs_graphics:s0
/sys/devices/virtual/extcon-asus/usb_connector/state u:object_r:vendor_sysfs_graphics:s0
/sys/devices/virtual/extcon-asus/quick_charging/state u:object_r:vendor_sysfs_graphics:s0
-/(vendor|system/vendor)/bin/hw/vendor\.pixelworks\.hardware\.display\.iris-service u:object_r:hal_graphics_composer_default_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.pixelworks\.hardware\.feature\.irisfeature-service u:object_r:hal_graphics_composer_default_exec:s0
-/(vendor|system/vendor)/bin/irisConfig u:object_r:iris_config_exec:s0
# Files in rootfs
/ADF(/.*)? u:object_r:demoapp_file:s0
diff --git a/sepolicy/vendor/hal_display_iris.te b/sepolicy/vendor/hal_display_iris.te
deleted file mode 100644
index 0480340..0000000
--- a/sepolicy/vendor/hal_display_iris.te
+++ /dev/null
@@ -1,4 +0,0 @@
-binder_call(hal_display_iris_client, hal_display_iris_server)
-binder_call(hal_display_iris_server, hal_display_iris_client)
-
-hal_attribute_hwservice(hal_display_iris, hal_display_iris_hwservice)
\ No newline at end of file
diff --git a/sepolicy/vendor/hal_graphics_composer_default.te b/sepolicy/vendor/hal_graphics_composer_default.te
index 61c6680..e1232a9 100644
--- a/sepolicy/vendor/hal_graphics_composer_default.te
+++ b/sepolicy/vendor/hal_graphics_composer_default.te
@@ -2,11 +2,6 @@
allow hal_graphics_composer_default mnt_vendor_file:file { read getattr open };
-hal_client_domain(hal_graphics_composer_default, hal_display_iris)
-hal_server_domain(hal_graphics_composer_default, hal_display_iris)
-
-add_hwservice(hal_graphics_composer_default, hal_display_iris_hwservice)
-
set_prop(hal_graphics_composer_default, vendor_display_prop)
allow hal_graphics_composer_default sysfs_devices_system_cpu:file rw_file_perms;
diff --git a/sepolicy/vendor/hwservice.te b/sepolicy/vendor/hwservice.te
index d6c1a76..85be114 100644
--- a/sepolicy/vendor/hwservice.te
+++ b/sepolicy/vendor/hwservice.te
@@ -1,2 +1 @@
type asus_bspcam_hwservice, hwservice_manager_type;
-type hal_display_iris_hwservice, hwservice_manager_type;
diff --git a/sepolicy/vendor/hwservice_contexts b/sepolicy/vendor/hwservice_contexts
index 34e32ff..952a43f 100644
--- a/sepolicy/vendor/hwservice_contexts
+++ b/sepolicy/vendor/hwservice_contexts
@@ -1,6 +1,4 @@
vendor.goodix.hardware.biometrics.fingerprint::IGoodixFingerprintDaemon u:object_r:hal_fingerprint_hwservice:s0
-vendor.pixelworks.hardware.display::IIris u:object_r:hal_display_iris_hwservice:s0
-vendor.pixelworks.hardware.feature::IIrisFeature u:object_r:hal_display_iris_hwservice:s0
vendor.nxp.nxpnfc::INxpNfc u:object_r:hal_nfc_hwservice:s0
vendor.nxp.nxpnfclegacy::INxpNfcLegacy u:object_r:hal_nfc_hwservice:s0
diff --git a/sepolicy/vendor/iris_config.te b/sepolicy/vendor/iris_config.te
deleted file mode 100644
index 7878389..0000000
--- a/sepolicy/vendor/iris_config.te
+++ /dev/null
@@ -1,4 +0,0 @@
-type iris_config, domain;
-type iris_config_exec, exec_type, vendor_file_type, file_type;
-
-init_daemon_domain(iris_config)