Snap for 11981331 from d312a08688 to 24Q4-release

Change-Id: I953c51fa19b863fb43270e233a7355b6bdbb2ad2
This commit is contained in:
Android Build Coastguard Worker 2024-06-17 23:03:51 +00:00
commit a064fc6fba
10 changed files with 44 additions and 24 deletions

View file

@ -19,12 +19,10 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_ripcurrent_fullmte.mk \ $(LOCAL_DIR)/aosp_ripcurrent_fullmte.mk \
$(LOCAL_DIR)/factory_ripcurrent.mk \ $(LOCAL_DIR)/factory_ripcurrent.mk \
$(LOCAL_DIR)/aosp_husky.mk \ $(LOCAL_DIR)/aosp_husky.mk \
$(LOCAL_DIR)/aosp_husky_61_pgagnostic.mk \
$(LOCAL_DIR)/aosp_husky_fullmte.mk \ $(LOCAL_DIR)/aosp_husky_fullmte.mk \
$(LOCAL_DIR)/aosp_husky_pgagnostic.mk \ $(LOCAL_DIR)/aosp_husky_pgagnostic.mk \
$(LOCAL_DIR)/factory_husky.mk \ $(LOCAL_DIR)/factory_husky.mk \
$(LOCAL_DIR)/aosp_shiba.mk \ $(LOCAL_DIR)/aosp_shiba.mk \
$(LOCAL_DIR)/aosp_shiba_61_pgagnostic.mk \
$(LOCAL_DIR)/aosp_shiba_fullmte.mk \ $(LOCAL_DIR)/aosp_shiba_fullmte.mk \
$(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \ $(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \
$(LOCAL_DIR)/factory_shiba.mk $(LOCAL_DIR)/factory_shiba.mk

View file

@ -308,7 +308,7 @@
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
<module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/> <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
<module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/> <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
<module libname="audio_sounddose_aoc.so"/> <module libname="audio_sounddose_aoc.so" argu="Blackbird,Condor=0,46.35,0.1950549451;54.6,57,0.98625"/>
<module libname="liboffloadeffect.so"/> <module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/> <module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/> <module libname="audio_bluenote_aoc.so"/>

View file

@ -308,7 +308,7 @@
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
<module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/> <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
<module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/> <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
<module libname="audio_sounddose_aoc.so"/> <module libname="audio_sounddose_aoc.so" argu="Blackbird,Condor=0,46.35,0.1950549451;54.6,57,0.98625"/>
<module libname="liboffloadeffect.so"/> <module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/> <module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/> <module libname="audio_bluenote_aoc.so"/>

View file

@ -396,7 +396,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=27 ro.vendor.build.svn=32
# WLC userdebug specific # WLC userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
@ -472,3 +472,4 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu
endif endif
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true

View file

@ -373,7 +373,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=26 ro.vendor.build.svn=32
# P23 Devices no longer need rlsservice # P23 Devices no longer need rlsservice
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
@ -441,3 +441,4 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu
endif endif
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true

View file

@ -718,7 +718,7 @@
"Values": [ "Values": [
"50", "50",
"30", "30",
"20", "23",
"18" "18"
], ],
"DefaultIndex": 0 "DefaultIndex": 0
@ -1891,7 +1891,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "20" "Value": "23"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",

View file

@ -764,7 +764,7 @@
"Values": [ "Values": [
"50", "50",
"30", "30",
"20", "23",
"18" "18"
], ],
"DefaultIndex": 0 "DefaultIndex": 0
@ -1740,7 +1740,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "20" "Value": "23"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",

View file

@ -718,7 +718,7 @@
"Values": [ "Values": [
"50", "50",
"30", "30",
"20", "23",
"18" "18"
], ],
"DefaultIndex": 0 "DefaultIndex": 0
@ -1795,7 +1795,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "20" "Value": "23"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",

View file

@ -327,10 +327,6 @@
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
},
{ {
"CdevRequest": "gxp-cooling", "CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6] "LimitInfo": [0, 0, 0, 0, 0, 6, 6]
@ -603,7 +599,7 @@
] ]
}, },
{ {
"Name":"VIRTUAL-SKIN-CPU-GPU", "Name":"VIRTUAL-SKIN-SOC",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
@ -623,7 +619,7 @@
"K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], "K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
"I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"], "I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"],
"S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"], "S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], "MinAllocPower":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"], "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"],
"I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"] "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"]
}, },
@ -663,6 +659,15 @@
"BindedPowerRail": "S2S_VDD_G3D", "BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 8, 8, 8, 9, 11, 11], "CdevCeiling": [0, 8, 8, 8, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11] "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
},
{
"CdevRequest": "tpu_cooling",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S7M_VDD_TPU",
"CdevCeiling": [0, 7, 7, 7, 7, 7, 7],
"LimitInfo": [0, 0, 0, 0, 0, 7, 7]
} }
] ]
}, },
@ -1138,6 +1143,11 @@
"PowerSampleDelay":7000, "PowerSampleDelay":7000,
"PowerSampleCount":1 "PowerSampleCount":1
}, },
{
"Name":"S7M_VDD_TPU",
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{ {
"Name":"PARTIAL_SYSTEM_POWER", "Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true, "VirtualRails":true,

View file

@ -295,10 +295,6 @@
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
},
{ {
"CdevRequest": "gxp-cooling", "CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6] "LimitInfo": [0, 0, 0, 0, 0, 6, 6]
@ -571,7 +567,7 @@
] ]
}, },
{ {
"Name":"VIRTUAL-SKIN-CPU-GPU", "Name":"VIRTUAL-SKIN-SOC",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
@ -591,7 +587,7 @@
"K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], "K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
"I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"], "I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"],
"S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"], "S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], "MinAllocPower":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"], "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"],
"I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"] "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"]
}, },
@ -631,6 +627,15 @@
"BindedPowerRail": "S2S_VDD_G3D", "BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 9, 9, 9, 9, 11, 11], "CdevCeiling": [0, 9, 9, 9, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11] "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
},
{
"CdevRequest": "tpu_cooling",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S7M_VDD_TPU",
"CdevCeiling": [0, 7, 7, 7, 7, 7, 7],
"LimitInfo": [0, 0, 0, 0, 0, 7, 7]
} }
] ]
}, },
@ -1171,6 +1176,11 @@
"PowerSampleDelay":7000, "PowerSampleDelay":7000,
"PowerSampleCount":1 "PowerSampleCount":1
}, },
{
"Name":"S7M_VDD_TPU",
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{ {
"Name":"PARTIAL_SYSTEM_POWER", "Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true, "VirtualRails":true,