Snap for 7615884 from bf1683c4bbc3d38b49029fa775618e4d1a696e38 to tm-release

Change-Id: Ibbde6ff51f30424d5dcb0d6432d45ccf79e97a2c
This commit is contained in:
Android Build Coastguard Worker 2021-08-06 03:01:29 +00:00
commit 5fca025d98
4 changed files with 74 additions and 33 deletions

View file

@ -1,34 +1,34 @@
Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
off,off,off,off,off,on,60,60,44,60,60,44,48,48,44,48,48,44
off,off,off,off,on,on,60,60,44,60,60,44,48,48,44,48,48,44
off,off,off,on,off,on,60,60,44,60,60,44,48,48,44,48,48,44
off,off,off,on,on,on,60,60,44,60,60,44,48,48,44,48,48,44
off,off,on,off,off,on,60,60,44,60,60,44,48,48,44,48,48,44
off,off,on,off,on,on,60,60,44,60,60,44,48,48,44,48,48,44
off,off,on,on,off,on,60,60,44,60,60,44,48,48,44,48,48,44
off,off,on,on,on,on,60,60,44,60,60,44,48,48,44,48,48,44
off,on,off,off,off,on,60,60,44,60,60,44,48,48,44,48,48,44
off,on,off,off,on,on,60,60,44,60,60,44,48,48,44,48,48,44
off,on,off,on,off,on,60,60,44,60,60,44,48,48,44,48,48,44
off,on,off,on,on,on,60,60,44,60,60,44,48,48,44,48,48,44
off,on,on,off,off,on,60,60,44,60,60,44,48,48,44,48,48,44
off,on,on,off,on,on,60,60,44,60,60,44,48,48,44,48,48,44
off,on,on,on,off,on,60,60,44,60,60,44,48,48,44,48,48,44
off,on,on,on,on,on,60,60,44,60,60,44,48,48,44,48,48,44
on,off,off,off,off,any,60,60,44,60,60,44,48,48,44,48,48,44
on,off,off,off,on,any,60,60,44,60,60,44,48,48,44,48,48,44
on,off,off,on,off,any,60,60,44,60,60,44,48,48,44,48,48,44
on,off,off,on,on,any,60,60,44,60,60,44,48,48,44,48,48,44
on,off,on,off,off,any,60,60,44,60,60,44,48,48,44,48,48,44
on,off,on,off,on,any,60,60,44,60,60,44,48,48,44,48,48,44
on,off,on,on,off,any,60,60,44,60,60,44,48,48,44,48,48,44
on,off,on,on,on,any,60,60,44,60,60,44,48,48,44,48,48,44
on,on,off,off,off,any,60,60,44,60,60,44,48,48,44,48,48,44
on,on,off,off,on,any,60,60,44,60,60,44,48,48,44,48,48,44
on,on,off,on,off,any,60,60,44,60,60,44,48,48,44,48,48,44
on,on,off,on,on,any,60,60,44,60,60,44,48,48,44,48,48,44
on,on,on,off,off,any,60,60,44,60,60,44,48,48,44,48,48,44
on,on,on,off,on,any,60,60,44,60,60,44,48,48,44,48,48,44
on,on,on,on,off,any,60,60,44,60,60,44,48,48,44,48,48,44
on,on,on,on,on,any,60,60,44,60,60,44,48,48,44,48,48,44
off,any,any,any,any,off,60,60,44,60,60,44,48,48,44,48,48,44
off,off,off,off,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,off,off,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,off,on,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,off,on,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,on,off,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,on,off,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,on,on,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,on,on,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,off,off,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,off,off,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,off,on,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,off,on,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,on,off,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,on,off,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,on,on,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,on,on,on,on,60,60,36,60,60,36,48,48,36,48,48,36
on,off,off,off,off,any,44,44,36,44,44,36,44,44,36,44,44,36
on,off,off,off,on,any,44,44,36,44,44,36,44,44,36,44,44,36
on,off,off,on,off,any,44,44,36,44,44,36,44,44,36,44,44,36
on,off,off,on,on,any,44,44,36,44,44,36,44,44,36,44,44,36
on,off,on,off,off,any,44,44,36,44,44,36,44,44,36,44,44,36
on,off,on,off,on,any,44,44,36,44,44,36,44,44,36,44,44,36
on,off,on,on,off,any,44,44,36,44,44,36,44,44,36,44,44,36
on,off,on,on,on,any,44,44,36,44,44,36,44,44,36,44,44,36
on,on,off,off,off,any,44,44,36,44,44,36,44,44,36,44,44,36
on,on,off,off,on,any,44,44,36,44,44,36,44,44,36,44,44,36
on,on,off,on,off,any,44,44,36,44,44,36,44,44,36,44,44,36
on,on,off,on,on,any,44,44,36,44,44,36,44,44,36,44,44,36
on,on,on,off,off,any,44,44,36,44,44,36,44,44,36,44,44,36
on,on,on,off,on,any,44,44,36,44,44,36,44,44,36,44,44,36
on,on,on,on,off,any,44,44,36,44,44,36,44,44,36,44,44,36
on,on,on,on,on,any,44,44,36,44,44,36,44,44,36,44,44,36
off,any,any,any,any,off,60,60,36,60,60,36,48,48,36,48,48,36
1 Head BTHotspot WIFI5Ghz HotspotVoice Cell IMU BDR_Single_Chain_0 EDR_Single_Chain_0 BLE_Single_Chain_0 BDR_Single_Chain_1 EDR_Single_Chain_1 BLE_Single_Chain_1 BDR_Dual_Chain_0 EDR_Dual_Chain_0 BLE_Dual_Chain_0 BDR_Dual_Chain_1 EDR_Dual_Chain_1 BLE_Dual_Chain_1
2 off off off off off on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
3 off off off off on on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
4 off off off on off on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
5 off off off on on on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
6 off off on off off on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
7 off off on off on on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
8 off off on on off on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
9 off off on on on on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
10 off on off off off on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
11 off on off off on on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
12 off on off on off on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
13 off on off on on on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
14 off on on off off on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
15 off on on off on on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
16 off on on on off on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
17 off on on on on on 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36
18 on off off off off any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
19 on off off off on any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
20 on off off on off any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
21 on off off on on any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
22 on off on off off any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
23 on off on off on any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
24 on off on on off any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
25 on off on on on any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
26 on on off off off any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
27 on on off off on any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
28 on on off on off any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
29 on on off on on any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
30 on on on off off any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
31 on on on off on any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
32 on on on on off any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
33 on on on on on any 60 44 60 44 44 36 60 44 60 44 44 36 48 44 48 44 44 36 48 44 48 44 44 36
34 off any any any any off 60 60 44 36 60 60 44 36 48 48 44 36 48 48 44 36

View file

@ -0,0 +1,34 @@
Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
off,off,off,off,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,off,off,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,off,on,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,off,on,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,on,off,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,on,off,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,on,on,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,off,on,on,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,off,off,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,off,off,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,off,on,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,off,on,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,on,off,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,on,off,on,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,on,on,off,on,60,60,36,60,60,36,48,48,36,48,48,36
off,on,on,on,on,on,60,60,36,60,60,36,48,48,36,48,48,36
on,off,off,off,off,any,60,60,36,60,60,36,48,48,36,48,48,36
on,off,off,off,on,any,60,60,36,60,60,36,48,48,36,48,48,36
on,off,off,on,off,any,60,60,36,60,60,36,48,48,36,48,48,36
on,off,off,on,on,any,60,60,36,60,60,36,48,48,36,48,48,36
on,off,on,off,off,any,60,60,36,60,60,36,48,48,36,48,48,36
on,off,on,off,on,any,60,60,36,60,60,36,48,48,36,48,48,36
on,off,on,on,off,any,60,60,36,60,60,36,48,48,36,48,48,36
on,off,on,on,on,any,60,60,36,60,60,36,48,48,36,48,48,36
on,on,off,off,off,any,60,60,36,60,60,36,48,48,36,48,48,36
on,on,off,off,on,any,60,60,36,60,60,36,48,48,36,48,48,36
on,on,off,on,off,any,60,60,36,60,60,36,48,48,36,48,48,36
on,on,off,on,on,any,60,60,36,60,60,36,48,48,36,48,48,36
on,on,on,off,off,any,60,60,36,60,60,36,48,48,36,48,48,36
on,on,on,off,on,any,60,60,36,60,60,36,48,48,36,48,48,36
on,on,on,on,off,any,60,60,36,60,60,36,48,48,36,48,48,36
on,on,on,on,on,any,60,60,36,60,60,36,48,48,36,48,48,36
off,any,any,any,any,off,60,60,36,60,60,36,48,48,36,48,48,36
1 Head BTHotspot WIFI5Ghz HotspotVoice Cell IMU BDR_Single_Chain_0 EDR_Single_Chain_0 BLE_Single_Chain_0 BDR_Single_Chain_1 EDR_Single_Chain_1 BLE_Single_Chain_1 BDR_Dual_Chain_0 EDR_Dual_Chain_0 BLE_Dual_Chain_0 BDR_Dual_Chain_1 EDR_Dual_Chain_1 BLE_Dual_Chain_1
2 off off off off off on 60 60 36 60 60 36 48 48 36 48 48 36
3 off off off off on on 60 60 36 60 60 36 48 48 36 48 48 36
4 off off off on off on 60 60 36 60 60 36 48 48 36 48 48 36
5 off off off on on on 60 60 36 60 60 36 48 48 36 48 48 36
6 off off on off off on 60 60 36 60 60 36 48 48 36 48 48 36
7 off off on off on on 60 60 36 60 60 36 48 48 36 48 48 36
8 off off on on off on 60 60 36 60 60 36 48 48 36 48 48 36
9 off off on on on on 60 60 36 60 60 36 48 48 36 48 48 36
10 off on off off off on 60 60 36 60 60 36 48 48 36 48 48 36
11 off on off off on on 60 60 36 60 60 36 48 48 36 48 48 36
12 off on off on off on 60 60 36 60 60 36 48 48 36 48 48 36
13 off on off on on on 60 60 36 60 60 36 48 48 36 48 48 36
14 off on on off off on 60 60 36 60 60 36 48 48 36 48 48 36
15 off on on off on on 60 60 36 60 60 36 48 48 36 48 48 36
16 off on on on off on 60 60 36 60 60 36 48 48 36 48 48 36
17 off on on on on on 60 60 36 60 60 36 48 48 36 48 48 36
18 on off off off off any 60 60 36 60 60 36 48 48 36 48 48 36
19 on off off off on any 60 60 36 60 60 36 48 48 36 48 48 36
20 on off off on off any 60 60 36 60 60 36 48 48 36 48 48 36
21 on off off on on any 60 60 36 60 60 36 48 48 36 48 48 36
22 on off on off off any 60 60 36 60 60 36 48 48 36 48 48 36
23 on off on off on any 60 60 36 60 60 36 48 48 36 48 48 36
24 on off on on off any 60 60 36 60 60 36 48 48 36 48 48 36
25 on off on on on any 60 60 36 60 60 36 48 48 36 48 48 36
26 on on off off off any 60 60 36 60 60 36 48 48 36 48 48 36
27 on on off off on any 60 60 36 60 60 36 48 48 36 48 48 36
28 on on off on off any 60 60 36 60 60 36 48 48 36 48 48 36
29 on on off on on any 60 60 36 60 60 36 48 48 36 48 48 36
30 on on on off off any 60 60 36 60 60 36 48 48 36 48 48 36
31 on on on off on any 60 60 36 60 60 36 48 48 36 48 48 36
32 on on on on off any 60 60 36 60 60 36 48 48 36 48 48 36
33 on on on on on any 60 60 36 60 60 36 48 48 36 48 48 36
34 off any any any any off 60 60 36 60 60 36 48 48 36 48 48 36

View file

@ -63,11 +63,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Bluetooth Tx power caps for oriole
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/bluetooth_power_limits_oriole.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
$(LOCAL_PATH)/bluetooth_power_limits_oriole_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \
$(LOCAL_PATH)/bluetooth_power_limits_G9S9B_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_US.csv \
$(LOCAL_PATH)/bluetooth_power_limits_GB7N6_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_US.csv \
$(LOCAL_PATH)/bluetooth_power_limits_G9S9B_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_EU.csv \
$(LOCAL_PATH)/bluetooth_power_limits_GB7N6_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_EU.csv
# Bluetooth SAR test tool
PRODUCT_PACKAGES_DEBUG += \
sar_test

View file

@ -143,6 +143,11 @@ DEFAULT_ISODEP_ROUTE=0x81
# 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,