diff options
| -rw-r--r-- | configs/manifests/manifest.xml | 14 | ||||
| -rw-r--r-- | configs/qti_whitelist.xml | 3 | ||||
| -rw-r--r-- | configs/system-privapp-permissions-qti.xml | 35 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 14 | ||||
| -rw-r--r-- | proprietary-files.txt | 39 | ||||
| -rw-r--r-- | sdm660.mk | 9 | ||||
| -rw-r--r-- | system.prop | 3 |
7 files changed, 14 insertions, 103 deletions
diff --git a/configs/manifests/manifest.xml b/configs/manifests/manifest.xml index 46105be..c1b1428 100644 --- a/configs/manifests/manifest.xml +++ b/configs/manifests/manifest.xml @@ -497,20 +497,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <instance>default</instance> </interface> </hal> - <!-- WFD HAL Service --> - <hal format="hidl"> - <name>com.qualcomm.qti.wifidisplayhal</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IHDCPSession</name> - <instance>wifidisplayhdcphal</instance> - </interface> - <interface> - <name>IDSManager</name> - <instance>wifidisplaydshal</instance> - </interface> - </hal> <hal format="hidl"> <name>android.hardware.drm</name> <transport>hwbinder</transport> diff --git a/configs/qti_whitelist.xml b/configs/qti_whitelist.xml index ef1cb4a..197baac 100644 --- a/configs/qti_whitelist.xml +++ b/configs/qti_whitelist.xml @@ -62,7 +62,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/configs/system-privapp-permissions-qti.xml b/configs/system-privapp-permissions-qti.xml deleted file mode 100644 index a534f41..0000000 --- a/configs/system-privapp-permissions-qti.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (c) 2017, The Linux Foundation. All rights reserved. - - ~ Not a Contribution. ---> - -<!-- - ~ Copyright (C) 2016 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License - --> - -<!-- -This XML file declares which signature|privileged permissions should be -granted to privileged applications on QTI devices. -It allows additional grants on top of privapp-permissions-platform.xml ---> - -<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/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index ce03084..bd0168c 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -69,6 +69,20 @@ <!-- Is the device capable of hot swapping an ICC Card --> <bool name="config_hotswapCapable">true</bool> + <!-- Whether WiFi display is supported by this device. + There are many prerequisites for this feature to work correctly. + Here are a few of them: + * The WiFi radio must support WiFi P2P. + * The WiFi radio must support concurrent connections to the WiFi display and + to an access point. + * The Audio Flinger audio_policy.conf file must specify a rule for the "r_submix" + remote submix module. This module is used to record and stream system + audio output to the WiFi display encoder in the media server. + * The remote submix module "audio.r_submix.default" must be installed on the device. + * The device must be provisioned with HDCP keys (for protected content). + --> + <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 diff --git a/proprietary-files.txt b/proprietary-files.txt index 939edad..d8bbac5 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -547,42 +547,3 @@ vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so|e47baed52f1c0637de34fa55e45a86b vendor/bin/hw/android.hardware.drm@1.2-service.widevine|1aed116c6cd73ee0c89a5eec050afab5c64b9f87 vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc|dee5b7838ac561a2292e89fc0c4ccd1932224215 vendor/lib64/libwvhidl.so|0466cd3b2a7b93efd23945e2637430513472ad7c - -# WiFi Display - from jasmine -bin/wfdservice|d9cccfd6ca14a1d83117533296d6cac2c139c310 -etc/init/wfdservice.rc|311bfdd1675e56499662f39455536b75b78477bb -etc/wfdconfig.xml|d07f6b0441c0aa8913865100239490fa8687a020 -etc/wfdconfigsink.xml|5b4a96f251fd83c2eee520d06bea2b5b159fcd36 --framework/WfdCommon.jar|3440607d29511e1a671e565a2acc4d262e38a9fb -lib/com.qualcomm.qti.wifidisplayhal@1.0.so|47e7949bceaff2d4ef11c51073fa2a173b82eddd -lib/libmmrtpdecoder.so|ff871cfac4a4d9dac89a612f100ca9de9add9344 -lib/libmmrtpencoder.so|eb32452859323bdfdabcf3780bebad781b367ac4 -lib/libwfdavenhancements.so|9faebc424959e2152adf4c1e970cc451952b21f9 -lib/libwfdclient.so|9c075928fa35c57863bd16a5571fe97d599a988a -lib/libwfdcodecv4l2.so|bfaf6e18013d9cc4665c57c1f9f639b87da3e433 -lib/libwfdcommonutils.so|c02a5d6f5eb17a12ff79b08b77d07d99e3d54de5 -lib/libwfdconfigutils.so|3d2585e3674ae11b2322a38f1b7509908f9e54a1 -lib/libwfdmminterface.so|c2914c60cb412732d45610e67e7e408f6ad7a45a -lib/libwfdmmsink.so|987b4d5b40fb584763da477ea08b91c0146bb2b1 -lib/libwfdmmsrc.so|43ee8c98670c9395fd2a6edce1db929760fab1c2 -lib/libwfdnative.so|19fcd406b721891ea7df7a7c95de42fa26fdfb14 -lib/libwfdrtsp.so|6194fed354ed8f26b813b39510d2ee8db729492d -lib/libwfdservice.so|ba2e446ef8ad69123eaa49814d1fdff4946ff9f6 -lib/libwfdsm.so|2256010a75247f3b1638a31aac332a7ca4bc7364 -lib/libwfduibcinterface.so|6bfbcfaec293efb6029cb871558ccef8c74ce5bf -lib/libwfduibcsink.so|78db2e13f03602d089160397ac494d35a5f4a1f3 -lib/libwfduibcsinkinterface.so|23b1a68bd56e9788c61a262a0350b0a0b8c5b031 -lib/libwfduibcsrc.so|f6f35ca89441967fcf3f6590f45b81d92311a81c -lib/libwfduibcsrcinterface.so|bfe916d7d1a9395883417b4076a41a50d7cf83ad -lib64/libwfdclient.so|884bfd6710f05d567eb0083a00ee4889f73d796d -lib64/libwfdnative.so|587b774c4eb49f188747dd80d67426e68d87d396 --priv-app/WfdService/WfdService.apk|311d2726d96beba2baa28b6c73dcb6f8a3d99d40 -vendor/bin/wifidisplayhalservice|56ec79e39595e0c34baba8cb16ab5d1931d793db -vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc|04e463342cbba4c0e9c311a18238f95dec9359fd -vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so|f8d82d7e80e730c01fc0c84f4464762d273b4d62 -vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so|cf03926fce8af504ae3a36af6ea50ce066112ca1 -vendor/lib/libwfdcommonutils_proprietary.so|14df45871041125273609b6ddc507fa6901cb44d -vendor/lib/libwfdhaldsmanager.so|00a7bf5c76ef2b1ee72fcaf6d3af6d7f09f31fae -vendor/lib/libwfdhdcpcp.so|ba051604d914847b862d78af70d02abf85d86d4b -vendor/lib/libwfdmmservice.so|87f9c841031272e6a3713abd85326f84d2ae52e5 -vendor/lib/libwfdmodulehdcpsession.so|97ffe7c96970fc5605f4f6414fc31ab7cec78bdc @@ -34,7 +34,6 @@ PRODUCT_SOONG_NAMESPACES += \ # Permissions PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/system-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \ $(LOCAL_PATH)/configs/system_ext-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-qti.xml PRODUCT_COPY_FILES += \ @@ -407,13 +406,5 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \ $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini -# WiFi Display -PRODUCT_PACKAGES += \ - libaacwrapper \ - libnl - -PRODUCT_BOOT_JARS += \ - WfdCommon - # Inherit the proprietary files $(call inherit-product, vendor/xiaomi/sdm660-common/sdm660-common-vendor.mk) diff --git a/system.prop b/system.prop index 1258453..acf96cf 100644 --- a/system.prop +++ b/system.prop @@ -21,6 +21,3 @@ DEVICE_PROVISIONED=1 persist.sys.fflag.override.settings_network_and_internet_v2=true ril.subscription.types=NV,RUIM telephony.lteOnCdmaDevice=1 - -# WFD -persist.debug.wfd.enable=0 |