zenfone9: Remove qcom wifi display
The wifi-display support in aosp covers everything except drm protected
content.
Change-Id: I7426d02e2e46058c904f17c825ab1c0ca39eee1b
diff --git a/device.mk b/device.mk
index 42a12fe..073e631 100755
--- a/device.mk
+++ b/device.mk
@@ -223,7 +223,6 @@
frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml
PRODUCT_PACKAGES += \
- libavservices_minijail \
libavservices_minijail.vendor \
libavservices_minijail_vendor \
libgui_vendor \
@@ -350,10 +349,3 @@
libwpa_client \
wpa_supplicant \
wpa_supplicant.conf
-
-# Wifi Display
-PRODUCT_PACKAGES += \
- libnl
-
-PRODUCT_BOOT_JARS += \
- WfdCommon
diff --git a/manifest/manifest_cape.xml b/manifest/manifest_cape.xml
index 6ebde61..9793103 100644
--- a/manifest/manifest_cape.xml
+++ b/manifest/manifest_cape.xml
@@ -61,12 +61,6 @@
<fqname>@2.7::ICameraProvider/legacy/1</fqname>
</hal>
<hal format="hidl">
- <name>android.hardware.drm</name>
- <transport>hwbinder</transport>
- <fqname>@1.3::ICryptoFactory/wfdhdcp</fqname>
- <fqname>@1.3::IDrmFactory/wfdhdcp</fqname>
- </hal>
- <hal format="hidl">
<name>android.hardware.gatekeeper</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -650,31 +644,6 @@
<fqname>@1.0::IWifiStats/wifiStats</fqname>
</hal>
<hal format="hidl">
- <name>vendor.qti.hardware.wifidisplaysession</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IWifiDisplaySession</name>
- <instance>wifidisplaysession</instance>
- </interface>
- <interface>
- <name>IWifiDisplaySessionAudioTrack</name>
- <instance>wifidisplaysessionaudiotrack</instance>
- </interface>
- <interface>
- <name>IWifiDisplaySessionImageTrack</name>
- <instance>wifidisplaysessionimagetrack</instance>
- </interface>
- <interface>
- <name>IWifiDisplaySessionVideoTrack</name>
- <instance>wifidisplaysessionvideotrack</instance>
- </interface>
- <fqname>@1.0::IWifiDisplaySession/wifidisplaysession</fqname>
- <fqname>@1.0::IWifiDisplaySessionAudioTrack/wifidisplaysessionaudiotrack</fqname>
- <fqname>@1.0::IWifiDisplaySessionImageTrack/wifidisplaysessionimagetrack</fqname>
- <fqname>@1.0::IWifiDisplaySessionVideoTrack/wifidisplaysessionvideotrack</fqname>
- </hal>
- <hal format="hidl">
<name>vendor.qti.ims.callinfo</name>
<transport>hwbinder</transport>
<version>1.0</version>
diff --git a/manifest/vendor_framework_compatibility_matrix.xml b/manifest/vendor_framework_compatibility_matrix.xml
index 2437aba..15bab50 100644
--- a/manifest/vendor_framework_compatibility_matrix.xml
+++ b/manifest/vendor_framework_compatibility_matrix.xml
@@ -151,18 +151,6 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>com.qualcomm.qti.wifidisplayhal</name>
- <version>1.0</version>
- <interface>
- <name>IDSManager</name>
- <instance>wifidisplaydshal</instance>
- </interface>
- <interface>
- <name>IHDCPSession</name>
- <instance>wifidisplayhdcphal</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
<name>com.quicinc.cne.api</name>
<version>1.0-1</version>
<interface>
@@ -1002,26 +990,6 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>vendor.qti.hardware.wifidisplaysession</name>
- <version>1.0</version>
- <interface>
- <name>IWifiDisplaySession</name>
- <instance>wifidisplaysession</instance>
- </interface>
- <interface>
- <name>IWifiDisplaySessionAudioTrack</name>
- <instance>wifidisplaysessionaudiotrack</instance>
- </interface>
- <interface>
- <name>IWifiDisplaySessionImageTrack</name>
- <instance>wifidisplaysessionimagetrack</instance>
- </interface>
- <interface>
- <name>IWifiDisplaySessionVideoTrack</name>
- <instance>wifidisplaysessionvideotrack</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
<name>vendor.qti.hardware.wigig.netperftuner</name>
<version>1.0</version>
<interface>
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index 98be86c..e20ae22 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -299,10 +299,7 @@
vendor/bin/vmmgr
vendor/bin/vppservice
vendor/bin/wdsdaemon
-vendor/bin/wfdhdcphalservice
-vendor/bin/wfdvndservice
vendor/bin/wificfrtool
-vendor/bin/wifidisplayhalservice
vendor/bin/wpa_cli
vendor/bin/writekey
vendor/bin/xtra-daemon
@@ -316,8 +313,6 @@
vendor/dsp/sdsp/map_SLPI_SHARED_LIBS_waipio.slpi.prodQ.txt
vendor/dsp/sdsp/map_SSC_SLPI_CORE_USER_waipio.slpi.prodQ.txt
vendor/dsp/sdsp/map_SSC_SLPI_USER_waipio.slpi.prodQ.txt
-vendor/etc/ArmHDCP_QTI_Android.cfg
-vendor/etc/ArmHDCP_QTI_Android_8450.cfg
vendor/etc/IPACM_Filter_cfg.xml
vendor/etc/IPACM_cfg.xml
vendor/etc/acdbdata/AI2202/AI2202_acdb_cal.acdb
@@ -448,7 +443,6 @@
vendor/etc/init.qti.fm.sh
vendor/etc/init/android.hardware.audio.service_64.rc
vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
-vendor/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc
vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc
vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc
vendor/etc/init/android.hardware.gnss-aidl-service-qti.rc
@@ -467,7 +461,6 @@
vendor/etc/init/bat_sd_bs.rc
vendor/etc/init/bat_sd_percent.rc
vendor/etc/init/cnd.rc
-vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc
vendor/etc/init/dataadpl.rc
vendor/etc/init/dataqti.rc
vendor/etc/init/dpmQmiMgr.rc
@@ -556,7 +549,6 @@
vendor/etc/init/vendor.wlan.lowirpcd.rc
vendor/etc/init/vmmgr.rc
vendor/etc/init/vppservice.rc
-vendor/etc/init/wfdvndservice.rc
vendor/etc/irissoft_ai2202.fw
vendor/etc/izat.conf
vendor/etc/libese-nxp.conf
@@ -1067,9 +1059,6 @@
vendor/etc/seccomp_policy/sensors-qesdk.policy
vendor/etc/seccomp_policy/sxr@2.0.policy
vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy
-vendor/etc/seccomp_policy/wfdhdcphalservice.policy
-vendor/etc/seccomp_policy/wfdvndservice.policy
-vendor/etc/seccomp_policy/wifidisplayhalservice.policy
vendor/etc/sensors/config/af6133e_0.json
vendor/etc/sensors/config/diwali_default_sensors.json
vendor/etc/sensors/config/diwali_dynamic_sensors.json
@@ -1168,9 +1157,6 @@
-vendor/etc/vintf/manifest/vendor.qti.hardware.vpp@2.0-service.xml
-vendor/etc/vintf/manifest/vendor.qti.hardware.wifi.wificfr@1.0-service.xml
vendor/etc/vmmgr.conf
-vendor/etc/wfdconfig.xml
-vendor/etc/wfdconfig_720.xml
-vendor/etc/wfdconfig_MI.xml
vendor/etc/wifi/p2p_supplicant_overlay.conf
vendor/etc/wifi/vendor_cmd.xml
vendor/etc/wifi/wpa_supplicant_overlay.conf
@@ -1854,7 +1840,6 @@
vendor/lib/libAlacSwDec.so
vendor/lib/libApeSwDec.so
vendor/lib/libCB.so
-vendor/lib/libDxHdcp.so
vendor/lib/libEGL_adreno.so
vendor/lib/libEvrcSwCodec.so
vendor/lib/libFace3DTA.so
@@ -2051,7 +2036,6 @@
vendor/lib/libmfec.so
vendor/lib/libminkdescriptor.so
vendor/lib/libminksocket_vendor.so
-vendor/lib/libmm-hdcpmgr.so
vendor/lib/libmmcamera_bestats.so
vendor/lib/libmmcamera_cac3.so
vendor/lib/libmmcamera_lscv35.so
@@ -2895,7 +2879,6 @@
vendor/lib64/hw/vendor.qti.hardware.sensorscalibrate@1.0-impl.so
vendor/lib64/hw/vendor.qti.hardware.servicetracker@1.2-impl.so
vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so
-vendor/lib64/hw/vendor.qti.hardware.wifidisplaysession@1.0-impl.so
vendor/lib64/hw/vulkan.adreno.so
vendor/lib64/lib-imscommon.so
vendor/lib64/lib-imsdpl.so
@@ -2911,12 +2894,10 @@
vendor/lib64/libApeSwDec.so
vendor/lib64/libCB.so
vendor/lib64/libDspIOProxy_stub.so
-vendor/lib64/libDxHdcp.so
vendor/lib64/libEGL_adreno.so
vendor/lib64/libEvrcSwCodec.so
vendor/lib64/libFace3DTA.so
vendor/lib64/libFace3D_hlos.so
-vendor/lib64/libFileMux_proprietary.so
vendor/lib64/libFlacSwDec.so
vendor/lib64/libGLESv2_adreno.so
vendor/lib64/libGPQTEEC_vendor.so
@@ -3154,16 +3135,12 @@
vendor/lib64/libminkdescriptor.so
vendor/lib64/libminksocket_vendor.so
vendor/lib64/libmiracast.so
-vendor/lib64/libmm-hdcpmgr.so
vendor/lib64/libmmcamera_bestats.so
vendor/lib64/libmmcamera_cac3.so
vendor/lib64/libmmcamera_lscv35.so
vendor/lib64/libmmcamera_mfnr.so
vendor/lib64/libmmcamera_mfnr_t4.so
vendor/lib64/libmmcamera_pdpc.so
-vendor/lib64/libmmosal_vendor.so
-vendor/lib64/libmmrtpdecoder_vendor.so
-vendor/lib64/libmmrtpencoder_vendor.so
vendor/lib64/libmpbase.so
vendor/lib64/libnanopb.so
vendor/lib64/libnative-api.so
@@ -3411,27 +3388,6 @@
vendor/lib64/libvpplibrary.so
vendor/lib64/libvpptestutils.so
vendor/lib64/libwapi_cert.so
-vendor/lib64/libwfdaac_vendor.so
-vendor/lib64/libwfdcodecv4l2_proprietary.so
-vendor/lib64/libwfdcommonutils_proprietary.so
-vendor/lib64/libwfdconfigutils_proprietary.so
-vendor/lib64/libwfddisplayconfig_vendor.so
-vendor/lib64/libwfdhdcpcp.so
-vendor/lib64/libwfdhdcpservice_proprietary.so
-vendor/lib64/libwfdmminterface_proprietary.so
-vendor/lib64/libwfdmmservice_proprietary.so
-vendor/lib64/libwfdmmsrc_proprietary.so
-vendor/lib64/libwfdmodulehdcpsession.so
-vendor/lib64/libwfdrtsp_vendor.so
-vendor/lib64/libwfdsessionmodule.so
-vendor/lib64/libwfdsourcesession_proprietary.so
-vendor/lib64/libwfdsourcesm_proprietary.so
-vendor/lib64/libwfduibcinterface_vendor.so
-vendor/lib64/libwfduibcsink_vendor.so
-vendor/lib64/libwfduibcsinkinterface_vendor.so
-vendor/lib64/libwfduibcsrc_vendor.so
-vendor/lib64/libwfduibcsrcinterface_vendor.so
-vendor/lib64/libwfdutils_proprietary.so
vendor/lib64/libwms.so
vendor/lib64/libwqe.so
vendor/lib64/libwvhidl.so
@@ -3635,8 +3591,6 @@
vendor/lib64/vendor.qti.hardware.wifi.supplicant@2.1.so
vendor/lib64/vendor.qti.hardware.wifi.supplicant@2.2.so
vendor/lib64/vendor.qti.hardware.wifi.wificfr@1.0.so
-vendor/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so
-vendor/lib64/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so
vendor/lib64/vendor.qti.hardware.wigig.netperftuner@1.0.so
vendor/lib64/vendor.qti.ims.callcapability@1.0.so
vendor/lib64/vendor.qti.ims.callinfo@1.0.so
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e2f6a15..44a0509 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -130,59 +130,6 @@
-system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
-system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
-# Wfd
--framework/WfdCommon.jar
-system_ext/bin/wfdservice64
-system_ext/etc/init/wfdservice.rc
-system_ext/etc/wfdconfigsink.xml
-system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml
-system_ext/etc/seccomp_policy/wfdservice64.policy
--system_ext/priv-app/WfdService/WfdService.apk
-system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
-system_ext/lib/libmmosal.so
-system_ext/lib/libmmparser_lite.so
-system_ext/lib/libmmrtpdecoder.so
-system_ext/lib/libmmrtpencoder.so
-system_ext/lib/libwfdavenhancements.so
-system_ext/lib/libwfdclient.so
-system_ext/lib/libwfdcommonutils.so
-system_ext/lib/libwfdconfigutils.so
-system_ext/lib/libwfddisplayconfig.so
-system_ext/lib/libwfdmminterface.so
-system_ext/lib/libwfdmmsink.so
-system_ext/lib/libwfdmmsrc_system.so
-system_ext/lib/libwfdrtsp.so
-system_ext/lib/libwfdservice.so
-system_ext/lib/libwfdsinksm.so
-system_ext/lib/libwfduibcinterface.so
-system_ext/lib/libwfduibcsink.so
-system_ext/lib/libwfduibcsinkinterface.so
-system_ext/lib/libwfduibcsrc.so
-system_ext/lib/libwfduibcsrcinterface.so
-system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so
-system_ext/lib64/libmmosal.so
-system_ext/lib64/libmmparser_lite.so
-system_ext/lib64/libmmrtpdecoder.so
-system_ext/lib64/libmmrtpencoder.so
-system_ext/lib64/libwfdavenhancements.so
-system_ext/lib64/libwfdclient.so
-system_ext/lib64/libwfdcommonutils.so
-system_ext/lib64/libwfdconfigutils.so
-system_ext/lib64/libwfddisplayconfig.so
-system_ext/lib64/libwfdmminterface.so
-system_ext/lib64/libwfdmmsink.so
-system_ext/lib64/libwfdmmsrc_system.so
-system_ext/lib64/libwfdnative.so
-system_ext/lib64/libwfdrtsp.so
-system_ext/lib64/libwfdservice.so
-system_ext/lib64/libwfdsinksm.so
-system_ext/lib64/libwfduibcinterface.so
-system_ext/lib64/libwfduibcsinkinterface.so
-system_ext/lib64/libwfduibcsink.so
-system_ext/lib64/libwfduibcsrc.so
-system_ext/lib64/libwfduibcsrcinterface.so
-system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so
-
# VNDK
system_ext/lib64/libvndfwk_detect_jni.qti.so
system_ext/lib64/libvndfwk_detect_jni.qti_system.so
diff --git a/regen-vendor.sh b/regen-vendor.sh
index 475c053..301fdb8 100755
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
@@ -1146,6 +1146,53 @@
"bin/rttutild"
"etc/init/rttutild.rc"
+ # WifiDisplay
+ "bin/wfdhdcphalservice"
+ "bin/wfdvndservice"
+ "bin/wifidisplayhalservice"
+ "etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc"
+ "etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc"
+ "etc/init/wfdvndservice.rc"
+ "etc/seccomp_policy/wfdhdcphalservice.policy"
+ "etc/seccomp_policy/wfdvndservice.policy"
+ "etc/seccomp_policy/wifidisplayhalservice.policy"
+ "etc/ArmHDCP_QTI_Android.cfg"
+ "etc/ArmHDCP_QTI_Android_8450.cfg"
+ "etc/wfdconfig.xml"
+ "etc/wfdconfig_720.xml"
+ "etc/wfdconfig_MI.xml"
+ "lib/libDxHdcp.so"
+ "lib/libmm-hdcpmgr.so"
+ "lib64/libDxHdcp.so"
+ "lib64/libFileMux_proprietary.so"
+ "lib64/libmm-hdcpmgr.so"
+ "lib64/libmmosal_vendor.so"
+ "lib64/libmmrtpdecoder_vendor.so"
+ "lib64/libmmrtpencoder_vendor.so"
+ "lib64/libwfdaac_vendor.so"
+ "lib64/libwfdcodecv4l2_proprietary.so"
+ "lib64/libwfdcommonutils_proprietary.so"
+ "lib64/libwfdconfigutils_proprietary.so"
+ "lib64/libwfddisplayconfig_vendor.so"
+ "lib64/libwfdhdcpcp.so"
+ "lib64/libwfdhdcpservice_proprietary.so"
+ "lib64/libwfdmminterface_proprietary.so"
+ "lib64/libwfdmmservice_proprietary.so"
+ "lib64/libwfdmmsrc_proprietary.so"
+ "lib64/libwfdmodulehdcpsession.so"
+ "lib64/libwfdrtsp_vendor.so"
+ "lib64/libwfdsessionmodule.so"
+ "lib64/libwfdsourcesession_proprietary.so"
+ "lib64/libwfdsourcesm_proprietary.so"
+ "lib64/libwfduibcinterface_vendor.so"
+ "lib64/libwfduibcsink_vendor.so"
+ "lib64/libwfduibcsinkinterface_vendor.so"
+ "lib64/libwfduibcsrc_vendor.so"
+ "lib64/libwfduibcsrcinterface_vendor.so"
+ "lib64/libwfdutils_proprietary.so"
+ "lib64/vendor.qti.hardware.wifidisplaysession@1.0.so"
+ "lib64/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so"
+ "lib64/hw/vendor.qti.hardware.wifidisplaysession@1.0-impl.so"
)
ALL_SKIP_FILES=("${VENDOR_SKIP_FILES_COMMON[@]}" "${VENDOR_SKIP_FILES_DEVICE[@]}")
diff --git a/rro_overlays/FrameworksResOverlay/res/values/config.xml b/rro_overlays/FrameworksResOverlay/res/values/config.xml
index 3aa8e2c..eb4fd67 100644
--- a/rro_overlays/FrameworksResOverlay/res/values/config.xml
+++ b/rro_overlays/FrameworksResOverlay/res/values/config.xml
@@ -190,18 +190,6 @@
-->
<bool name="config_enableWifiDisplay">true</bool>
- <!-- Set to true if the wifi display supports compositing content stored
- in gralloc protected buffers. For this to be true, there must exist
- a protected hardware path for surface flinger to composite and send
- protected buffers to the wifi display video encoder.
- If this flag is false, we advise applications not to use protected
- buffers (if possible) when presenting content to a wifi display because
- the content may be blanked.
- This flag controls whether the {@link Display#FLAG_SUPPORTS_PROTECTED_BUFFERS}
- flag is set for wifi displays.
- -->
- <bool name="config_wifiDisplaySupportsProtectedBuffers">true</bool>
-
<!-- Indicate whether closing the lid causes the device to go to sleep and opening
it causes the device to wake up.
The default is false. -->