Skip to content

Commit

Permalink
raphael: Checkout NFC to LOS sm8150-common tree
Browse files Browse the repository at this point in the history 
* From https://github.com/LineageOS/android_device_xiaomi_sm8150-common.

Revert "raphael: build some NFC packages"

This reverts commit bbee144.
  • Loading branch information
@SebaUbuntu @joeyhuab
SebaUbuntu authored and joeyhuab committed Jan 24, 2023
1 parent be33ca2 commit 2ab819e
Show file tree
Hide file tree
Showing 24 changed files with 629 additions and 191 deletions.
11 changes: 7 additions & 4 deletions BoardConfig.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,15 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
vendor/evolution/config/device_framework_matrix.xml
DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/hidl/manifest.xml
DEVICE_MATRIX_FILE := $(DEVICE_PATH)/hidl/compatibility_matrix.xml
ODM_MANIFEST_SKUS += raphael
ODM_MANIFEST_RAPHAEL_FILES := $(DEVICE_PATH)/hidl/manifest_nfc.xml
ODM_MANIFEST_SKUS += nfc nfc_ese
ODM_MANIFEST_NFC_FILES := $(DEVICE_PATH)/hidl/manifest_nfc.xml
ODM_MANIFEST_NFC_ESE_FILES := \
$(DEVICE_PATH)/hidl/manifest_nfc.xml \
$(DEVICE_PATH)/hidl/manifest_ese.xml

# Init
TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_raphael
TARGET_RECOVERY_DEVICE_MODULES := libinit_raphael
TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):init_xiaomi_raphael
TARGET_RECOVERY_DEVICE_MODULES ?= init_xiaomi_raphael

# Kernel
BOARD_KERNEL_BASE := 0x00000000
Expand Down
14 changes: 1 addition & 13 deletions configs/nfc/libnfc-nci.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ NFC_DEBUG_ENABLED=1

###############################################################################
# File used for NFA storage
NFA_STORAGE="/data/vendor/nfc"
NFA_STORAGE="/data/nfc"

###############################################################################
# Configure the default NfcA/IsoDep techology and protocol route. Can be
Expand Down Expand Up @@ -124,15 +124,3 @@ DEFAULT_SYS_CODE={FE:FF}
#########################################################################
#Set NCI credit notification timeout value
NXP_NCI_CREDIT_NTF_TIMEOUT=2

###############################################################################
# Nfc recovery implementation
# 0: Crash Nfc Service
# 1: Toggle Nfc state
RECOVERY_OPTION=1

###############################################################################
# Mifare Tag implementation
# 0: General implementation
# 1: Legacy implementation
LEGACY_MIFARE_READER=1
14 changes: 7 additions & 7 deletions configs/nfc/libnfc-nxp.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
# ANDROID_LOG_WARN 0x02
# ANDROID_LOG_ERROR 0x01
# ANDROID_LOG_SILENT 0x00
NXPLOG_EXTNS_LOGLEVEL=0x02
NXPLOG_NCIHAL_LOGLEVEL=0x02
NXPLOG_NCIX_LOGLEVEL=0x02
NXPLOG_NCIR_LOGLEVEL=0x02
NXPLOG_FWDNLD_LOGLEVEL=0x02
NXPLOG_TML_LOGLEVEL=0x02
NFC_DEBUG_ENABLED=0x00
NXPLOG_EXTNS_LOGLEVEL=0x03
NXPLOG_NCIHAL_LOGLEVEL=0x03
NXPLOG_NCIX_LOGLEVEL=0x03
NXPLOG_NCIR_LOGLEVEL=0x03
NXPLOG_FWDNLD_LOGLEVEL=0x03
NXPLOG_TML_LOGLEVEL=0x03
NFC_DEBUG_ENABLED=1

###############################################################################
# Nfc Device Node name
Expand Down
189 changes: 189 additions & 0 deletions configs/nfc/libnfc-nxp_RF.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
##############################################################
## libnfc-nxp_RF.conf FW15 modify by Kevin 5th, Dec 2018######
## libnfc-nxp_RF.conf FW15 Hybrid mode 12th, Dec 2018#########
## libnfc-nxp_RF.conf FW17 enable LPCD 22th,Feb 2019#########
## libnfc-nxp_RF.conf FW17 add EMVCO RF parameters 1st,March 2019#########
## libnfc-nxp_RF.conf FW17 open DLMA which is used on F1/E5G 3rd,Apr 2019#########
## libnfc-nxp_RF.conf set DCDC to 5v 15th,Apr 2019#########
###############################################################################
# NXP RF configuration ALM/PLM settings
# This section needs to be updated with the correct values based on the platform
#PMU_CFG

