Snap for 8555136 from 64ecda2ba2 to udc-release

Change-Id: I6ce88c6895eb31e61e9de8491235ce9387c650ab
This commit is contained in:
Android Build Coastguard Worker 2022-05-07 05:09:07 +00:00
commit 83ce4b08cf
12 changed files with 48 additions and 27 deletions

View file

@ -96,7 +96,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
android.hardware.nfc@1.2-service.st
android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@ -110,7 +110,6 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
device/google/pantah/nfc/manifest_nfc.xml \
device/google/pantah/nfc/manifest_se.xml
# Thermal Config

View file

@ -60,7 +60,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
android.hardware.nfc@1.2-service.st
android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@ -74,7 +74,6 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
device/google/pantah/nfc/manifest_nfc.xml \
device/google/pantah/nfc/manifest_se.xml
# Thermal Config

View file

@ -81,7 +81,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
android.hardware.nfc@1.2-service.st
android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@ -95,7 +95,6 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
device/google/pantah/nfc/manifest_nfc.xml \
device/google/pantah/nfc/manifest_se.xml
# Thermal Config

View file

@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
android.hardware.nfc@1.2-service.st
android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@ -79,7 +79,6 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
device/google/pantah/nfc/manifest_nfc.xml \
device/google/pantah/nfc/manifest_se.xml
# Thermal Config

View file

@ -113,15 +113,6 @@
<transport>hwbinder</transport>
<fqname>@1.3::IDevice/google-edgetpu</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>INfc</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.health</name>
<transport>hwbinder</transport>

View file

@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc"
###############################################################################
# White list to be set at startup.
DEVICE_HOST_WHITE_LIST={02:C0}
# Allow list to be set at startup.
DEVICE_HOST_ALLOW_LIST={02:C0}
###############################################################################
# BAIL OUT value for P2P

View file

@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc"
###############################################################################
# White list to be set at startup.
DEVICE_HOST_WHITE_LIST={02:C0}
# Allow list to be set at startup.
DEVICE_HOST_ALLOW_LIST={02:C0}
###############################################################################
# BAIL OUT value for P2P

View file

@ -501,7 +501,7 @@
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
"LimitInfo": [0, 0, 0, 0, 6, 6, 6]
}
]
},
@ -517,6 +517,14 @@
{
"CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
},
{
"CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
},
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 5, 5, 5]
}
]
},

View file

@ -178,15 +178,15 @@
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 0, 7, 10, 10]
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
},
{
"CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 10, 11, 11]
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
},
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 4, 4, 4]
"LimitInfo": [0, 0, 0, 0, 5, 5, 5]
}
]
},

View file

@ -500,7 +500,7 @@
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
"LimitInfo": [0, 0, 0, 0, 6, 6, 6]
}
]
},
@ -516,6 +516,14 @@
{
"CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
},
{
"CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
},
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 5, 5, 5]
}
]
},

View file

@ -355,7 +355,7 @@
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
"LimitInfo": [0, 0, 0, 0, 6, 6, 6]
}
]
},
@ -388,6 +388,14 @@
{
"CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
},
{
"CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
},
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 5, 5, 5]
}
]
},

View file

@ -135,6 +135,16 @@ restricted_channels=0
[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 3
[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 3
[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 3
[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3
[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3
[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4
[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging=0
[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging=0
[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3
[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3
[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4
[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=3
[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=3
[HAL]minimum_system_offset_uwbtime0=500
coex_gpio=4
coex_delay_us=1000