Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future
Bug: 347831320 Merged-In: I968c21293ca3cd5e2c7031166509724906e4e564 Change-Id: I077f25a7901879ab15e1ee633c76fbe7fba05e71
This commit is contained in:
commit
504721a6cd
7 changed files with 14 additions and 4 deletions
|
@ -381,8 +381,15 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
persist.vendor.vibrator.hal.context.settlingtime=5000
|
||||
|
||||
# Increment the SVN for any official public releases
|
||||
ifdef RELEASE_SVN_AKITA
|
||||
TARGET_SVN ?= $(RELEASE_SVN_AKITA)
|
||||
else
|
||||
# Set this for older releases that don't use build flag
|
||||
TARGET_SVN ?= 18
|
||||
endif
|
||||
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=10
|
||||
ro.vendor.build.svn=$(TARGET_SVN)
|
||||
|
||||
# Keyboard height ratio and bottom padding in dp for portrait mode
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -110,6 +110,8 @@ navicUsedInUSPolicy=2
|
|||
# DFS: 0 = Disabled (default), 1 = Enabled
|
||||
Chip_Configuration_FeatureCfg_DVS = 1
|
||||
Chip_Configuration_FeatureCfg_DFS = 1
|
||||
# MTPL: 0 = Disabled, 1 = Enabled (default)
|
||||
Chip_Configuration_FeatureCfg_MTPL = 0
|
||||
|
||||
# This is a bitfield that will disable incoming interrupts for mailboxes
|
||||
# AP = 0x1
|
||||
|
@ -118,7 +120,7 @@ Chip_Configuration_FeatureCfg_DFS = 1
|
|||
# CHUB = 0x8
|
||||
# The CHUB on the neus continually triggers a bit so this is to prevent
|
||||
# it from continually waking the gnss.
|
||||
mailboxDisabled=0x8
|
||||
mailboxDisabled=0x0
|
||||
|
||||
### Specify RFIC ID for K40 ###
|
||||
# 55200001 = S5520 EVT1
|
||||
|
|
|
@ -34,7 +34,8 @@ qzssUsedInUSPolicy=2
|
|||
navicUsedInUSPolicy=2
|
||||
Chip_Configuration_FeatureCfg_DVS = 1
|
||||
Chip_Configuration_FeatureCfg_DFS = 1
|
||||
mailboxDisabled=0x8
|
||||
Chip_Configuration_FeatureCfg_MTPL = 0
|
||||
mailboxDisabled=0x0
|
||||
gnss_rfic_chip_id=55200001
|
||||
UseRtcForAiding=1
|
||||
rtc_min_num_of_fixes=10
|
||||
|
|
Binary file not shown.
|
@ -140,7 +140,7 @@
|
|||
|
||||
<!-- Boolean indicating whether we should enable the STA current connected indoor channel
|
||||
for SAP, WFD GO, Wi-Fi Aware -->
|
||||
<bool translatable="false" name="config_wifiEnableStaIndoorChannelForPeerNetwork">true</bool>
|
||||
<bool translatable="false" name="config_wifiEnableStaIndoorChannelForPeerNetwork">false</bool>
|
||||
<!-- Boolean indicating whether we should enable the STA current connected DFS channel
|
||||
for SAP, WFD GO, Wi-Fi Aware -->
|
||||
<bool translatable="false" name="config_wifiEnableStaDfsChannelForPeerNetwork">true</bool>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue