Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future
This commit is contained in:
commit
f0ec5af197
3 changed files with 17 additions and 3 deletions
|
@ -395,8 +395,15 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
ro.vendor.vibrator.hal.pm.activetimeout=5
|
||||
|
||||
# Increment the SVN for any official public releases
|
||||
ifdef RELEASE_SVN_HUSKY
|
||||
TARGET_SVN ?= $(RELEASE_SVN_HUSKY)
|
||||
else
|
||||
# Set this for older releases that don't use build flag
|
||||
TARGET_SVN ?= 35
|
||||
endif
|
||||
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=27
|
||||
ro.vendor.build.svn=$(TARGET_SVN)
|
||||
|
||||
# WLC userdebug specific
|
||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
|
|
|
@ -372,8 +372,15 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
ro.vendor.vibrator.hal.pm.activetimeout=5
|
||||
|
||||
# Increment the SVN for any official public releases
|
||||
ifdef RELEASE_SVN_SHIBA
|
||||
TARGET_SVN ?= $(RELEASE_SVN_SHIBA)
|
||||
else
|
||||
# Set this for older releases that don't use build flag
|
||||
TARGET_SVN ?= 35
|
||||
endif
|
||||
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=27
|
||||
ro.vendor.build.svn=$(TARGET_SVN)
|
||||
|
||||
# P23 Devices no longer need rlsservice
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
|
|
|
@ -152,7 +152,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