NXP_RF_CONF_BLK_1={20, 02, 53, 03,
A0, 0E, 2C, F0, 00, 3E, 11, E4, E4, E4, 00, 00, 00, 00, 00, A7, 8E, FF, FF, 23, 23, 23, 23, 0A, 00, 00, 00, 00, 02, 00, 00, 01, 00, 10, 00, 04, 00, 00, 00, 17, 40, FF, 07, 13, 07, 05, 13,
A0, A5, 0D, 3B, 3B, 3B, 3B, 3B, 3B, FF, 03, 1F, 00, 00, 00, 00,
A0, 6A, 10, 00, 00, 00, 00, 00, 00, 00, 00, B4, 00, B4, 00, B4, 00, B4, 00
}

NXP_RF_CONF_BLK_2={20, 02, ED, 04,
A0, AF, 09, 11, 2F, 00, 2A, 11, 2F, 00, 2A, 00,
A0, 98, 05, 2F, 97, 1C, 80, 2A,
A0, 34, C8, 23, 04, 3D, 01, 00, 18, DE, 0C, 00, 00, DE, 0C, 00, 00, DE, 0C, 00, 00, DE, 0C, 00, 00, DE, 0C, 00, 00, DE, 0C, 00, 00, DE, 0C, 00, 00, DE, 0C, 00, 00, DE, 11, 00, 00, 71, 15, 00, 00, 71, 15, 00, 00, 71, 15, 00, 00, 04, 19, 00, 00, CE, 1A, 00, 00, 60, 1E, 00, 00, 2A, 20, 00, 00, 98, 3A, 00, 00, 98, 3A, 00, 00, 98, 3A, 00, 00, 98, 3A, 00, 00, 98, 3A, 00, 00, 98, 3A, 00, 00, 98, 3A, 00, 00, 98, 3A, 00, 00, 00, 18, 40, 06, 00, 00, 6C, 07, 00, 00, 6C, 07, 00, 00, 66, 08, 00, 00, 66, 08, 00, 00, 92, 09, 00, 00, 92, 09, 00, 00, B8, 0B, 00, 00, C0, 0D, 00, 00, C0, 0D, 00, 00, 4A, 10, 00, 00, 4A, 10, 00, 00, 4A, 10, 00, 00, 4A, 10, 00, 00, 4A, 10, 00, 00, 4A, 10, 00, 00, 4A, 10, 00, 00, 64, 14, 00, 00, 64, 14, 00, 00, 64, 14, 00, 00, 64, 14, 00, 00, 64, 14, 00, 00, 64, 14, 00, 00, 64, 14, 00, 00,
A0, 9E, 0A, 03, 97, 1C, 64, 00, 96, 00, 2B, 52, 03}

NXP_RF_CONF_BLK_3={20, 02, F1, 01, A0, A9, ED, 00, 2A, FF, 01, 24, FF, 02, 1F, FF, 03, 1A, FF, 04, 16, FF, 05, 12, FF, 06, 0F, FF, 07, 0C, FF, 08, 09, FF, 09, 07, FF, 0A, 05, FF, 0B, 03, FF, 0C, 01, FF, 0D, 00, F5, 0E, 00, DC, 0F, 00, C6, 10, 00, B3, 11, 00, A2, 12, 00, 92, 13, 00, 84, 14, 00, 77, 15, 00, 6B, 16, 00, 60, 17, 00, 57, 18, 00, 4E, 19, 00, 46, 1A, 00, 3F, 1B, 00, 39, 1C, 00, 33, 1D, 00, 2E, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A, 1E, 00, 2A}


NXP_RF_CONF_BLK_4={20, 02, C5, 02,
A0, 0B, BB, 00, 1D, 01, 14, 6A, 2A, E8, 03, E8, 03, 06, 10, 0E, 2C, 01, 78, 13, 00, 00, 78, 13, 00, 00, 78, 13, 00, 00, 78, 13, 00, 00, 78, 13, 00, 00, 78, 13, 00, 00, 78, 13, 00, 00, 78, 0A, 00, 00, 78, 0A, 00, 00, 78, 0A, 00, 00, 78, 0A, 00, 00, 78, 0A, 00, 00, 78, 0A, 00, 00, 78, 0A, 00, 00, 78, 0A, 00, 00, 78, 0A, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 78, 00, 00, 00, 3C, 00, 00, 00, 3C, 00, 00, 00, 3C, 00, 00, 00, 00, 00, 00, 00,
A0, A6, 03, C0, 08, 08
}

