milanf: Update sku manifests from stock and drop permissions
Change-Id: I6e6dc9756d11fcb563477f6e14f9b782854cb04f Signed-off-by: AnierinB <anierin@evolution-x.org>
This commit is contained in:
parent
b8d1c5d668
commit
9afed7c529
10 changed files with 78 additions and 117 deletions
|
|
@ -16,9 +16,7 @@ TARGET_BOOTLOADER_BOARD_NAME := milanf
|
||||||
|
|
||||||
# HIDL
|
# HIDL
|
||||||
DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
|
DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
|
||||||
ODM_MANIFEST_SKUS += b d dn n
|
ODM_MANIFEST_SKUS += dn n
|
||||||
ODM_MANIFEST_B_FILES := $(DEVICE_PATH)/sku/manifest_b.xml
|
|
||||||
ODM_MANIFEST_D_FILES := $(DEVICE_PATH)/sku/manifest_d.xml
|
|
||||||
ODM_MANIFEST_DN_FILES := $(DEVICE_PATH)/sku/manifest_dn.xml
|
ODM_MANIFEST_DN_FILES := $(DEVICE_PATH)/sku/manifest_dn.xml
|
||||||
ODM_MANIFEST_N_FILES := $(DEVICE_PATH)/sku/manifest_n.xml
|
ODM_MANIFEST_N_FILES := $(DEVICE_PATH)/sku/manifest_n.xml
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -66,15 +66,6 @@ PRODUCT_COPY_FILES += \
|
||||||
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
|
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
|
||||||
frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml
|
frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml
|
||||||
|
|
||||||
DEVICE_SKUS := b d
|
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
|
||||||
$(foreach DEVICE_SKU, $(DEVICE_SKUS), \
|
|
||||||
$(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.hce.xml \
|
|
||||||
$(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.hcef.xml \
|
|
||||||
$(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.uicc.xml \
|
|
||||||
$(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.xml)
|
|
||||||
|
|
||||||
# Sensors
|
# Sensors
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
sensors.milanf
|
sensors.milanf
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<permissions>
|
|
||||||
<unavailable-feature name="android.hardware.nfc.hce"/>
|
|
||||||
</permissions>
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<permissions>
|
|
||||||
<unavailable-feature name="android.hardware.nfc.hcef"/>
|
|
||||||
</permissions>
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<permissions>
|
|
||||||
<unavailable-feature name="android.hardware.nfc.uicc"/>
|
|
||||||
</permissions>
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<permissions>
|
|
||||||
<unavailable-feature name="android.hardware.nfc"/>
|
|
||||||
<unavailable-feature name="android.hardware.nfc.any"/>
|
|
||||||
</permissions>
|
|
||||||
|
|
@ -1,72 +0,0 @@
|
||||||
<!--
|
|
||||||
Input:
|
|
||||||
manifest_b.xml
|
|
||||||
-->
|
|
||||||
<manifest version="2.0" type="device">
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>android.hardware.nfc</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>android.hardware.radio</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.2::ISap/slot1</fqname>
|
|
||||||
<fqname>@1.5::IRadio/slot1</fqname>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>android.hardware.secure_element</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.2::ISecureElement/SIM1</fqname>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>vendor.qti.hardware.data.connection</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.1::IDataConnection/slot1</fqname>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>vendor.qti.hardware.data.iwlan</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.0::IIWlan/slot1</fqname>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>vendor.qti.hardware.radio.am</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.0::IQcRilAudio/slot1</fqname>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>vendor.qti.hardware.radio.ims</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.7::IImsRadio/imsradio0</fqname>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>vendor.qti.hardware.radio.lpa</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.1::IUimLpa/UimLpa0</fqname>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>vendor.qti.hardware.radio.qcrilhook</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.0::IQtiOemHook/oemhook0</fqname>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>vendor.qti.hardware.radio.qtiradio</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.0::IQtiRadio/slot1</fqname>
|
|
||||||
<fqname>@2.7::IQtiRadio/slot1</fqname>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>vendor.qti.hardware.radio.uim</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.2::IUim/Uim0</fqname>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>vendor.qti.hardware.radio.uim_remote_client</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.0::IUimRemoteServiceClient/uimRemoteClient0</fqname>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>vendor.qti.hardware.radio.uim_remote_server</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.0::IUimRemoteServiceServer/uimRemoteServer0</fqname>
|
|
||||||
</hal>
|
|
||||||
</manifest>
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
<!--
|
|
||||||
Input:
|
|
||||||
manifest_d.xml
|
|
||||||
-->
|
|
||||||
<manifest version="2.0" type="device">
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>android.hardware.nfc</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl" override="true">
|
|
||||||
<name>android.hardware.secure_element</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<fqname>@1.2::ISecureElement/SIM1</fqname>
|
|
||||||
<fqname>@1.2::ISecureElement/SIM2</fqname>
|
|
||||||
</hal>
|
|
||||||
</manifest>
|
|
||||||
|
|
@ -6,11 +6,22 @@
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>android.hardware.nfc</name>
|
<name>android.hardware.nfc</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.2</version>
|
||||||
|
<interface>
|
||||||
|
<name>INfc</name>
|
||||||
|
<instance>default</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.2::INfc/default</fqname>
|
<fqname>@1.2::INfc/default</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>android.hardware.secure_element</name>
|
<name>android.hardware.secure_element</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.2</version>
|
||||||
|
<interface>
|
||||||
|
<name>ISecureElement</name>
|
||||||
|
<instance>SIM1</instance>
|
||||||
|
<instance>SIM2</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.2::ISecureElement/SIM1</fqname>
|
<fqname>@1.2::ISecureElement/SIM1</fqname>
|
||||||
<fqname>@1.2::ISecureElement/SIM2</fqname>
|
<fqname>@1.2::ISecureElement/SIM2</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
|
|
|
||||||
|
|
@ -6,68 +6,134 @@
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>android.hardware.nfc</name>
|
<name>android.hardware.nfc</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.2</version>
|
||||||
|
<interface>
|
||||||
|
<name>INfc</name>
|
||||||
|
<instance>default</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.2::INfc/default</fqname>
|
<fqname>@1.2::INfc/default</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>android.hardware.radio</name>
|
<name>android.hardware.radio</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.5</version>
|
||||||
|
<interface>
|
||||||
|
<name>IRadio</name>
|
||||||
|
<instance>slot1</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.2::ISap/slot1</fqname>
|
<fqname>@1.2::ISap/slot1</fqname>
|
||||||
<fqname>@1.5::IRadio/slot1</fqname>
|
<fqname>@1.5::IRadio/slot1</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>android.hardware.secure_element</name>
|
<name>android.hardware.secure_element</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.2</version>
|
||||||
|
<interface>
|
||||||
|
<name>ISecureElement</name>
|
||||||
|
<instance>SIM1</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.2::ISecureElement/SIM1</fqname>
|
<fqname>@1.2::ISecureElement/SIM1</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>vendor.qti.hardware.data.connection</name>
|
<name>vendor.qti.hardware.data.connection</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.1</version>
|
||||||
|
<interface>
|
||||||
|
<name>IDataConnection</name>
|
||||||
|
<instance>slot1</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.1::IDataConnection/slot1</fqname>
|
<fqname>@1.1::IDataConnection/slot1</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>vendor.qti.hardware.data.iwlan</name>
|
<name>vendor.qti.hardware.data.iwlan</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>IIWlan</name>
|
||||||
|
<instance>slot1</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.0::IIWlan/slot1</fqname>
|
<fqname>@1.0::IIWlan/slot1</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>vendor.qti.hardware.radio.am</name>
|
<name>vendor.qti.hardware.radio.am</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>IQcRilAudio</name>
|
||||||
|
<instance>slot1</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.0::IQcRilAudio/slot1</fqname>
|
<fqname>@1.0::IQcRilAudio/slot1</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>vendor.qti.hardware.radio.ims</name>
|
<name>vendor.qti.hardware.radio.ims</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.7</version>
|
||||||
|
<interface>
|
||||||
|
<name>IImsRadio</name>
|
||||||
|
<instance>imsradio0</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.7::IImsRadio/imsradio0</fqname>
|
<fqname>@1.7::IImsRadio/imsradio0</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>vendor.qti.hardware.radio.lpa</name>
|
<name>vendor.qti.hardware.radio.lpa</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.1</version>
|
||||||
|
<interface>
|
||||||
|
<name>IUimLpa</name>
|
||||||
|
<instance>UimLpa0</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.1::IUimLpa/UimLpa0</fqname>
|
<fqname>@1.1::IUimLpa/UimLpa0</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>vendor.qti.hardware.radio.qcrilhook</name>
|
<name>vendor.qti.hardware.radio.qcrilhook</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>IQtiOemHook</name>
|
||||||
|
<instance>oemhook0</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.0::IQtiOemHook/oemhook0</fqname>
|
<fqname>@1.0::IQtiOemHook/oemhook0</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>vendor.qti.hardware.radio.qtiradio</name>
|
<name>vendor.qti.hardware.radio.qtiradio</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.0</version>
|
||||||
|
<version>2.7</version>
|
||||||
|
<interface>
|
||||||
|
<name>IQtiRadio</name>
|
||||||
|
<instance>slot1</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.0::IQtiRadio/slot1</fqname>
|
<fqname>@1.0::IQtiRadio/slot1</fqname>
|
||||||
<fqname>@2.7::IQtiRadio/slot1</fqname>
|
<fqname>@2.7::IQtiRadio/slot1</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>vendor.qti.hardware.radio.uim</name>
|
<name>vendor.qti.hardware.radio.uim</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.2</version>
|
||||||
|
<interface>
|
||||||
|
<name>IUim</name>
|
||||||
|
<instance>Uim0</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.2::IUim/Uim0</fqname>
|
<fqname>@1.2::IUim/Uim0</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>vendor.qti.hardware.radio.uim_remote_client</name>
|
<name>vendor.qti.hardware.radio.uim_remote_client</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>IUimRemoteServiceClient</name>
|
||||||
|
<instance>uimRemoteClient0</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.0::IUimRemoteServiceClient/uimRemoteClient0</fqname>
|
<fqname>@1.0::IUimRemoteServiceClient/uimRemoteClient0</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" override="true">
|
<hal format="hidl" override="true">
|
||||||
<name>vendor.qti.hardware.radio.uim_remote_server</name>
|
<name>vendor.qti.hardware.radio.uim_remote_server</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>IUimRemoteServiceServer</name>
|
||||||
|
<instance>uimRemoteServer0</instance>
|
||||||
|
</interface>
|
||||||
<fqname>@1.0::IUimRemoteServiceServer/uimRemoteServer0</fqname>
|
<fqname>@1.0::IUimRemoteServiceServer/uimRemoteServer0</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue