Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future

Browse source 
Bug: 347831320
Merged-In: I661546ae0ab104021936acd109e08de2a64a1b1c
Change-Id: Idfa0165a3a7e30315470b0207da99ac2a14f0424
This commit is contained in:
Xin Li 2024-08-08 11:16:02 -07:00
commit 8a1ad9579f
3 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
device-husky.mk
View file

@ -395,8 +395,15 @@ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.vibrator.hal.pm.activetimeout=5 ro.vendor.vibrator.hal.pm.activetimeout=5
# Increment the SVN for any official public releases # 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 += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=27 ro.vendor.build.svn=$(TARGET_SVN)
# WLC userdebug specific # WLC userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))

9
device-shiba.mk
View file

@ -372,8 +372,15 @@ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.vibrator.hal.pm.activetimeout=5 ro.vendor.vibrator.hal.pm.activetimeout=5
# Increment the SVN for any official public releases # 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 += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=27 ro.vendor.build.svn=$(TARGET_SVN)
# P23 Devices no longer need rlsservice # P23 Devices no longer need rlsservice
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \

2
rro_overlays/WifiOverlay/res/values/config.xml
View file

@ -152,7 +152,7 @@
<!-- Boolean indicating whether we should enable the STA current connected indoor channel <!-- Boolean indicating whether we should enable the STA current connected indoor channel
for SAP, WFD GO, Wi-Fi Aware --> 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 <!-- Boolean indicating whether we should enable the STA current connected DFS channel
for SAP, WFD GO, Wi-Fi Aware --> for SAP, WFD GO, Wi-Fi Aware -->
<bool translatable="false" name="config_wifiEnableStaDfsChannelForPeerNetwork">true</bool> <bool translatable="false" name="config_wifiEnableStaDfsChannelForPeerNetwork">true</bool>