NXP_RF_CONF_BLK_5={20, 02, D8, 04,
A0, AB, 82, 27, 1B, 33, 04, 42, 04, 55, 04, 75, 04, 9E, 04, C7, 04, F0, 04, 20, 05, 4F, 05, 7F, 05, B8, 05, F2, 05, 2B, 06, 72, 06, BA, 06, 02, 07, 49, 07, 91, 07, F0, 07, 50, 08, AF, 08, 0F, 09, 6E, 09, E1, 09, 54, 0A, C6, 0A, 56, 0B, E5, 0B, 74, 0C, 04, 0D, 93, 0D, 52, 0E, 11, 0F, D0, 0F, 8F, 10, 4F, 11, 0E, 12, 2C, 13, 4B, 14, 6A, 15, 88, 16, A7, 17, C6, 18, 44, 1A, C2, 1B, 41, 1D, BF, 1E, 9D, 20, 7B, 22, 58, 24, 96, 26, D3, 28, 11, 2B, 4E, 2D, 4B, 30, 47, 33, 44, 36, 40, 39, 3D, 3C, A2, 3F, 07, 43, 6C, 46, E6, 4A, 61, 4F,
A0, A7, 0B, 00, 02, 77, 17, 1F, 1F, 1F, 0A, FF, 19, 05,
A0, A8, 38, 00, 33, 33, 10, 00, 33, 23, 10, 00, 33, 24, 10, 4B, 23, 44, 10, CF, 22, 43, 10, CF, 22, 43, 10, CF, 22, 43, 10, CE, 22, 43, 10, CF, 22, 43, 10, CE, 22, 43, 10, 00, 33, 22, 10, C0, 22, 23, 10, 00, 33, 22, 10, C0, 22, 23, 10,
A0, 1F, 06, 63, 00, 42, 00, 14, 00
}

NXP_RF_CONF_BLK_6={
20, 02, F8, 19,
A0, 99, 07, 03, 00, 80, 00, 00, 80, 00,
A0, 68, 2A, 06, 40, 60, 03, 19, 00, 00, 00, 00, 83, 04, 00, C0, 05, 00, 0F, E0, 00, 00, 0F, A0, 00, A0, 00, 03, FA, 00, 00, 00, 4C, 00, 14, 00, 7D, 00, 05, 7F, 00, 00, 01, 00, 03,
A0, 0D, 03, 24, 29, 07,
A0, 0D, 03, 24, 30, 07,
A0, 0D, 03, 25, 29, 01,
A0, 0D, 03, 25, 30, 01,
A0, 0D, 06, 40, 42, F0, C1, 37, CC,
A0, 0D, 06, 41, 45, 31, 12, 00, 00,
A0, 0D, 03, 42, 7C, 54,
A0, 0D, 06, 42, 8D, 00, A0, A4, 64,
A0, 0D, 06, 42, 8B, 00, A2, 23, 00,
A0, 0D, 06, 42, 89, 7F, 12, BD, 01,
A0, 0D, 06, 42, 44, 00, B0, 26, 01,
A0, 0D, 06, 42, 43, A5, 24, 4D, ED,
A0, 0D, 06, 42, 41, FF, FF, 5F, F0,
A0, 0D, 06, 42, 40, 20, 77, 33, 3A,
A0, 0D, 06, 42, 4A, 0E, 83, 81, 0D,
A0, 0D, 06, 42, 49, 79, 46, 26, 00,
A0, 0D, 06, 51, 40, 12, 77, 33, 3A,
A0, 0D, 06, 43, 44, 00, 34, 12, 01,
A0, 0D, 06, 43, 43, A5, 64, 4C, AD,
A0, 0D, 06, 43, 40, 05, 77, 33, 3D,
A0, 0D, 06, 43, 4A, 00, 00, 00, 00,
A0, 0D, 06, 43, 49, 00, 00, 00, 00,
A0, 0D, 06, 44, 44, 00, 34, 12, 01
}

