From a615b89545f332d25c9806039285a25ba3d9911d Mon Sep 17 00:00:00 2001
From: Marc Bourgoin <themard85@gmail.com>
Date: Fri, 10 Sep 2021 18:54:44 +0530
Subject: [PATCH] sdm660-common: Drop QCOM WFD

Change-Id: I3dd591444dc54ebe3a32e0385cbfc3db6bfc5e1f
---
 configs/privapp-permissions-qti.xml |  5 ----
 configs/qti_whitelist.xml           |  3 ---
 manifest.xml                        | 13 ----------
 proprietary-files.txt               | 39 -----------------------------
 sdm660.mk                           |  3 ---
 5 files changed, 63 deletions(-)

diff --git a/configs/privapp-permissions-qti.xml b/configs/privapp-permissions-qti.xml
index d253be3a..c9138235 100644
--- a/configs/privapp-permissions-qti.xml
+++ b/configs/privapp-permissions-qti.xml
@@ -37,9 +37,4 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
         <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
     </privapp-permissions>
-
-    <privapp-permissions package="com.qualcomm.wfd.service">
-        <permission name="android.permission.READ_FRAME_BUFFER"/>
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-    </privapp-permissions>
 </permissions>
diff --git a/configs/qti_whitelist.xml b/configs/qti_whitelist.xml
index 82a9d94f..86a0163c 100644
--- a/configs/qti_whitelist.xml
+++ b/configs/qti_whitelist.xml
@@ -61,7 +61,4 @@
     <hidden-api-whitelisted-app package="com.qualcomm.qti.uimlpatest" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.lpa" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.uim" />
-
-    <hidden-api-whitelisted-app package="com.qualcomm.wfd.client" />
-    <hidden-api-whitelisted-app package="com.qualcomm.wfd.service" />
 </config>
diff --git a/manifest.xml b/manifest.xml
index e6155df4..b82d892e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -281,19 +281,6 @@
             <instance>com.qualcomm.qti.uceservice</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>com.qualcomm.qti.wifidisplayhal</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IDSManager</name>
-            <instance>wifidisplaydshal</instance>
-        </interface>
-        <interface>
-            <name>IHDCPSession</name>
-            <instance>wifidisplayhdcphal</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>vendor.display.color</name>
         <transport>hwbinder</transport>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e2aa557f..424a2142 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -608,42 +608,3 @@ vendor/lib64/libtime_genoff.so
 
 # Wi-Fi
 vendor/bin/cnss-daemon
-
-# WiFi Display
-system/bin/wfdservice
-system/etc/init/wfdservice.rc
-system/etc/wfdconfig.xml
-system/etc/wfdconfigsink.xml
--system/framework/WfdCommon.jar
-system/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
-system/lib/libmmrtpdecoder.so
-system/lib/libmmrtpencoder.so
-system/lib/libwfdavenhancements.so
-system/lib/libwfdclient.so
-system/lib/libwfdcodecv4l2.so
-system/lib/libwfdcommonutils.so
-system/lib/libwfdconfigutils.so
-system/lib/libwfdmminterface.so
-system/lib/libwfdmmsink.so
-system/lib/libwfdmmsrc.so
-system/lib/libwfdnative.so
-system/lib/libwfdrtsp.so
-system/lib/libwfdservice.so
-system/lib/libwfdsm.so
-system/lib/libwfduibcinterface.so
-system/lib/libwfduibcsink.so
-system/lib/libwfduibcsinkinterface.so
-system/lib/libwfduibcsrc.so
-system/lib/libwfduibcsrcinterface.so
-system/lib64/libwfdclient.so
-system/lib64/libwfdnative.so
--system/priv-app/WfdService/WfdService.apk
-vendor/bin/wifidisplayhalservice
-vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc
-vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so
-vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
-vendor/lib/libwfdcommonutils_proprietary.so
-vendor/lib/libwfdhaldsmanager.so
-vendor/lib/libwfdhdcpcp.so
-vendor/lib/libwfdmmservice.so
-vendor/lib/libwfdmodulehdcpsession.so
diff --git a/sdm660.mk b/sdm660.mk
index a5bfc953..2e771ee9 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -465,6 +465,3 @@ PRODUCT_PACKAGES += \
     libaacwrapper \
     libmediaextractorservice \
     libnl
-
-PRODUCT_BOOT_JARS += \
-    WfdCommon