From 12cd221e680adb6e863f66093d36b91c966ee237 Mon Sep 17 00:00:00 2001 From: Chia-Kai Liang Date: Thu, 14 Jul 2022 04:20:16 +0000 Subject: [PATCH 1/3] Revert "powerhint: Disable PreferIdle STANDARD streaming" This reverts commit 5b8dbb546cf3ec73ba1711d5d54b4a03d72fe72d. Reason for revert: b/238852060 and b/238284104) Bug: 238852060 Change-Id: I0aa5910f7047d3f710cbb3f2538330454ba370f4 --- powerhint-cheetah-a0.json | 6 ------ powerhint-cheetah.json | 6 ------ powerhint-panther-a0.json | 6 ------ powerhint-panther.json | 6 ------ 4 files changed, 24 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 6f27263..3974f21 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -1018,12 +1018,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDPreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index fd31e44..8b55958 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -1039,12 +1039,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDPreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 265960f..9e84dab 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -1006,12 +1006,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDPreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-panther.json b/powerhint-panther.json index 3bfc4f5..1896925 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -1016,12 +1016,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDPreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUBigClusterMaxFreq", From 76de57ae2fa8abae7dc6478efc3fbd08c2a07768 Mon Sep 17 00:00:00 2001 From: Long Ling Date: Mon, 18 Jul 2022 15:41:50 -0700 Subject: [PATCH 2/3] display: update color data Bug: 216312292 Change-Id: Iad084514aa4ae580d9356fd6c2da4b8b9db0fef6 --- cheetah/display_colordata_dev_cal0.pb | Bin 0 -> 642 bytes device-cheetah.mk | 1 + panther/display_colordata_dev_cal0.pb | Bin 1426 -> 1995 bytes 3 files changed, 1 insertion(+) create mode 100644 cheetah/display_colordata_dev_cal0.pb diff --git a/cheetah/display_colordata_dev_cal0.pb b/cheetah/display_colordata_dev_cal0.pb new file mode 100644 index 0000000000000000000000000000000000000000..1094e9e3dc682f70cdc4ea0e79dcc7c069ca36e6 GIT binary patch literal 642 zcmXZXT}V@57yw}3_xqc(bge8ctJx39A`}x53Cbc7A`z7+5G-q!piaUIgD%cRoB(q(@6TWIv#VABR;T|r zJMp}u+Hvtrt>c`n?2^q{US3&I?XcB4ot1}4erk^O6*Ui0b6jy@PJU7D(ZbTA;`Fqv z4691bt6)Zp*&=KaVV{R6Kx(oi*izE64&@b`Jbj_2P68QR-~lfvpn?WI@PiHp1Rw|@ z2!n(&y3m7OR8U0?edtFW4GdrqLl{Ph$iziF#7h*S5{>wXpXkIO0TLu35+)Lrsf&83 zmnu}H8ud{>)u}-PG)O}Q%0 zmiS-sZ#Jr%+zG1*vx)lVfh`Y{y0?0^-Pqn_yPn**qh)9NuHoHR_q(O2=Oa;oNe zZEu}+c}#+(EAXHJ!p$(%3d8L%(gCww(0Uh)9_Z@@MT7nUm>GhOQCOLPMFZpjy!Z}n z3(&9(-4Xayj{`0ozJ*KOIM##uQw4hU19dB`n(gk8mNspFx$S#KxTTnU#aT>IG=;?d@ya^*o4r{grY~TbJKUYy+ zUU4P!zfHTHZu={09i-NzlA_##;=H3pWyK|#897;Ym0DN8iZ-iFIAg*!2XTPZVskjt zGja~+7oIwEp|VN>89d;J04Sh>20;jc4hEPIh6qGKLK!{i#{ep*qJ}{Xp^gTc7{&-j zQ6jRNc!-|_h(c7Nkst{XofyOl8MB#2)d z=MCo99shVjD{L!nJXwF*SNfoA`0Voe-iv=OPgXv^)?KAtAC+M720W^TXah`oVWA?bM9f9R>STH~~;l+1oo`>2c=!n6m8tnJr&>dXtz|l_B vpQ7{ Date: Wed, 27 Apr 2022 20:45:16 +0800 Subject: [PATCH 3/3] Enable NFC firmware logging by default for user-debug builds Set the RF payload to 15 bytes and SWP payload to 30 bytes for user-debug builds. Bug: 213305069 Bug: 235492799 Test: manual Change-Id: Iabcda7a253e77c0c9cce386ebb1a77dd83e13822 --- device-cheetah.mk | 9 +- device-cloudripper.mk | 9 +- device-panther.mk | 9 +- nfc/libnfc-hal-st-debug.conf | 164 +++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+), 3 deletions(-) create mode 100644 nfc/libnfc-hal-st-debug.conf diff --git a/device-cheetah.mk b/device-cheetah.mk index 3f7e83f..4979e86 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -96,10 +96,17 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \ - device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ device/google/pantah/nfc/libnfc-hal-st-proto1.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st-proto1.conf \ device/google/pantah/nfc/libnfc-nci-cheetah.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_COPY_FILES += \ + device/google/pantah/nfc/libnfc-hal-st-debug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf +else +PRODUCT_COPY_FILES += \ + device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf +endif + PRODUCT_PACKAGES += \ NfcNci \ Tag \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index c045a35..184fd07 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -54,9 +54,16 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \ frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \ - device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_COPY_FILES += \ + device/google/pantah/nfc/libnfc-hal-st-debug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf +else +PRODUCT_COPY_FILES += \ + device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf +endif + PRODUCT_PACKAGES += \ NfcNci \ Tag \ diff --git a/device-panther.mk b/device-panther.mk index 302a8c9..084380c 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -80,9 +80,16 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \ device/google/pantah/nfc/libnfc-hal-st-proto1.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st-proto1.conf \ - device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ device/google/pantah/nfc/libnfc-nci-panther.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_COPY_FILES += \ + device/google/pantah/nfc/libnfc-hal-st-debug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf +else +PRODUCT_COPY_FILES += \ + device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf +endif + PRODUCT_PACKAGES += \ NfcNci \ Tag \ diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf new file mode 100644 index 0000000..7ccc526 --- /dev/null +++ b/nfc/libnfc-hal-st-debug.conf @@ -0,0 +1,164 @@ +########################### Start of libnf-hal-st_aosp.conf ########################### + +############################################################################### +############################################################################### +# ST HAL trace log level +STNFC_HAL_LOGLEVEL=1 +NFC_DEBUG_ENABLED=0 + +############################################################################### +# Vendor specific mode to enable FW (RF & SWP) traces. +STNFC_FW_DEBUG_ENABLED=1 + +############################################################################### +# Vendor specific payload size for traces +STNFC_FW_RF_LOG_SIZE=15 +STNFC_FW_SWP_LOG_SIZE=30 + +############################################################################### +# File used for NFA storage +NFA_STORAGE="/data/nfc" + +############################################################################### +# Keep the nfa storage file. +PRESERVE_STORAGE=1 + +############################################################################### +# In Switch OFF mode (phone switched-off), specify the desired CE mode to +# the controller. +# 0: No card-emulation; DEFAULT +# 1: Switch-off card-emulation enabled +CE_ON_SWITCH_OFF_STATE=1 + +############################################################################### +# Vendor specific mode to support the USB charging mode if VPSIO=1 in switch off. +STNFC_USB_CHARGING_MODE=1 + +############################################################################### +# Vendor Specific Proprietary Protocol & Discovery Configuration +# Set to 0xFF if unsupported +# byte[0] NCI_PROTOCOL_18092_ACTIVE +# byte[1] NCI_PROTOCOL_B_PRIME +# byte[2] NCI_PROTOCOL_DUAL +# byte[3] NCI_PROTOCOL_15693 +# byte[4] NCI_PROTOCOL_KOVIO +# byte[5] NCI_PROTOCOL_MIFARE +# byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO +# byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME +# byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME +NFA_PROPRIETARY_CFG={05:FF:FF:06:8A:90:77:FF:FF} + +############################################################################### +# Choose the presence-check algorithm for type-4 tag. If not defined, +# the default value is 1. +# 0 NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm +# 1 NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block +# 2 NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate +# 3 NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0 +# 4 NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3 +# 5 NFA_RW_PRES_CHK_ISO_DEP_NAK; presence check command ISO-DEP NAK as per NCI2.0 +PRESENCE_CHECK_ALGORITHM=5 + +############################################################################### +# Name of the NCI HAL module to use +# If unset, falls back to nfc_nci.bcm2079x +NCI_HAL_MODULE="nfc_nci.st21nfc" + +############################################################################### +# White list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} + +############################################################################### +# BAIL OUT value for P2P +# Implements algorithm for NFC-DEP protocol priority over ISO-DEP protocol. +POLL_BAIL_OUT_MODE=1 + +############################################################################### +# Extended APDU length for ISO_DEP +ISO_DEP_MAX_TRANSCEIVE=0xFEFF + +############################################################################### +# Configure the NFC Extras to open and use a static pipe. If the value is +# not set or set to 0, then the default is use a dynamic pipe based on a +# destination gate (see NFA_HCI_DEFAULT_DEST_GATE). Note there is a value +# for each EE (ESE/SIM) +OFF_HOST_ESE_PIPE_ID=0x5E +OFF_HOST_SIM_PIPE_ID=0x3E + +############################################################################### +#Set the default Felica T3T System Code OffHost route Location : +#This settings will be used when application does not set this parameter +# host 0x00 +# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) +# UICC 0x81 (UICC_1), 0x85 (UICC_2) +DEFAULT_SYS_CODE_ROUTE=0x86 + +############################################################################### +#Set the Felica T3T System Code supported power state: +DEFAULT_SYS_CODE_PWR_STATE=0x3B + +############################################################################### +# Path and Files used for FW update binaries storage +STNFC_FW_PATH_STORAGE="/vendor/firmware" +STNFC_FW_BIN_NAME="/st54j_fw.bin" +STNFC_FW_CONF_NAME="/st54j_conf.bin" + +############################################################################### +# Default off-host route for Felica. +# This settings will be used when application does not set this parameter +# host 0x00 +# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) +# UICC 0x81 (UICC_1), 0x85 (UICC_2) +DEFAULT_NFCF_ROUTE=0x86 + +############################################################################### +# Configure the default off-host route. +# used for technology A and B routing +# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) +# UICC 0x81 (UICC_1), 0x85 (UICC_2) +DEFAULT_OFFHOST_ROUTE=0x81 + +############################################################################### +# Configure the default AID route. +# host 0x00 +# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) +# UICC 0x81 (UICC_1), 0x85 (UICC_2) +DEFAULT_ROUTE=0x00 + +############################################################################### +# Configure the NFCEEIDs of offhost UICC. +# UICC 0x81 (UICC_1), 0x85 (UICC_2) +OFFHOST_ROUTE_UICC={81} + +############################################################################### +# Configure the NFCEEIDs of offhost eSEs. +# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) +OFFHOST_ROUTE_ESE={86} + +############################################################################### +# Configure the list of NFCEE for the ISO-DEP routing. +# host 0x00 +# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) +# UICC 0x81 (UICC_1), 0x85 (UICC_2) +DEFAULT_ISODEP_ROUTE=0x81 + +############################################################################### +# Configure the HAL Clock control +# enable 0x01 +# disable 0x00 default value +STNFC_CONTROL_CLK=0x01 + +############################################################################### +# Configure the ACTIVE_RW timer +# Default 0x00, set 0x01 to enable it +STNFC_ACTIVERW_TIMER=0x01 + +############################################################################### +# Core configuration settings +CORE_CONF_PROP={ 20, 02, 0a, 03, + a1, 01, 1e, + a2, 01, 19, + 80, 01, 01 +} + +