NXP_RF_CONF_BLK_7={
20, 02, FD, 1C,
A0, 0D, 06, 44, 43, A5, 64, 4C, AD,
A0, 0D, 06, 44, 40, 05, 77, 33, 3D,
A0, 0D, 06, 44, 4A, 00, 00, 00, 00,
A0, 0D, 06, 44, 49, 00, 00, 00, 00,
A0, 0D, 06, 45, 44, 00, 34, 12, 01,
A0, 0D, 06, 45, 43, A5, 64, 4C, AD,
A0, 0D, 06, 45, 40, 05, 77, 33, 3D,
A0, 0D, 06, 45, 4A, 00, 00, 00, 00,
A0, 0D, 06, 45, 49, 00, 00, 00, 00,
A0, 0D, 06, 46, 45, 39, 12, 00, 00,
A0, 0D, 06, 46, 44, 00, 34, 12, 01,
A0, 0D, 06, 47, 43, A5, 64, 4C, ED,
A0, 0D, 06, 47, 40, 05, 77, 33, 3D,
A0, 0D, 06, 47, 4A, 20, AA, 0B, 81,
A0, 0D, 06, 47, 49, B5, 44, 22, 00,
A0, 0D, 06, 48, 43, A5, 64, 4C, AD,
A0, 0D, 06, 48, 40, 05, 77, 33, 3D,
A0, 0D, 06, 48, 4A, 00, 00, 00, 00,
A0, 0D, 06, 48, 49, 00, 00, 00, 00,
A0, 0D, 06, 49, 43, A5, 64, 4C, AD,
A0, 0D, 06, 49, 40, 05, 77, 33, 3D,
A0, 0D, 06, 49, 4A, 00, 00, 00, 00,
A0, 0D, 06, 49, 49, 00, 00, 00, 00,
A0, 0D, 06, 4A, 8B, 48, 02, F0, 80,
A0, 0D, 06, 4A, 43, A5, 64, 4C, AD,
A0, 0D, 06, 4A, 40, 05, 77, 33, 3D,
A0, 0D, 06, 4A, 4A, 00, 00, 00, 00,
A0, 0D, 06, 4A, 49, 00, 00, 00, 00
}

NXP_RF_CONF_BLK_8={
20, 02, C4, 16,
A0, 0D, 06, 4B, 43, A5, 64, 4C, 6D,
A0, 0D, 06, 4B, 40, 85, 51, 33, 3D,
A0, 0D, 06, 4C, 44, 00, 34, 12, 01,
A0, 0D, 06, 4C, 4A, 00, 00, 00, 00,
A0, 0D, 06, 4C, 49, 00, 00, 00, 00,
A0, 0D, 06, 4D, 44, 00, 34, 12, 01,
A0, 0D, 06, 4D, 4A, 00, 00, 00, 00,
A0, 0D, 06, 4D, 49, 00, 00, 00, 00,
A0, 0D, 06, 4E, 45, 31, 12, 00, 00,
A0, 0D, 03, 4E, 7C, 50,
A0, 0D, 06, 4E, 8D, 00, 00, 00, 06,
A0, 0D, 06, 4E, 8B, 00, A2, 24, 00,
A0, 0D, 06, 4E, 89, 7D, 84, 05, 08,
A0, 0D, 06, 4E, 44, 00, B0, 26, 01,
A0, 0D, 06, 4E, 43, A5, 64, 5C, AD,
A0, 0D, 06, 4E, 41, FF, FF, 5F, F0,
A0, 0D, 06, 4E, 40, 07, 77, 33, 3D,
A0, 0D, 06, 4E, 4A, 2A, 8E, 8D, 2A,
A0, 0D, 06, 4E, 49, 5D, 27, 27, 00,
A0, 0D, 06, 60, 4E, FF, FF, FF, 01,
A0, 0D, 06, 60, 4F, FF, FF, FF, 01,
A0, 0D, 06, 60, 50, FF, FF, FF, 3F
}

NXP_RF_CONF_BLK_9={20, 02, 4F, 09,
A0, 0D, 03, 61, 09, 7E,
A0, 0D, 06, 60, AB, FF, FF, 00, 00,
A0, 0D, 06, 60, 95, FF, FF, 0F, 00,
A0, 0D, 06, 60, 97, FF, FF, 0F, 00,
A0, 0D, 06, 60, 4C, 20, 0A, 00, 00,
A0, 0D, 06, 82, 82, 47, 80, 00, 00,
A0, 0D, 06, 80, 82, 47, 80, 00, 00,
A0, 0D, 06, 62, 32, AE, 00, 7F, 00,
A0, 0D, 06, 67, 32, AE, 00, 1F, 00
}

NXP_RF_CONF_MAX_NUM=9

###############################################################################
# Core configuration extensions
# It includes
# Wired mode settings A0ED, A0EE
# Tag Detector A040, A041, A043
# Low Power mode A007
# Clock settings A002, A003
# PbF settings A008
# Clock timeout settings A004
# eSE (SVDD) PWR REQ settings A0F2
# Window size A0D8
# DWP Speed A0D5
# How eSE connected to PN553 A012
# UICC2 bit rate A0D1
# SWP1A interface A0D4
# DWP intf behavior config, SVDD Load activated by default if set to 0x31 A037
NXP_CORE_CONF_EXTN={20, 02, 12, 04,
A0, EC, 01, 01,
A0, ED, 01, 01,
A0, 07, 01, 01,
A0, 47, 02, 00, 27
}

# A0, 40, 01, 00
# A0, 41, 01, 02,
# A0, 43, 01, 04,
# }

###############################################################################
# Core configuration settings
NXP_CORE_CONF={ 20, 02, 30, 10,
28, 01, 00,
21, 01, 00,
30, 01, 04,
31, 01, 00,
32, 01, 60,
38, 01, 01,
33, 00,
54, 01, 06,
50, 01, 02,
5B, 01, 00,
80, 01, 01,
81, 01, 01,
82, 01, 0E,
18, 01, 01,
68, 01, 01,
85, 01, 01
}
###############################################################################
31 changes: 20 additions & 11 deletions device.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml \
frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_raphael/android.hardware.nfc.ese.xml \
frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_raphael/android.hardware.nfc.hce.xml \
frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_raphael/android.hardware.nfc.hcef.xml \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_raphael/android.hardware.nfc.uicc.xml \
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_raphael/android.hardware.nfc.xml \
frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \
frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \
Expand Down Expand Up @@ -86,9 +81,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.opengles.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml \
frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml \
frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml \
frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_raphael/com.android.nfc_extras.xml \
frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_raphael/com.nxp.mifare.xml
frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml

# Adaptive Suspend
PRODUCT_PROPERTY_OVERRIDES += \
Expand Down Expand Up @@ -332,17 +325,33 @@ PRODUCT_PACKAGES += \
[email protected] \
com.android.nfc_extras \
libchrome.vendor \
[email protected] \
[email protected] \
NfcNci \
SecureElement \
Tag

PRODUCT_COPY_FILES += \
$(call find-copy-subdir-files,*,$(LOCAL_PATH)/configs/nfc/,$(TARGET_COPY_OUT_VENDOR)/etc)

PRODUCT_PACKAGES += \
[email protected]

PRODUCT_COPY_FILES += \
$(call find-copy-subdir-files,*,$(LOCAL_PATH)/configs/nfc/,$(TARGET_COPY_OUT_VENDOR)/etc)
frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.nfc.hce.xml \
frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.nfc.hcef.xml \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.nfc.uicc.xml \
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.nfc.xml \
frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.se.omapi.uicc.xml \
frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/com.android.nfc_extras.xml

PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.nfc.ese.xml \
frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.nfc.hce.xml \
frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.nfc.hcef.xml \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.nfc.uicc.xml \
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.nfc.xml \
frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.se.omapi.ese.xml \
frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.se.omapi.uicc.xml \
frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/com.android.nfc_extras.xml

# OMX
PRODUCT_PACKAGES += \
Expand Down
12 changes: 0 additions & 12 deletions hidl/manifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<fqname>@2.2::IFactory/default</fqname>
<fqname>@2.3::IFactory/default</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.esepowermanager</name>
<transport>hwbinder</transport>
<fqname>@1.1::IEsePowerManager/default</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.radio</name>
<transport>hwbinder</transport>
Expand All @@ -217,13 +212,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<transport>hwbinder</transport>
<fqname>@1.1::IRadioConfig/default</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.secure_element</name>
<transport>hwbinder</transport>
<fqname>@1.2::ISecureElement/SIM1</fqname>
<fqname>@1.2::ISecureElement/SIM2</fqname>
<fqname>@1.2::ISecureElement/eSE1</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.hardware.fm</name>
<transport>hwbinder</transport>
Expand Down
12 changes: 12 additions & 0 deletions hidl/manifest_ese.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<manifest version="2.0" type="device">
<hal format="hidl">
<name>android.hardware.secure_element</name>
<transport>hwbinder</transport>
<fqname>@1.2::ISecureElement/eSE1</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.esepowermanager</name>
<transport>hwbinder</transport>
<fqname>@1.1::IEsePowerManager/default</fqname>
</hal>
</manifest>
6 changes: 3 additions & 3 deletions hidl/manifest_nfc.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<manifest version="1.0" type="device">
<manifest version="2.0" type="device">
<hal format="hidl">
<name>android.hardware.nfc</name>
<transport>hwbinder</transport>
<fqname>@1.2::INfc/default</fqname>
</hal>
<hal format="hidl">
<name>vendor.nxp.hardware.nfc</name>
<name>vendor.nxp.nxpnfc</name>
<transport>hwbinder</transport>
<fqname>@2.0::INqNfc/default</fqname>
<fqname>@1.0::INxpNfc/default</fqname>
</hal>
</manifest>
16 changes: 0 additions & 16 deletions init/Android.bp
View file

This file was deleted.

Loading

0 comments on commit 2ab819e

Please sign in to comment.