Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future
This commit is contained in:
Xin Li
Android (Google) Code Review
commit
a547255f56
58 changed files with 511 additions and 480 deletions
30
Android.mk
30
Android.mk
|
|
@ -1,30 +0,0 @@
|
|||
#
|
||||
# Copyright (C) 2011 The Android Open-Source Project
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
# WARNING: Everything listed here will be built on ALL platforms,
|
||||
# including x86, the universal, and the SDK. Modules must be uniquely
|
||||
# named (liblights.panda), and must build everywhere, or limit themselves
|
||||
# to only building on ARM if they include assembly. Individual makefiles
|
||||
# are responsible for having their own logic, for fine-grained control.
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
# if some modules are built directly from this directory (not subdirectories),
|
||||
# their rules should be written here.
|
||||
|
||||
ifneq (,$(filter $(TARGET_DEVICE),ripcurrent husky shiba))
|
||||
include $(call all-makefiles-under,$(LOCAL_PATH))
|
||||
endif
|
||||
|
|
@ -23,10 +23,11 @@
|
|||
<feature name="PlaybackThermalThrottle">
|
||||
<argument name="PollWaitMs" value="20000" />
|
||||
<argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
|
||||
<argument name="ThermistorType" value="SKIN" />
|
||||
<argument name="ThermistorType" value="UNKNOWN" />
|
||||
<argument name="ThrottlingSeverity" value="MODERATE" />
|
||||
</feature>
|
||||
<feature name="RuntimeTuningDump" />
|
||||
<!-- <feature name="spatializer-offload" /> -->
|
||||
</features>
|
||||
|
||||
<voipVolume>
|
||||
|
|
|
|||
|
|
@ -425,6 +425,10 @@
|
|||
<path name="primary-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="primary-playback-0 -> hdmi-device">
|
||||
<path name="primary-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="raw-playback -> speaker">
|
||||
<ctl name="TDM_0_RX Mixer RAW" value="1" />
|
||||
</path>
|
||||
|
|
@ -493,6 +497,10 @@
|
|||
<path name="raw-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="raw-playback-0 -> hdmi-device">
|
||||
<path name="raw-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="deep-buffer-playback -> speaker">
|
||||
<ctl name="TDM_0_RX Mixer EP6" value="1" />
|
||||
</path>
|
||||
|
|
@ -561,6 +569,10 @@
|
|||
<path name="deep-buffer-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="deep-buffer-playback-0 -> hdmi-device">
|
||||
<path name="deep-buffer-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="compress-offload-playback">
|
||||
<ctl name="LVM Enable" value="1" />
|
||||
</path>
|
||||
|
|
@ -634,6 +646,10 @@
|
|||
<path name="compress-offload-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="compress-offload-playback-0 -> hdmi-device">
|
||||
<path name="compress-offload-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="mmap-playback -> speaker">
|
||||
<ctl name="TDM_0_RX Mixer EP1" value="1" />
|
||||
</path>
|
||||
|
|
@ -702,6 +718,10 @@
|
|||
<path name="mmap-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="mmap-playback-0 -> hdmi-device">
|
||||
<path name="mmap-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="hifi-playback-0 -> usb">
|
||||
<ctl name="USB_RX Mixer HIFI" value="1" />
|
||||
</path>
|
||||
|
|
@ -782,6 +802,10 @@
|
|||
<path name="voip-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="voip-playback-0 -> hdmi-device">
|
||||
<path name="voip-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="immersive-playback -> speaker">
|
||||
<ctl name="TDM_0_RX Mixer IMSV" value="1" />
|
||||
</path>
|
||||
|
|
@ -818,6 +842,14 @@
|
|||
<path name="immersive-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="immersive-playback-0 -> bluetooth-low-energy-headset">
|
||||
<path name="immersive-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
|
||||
<path name="immersive-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="immersive-playback-0 -> usb">
|
||||
<ctl name="USB_RX Mixer IMSV" value="1" />
|
||||
</path>
|
||||
|
|
@ -830,6 +862,58 @@
|
|||
<path name="immersive-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback -> speaker">
|
||||
<ctl name="TDM_0_RX Mixer EP4" value="1" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> speaker">
|
||||
<path name="spatializer-offload-playback -> speaker" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> speaker-earpiece">
|
||||
<path name="spatializer-offload-playback -> speaker" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> speaker-safe">
|
||||
<path name="spatializer-offload-playback -> speaker" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback -> bt">
|
||||
<ctl name="BT_RX Mixer EP4" value="1" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
|
||||
<path name="spatializer-offload-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> bluetooth-a2dp-headphone">
|
||||
<path name="spatializer-offload-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> bluetooth-a2dp-speaker">
|
||||
<path name="spatializer-offload-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> bluetooth-low-energy-headset">
|
||||
<path name="spatializer-offload-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> bluetooth-low-energy-speaker">
|
||||
<path name="spatializer-offload-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> usb">
|
||||
<ctl name="USB_RX Mixer EP4" value="1" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> usb-headset">
|
||||
<path name="spatializer-offload-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> usb-device">
|
||||
<path name="spatializer-offload-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="haptic-playback -> speaker">
|
||||
<ctl name="TDM_0_RX Mixer EP3" value="1" />
|
||||
<ctl name="TDM_0_RX Mixer EP8" value="1" />
|
||||
|
|
@ -901,6 +985,10 @@
|
|||
<path name="haptic-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="haptic-playback-0 -> hdmi-device">
|
||||
<path name="haptic-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<!-- audio capture dynamic route -->
|
||||
<path name="microphones -> primary-capture-0">
|
||||
<ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
|
||||
|
|
@ -986,14 +1074,11 @@
|
|||
<ctl name="EP3 TX Mixer BT_TX" value="1" />
|
||||
</path>
|
||||
|
||||
<path name="microphones -> sound-trigger-capture-0">
|
||||
</path>
|
||||
<path name="microphones -> sound-trigger-capture-0" />
|
||||
|
||||
<path name="microphones -> sound-trigger-tap-capture-0">
|
||||
</path>
|
||||
<path name="microphones -> sound-trigger-tap-capture-0" />
|
||||
|
||||
<path name="microphones -> hotword-lookback-capture-0">
|
||||
</path>
|
||||
<path name="microphones -> hotword-lookback-capture-0" />
|
||||
|
||||
<!-- voice-call dynamic route -->
|
||||
<path name="voice-call-downlink-0 -> speaker">
|
||||
|
|
@ -1092,6 +1177,10 @@
|
|||
<ctl name="Incall Capture Stream0" value="UL_DL" />
|
||||
</path>
|
||||
|
||||
<path name="telephony-rx (MIC) -> in-call-capture-0">
|
||||
<ctl name="Incall Capture Stream0" value="DL" />
|
||||
</path>
|
||||
|
||||
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
|
||||
<ctl name="Incall Capture Stream1" value="DL" />
|
||||
</path>
|
||||
|
|
@ -1104,6 +1193,10 @@
|
|||
<ctl name="Incall Capture Stream1" value="UL_DL" />
|
||||
</path>
|
||||
|
||||
<path name="telephony-rx (MIC) -> in-call-capture-1">
|
||||
<ctl name="Incall Capture Stream1" value="DL" />
|
||||
</path>
|
||||
|
||||
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
|
||||
<ctl name="Incall Capture Stream2" value="DL" />
|
||||
</path>
|
||||
|
|
@ -1116,6 +1209,10 @@
|
|||
<ctl name="Incall Capture Stream2" value="UL_DL" />
|
||||
</path>
|
||||
|
||||
<path name="telephony-rx (MIC) -> in-call-capture-2">
|
||||
<ctl name="Incall Capture Stream2" value="DL" />
|
||||
</path>
|
||||
|
||||
<path name="microphones -> mmap-capture-0">
|
||||
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
|
||||
</path>
|
||||
|
|
@ -1167,7 +1264,6 @@
|
|||
<path name="speaker (VOICE)">
|
||||
<ctl name="ASPTX1 Slot Position" value="1" />
|
||||
<ctl name="R ASPTX1 Slot Position" value="0" />
|
||||
<!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
|
||||
<ctl name="R Main AMP Enable Switch" value="1" />
|
||||
<ctl name="Main AMP Enable Switch" value="1" />
|
||||
<!-- load Enable FIR -->
|
||||
|
|
@ -1396,8 +1492,8 @@
|
|||
</path>
|
||||
|
||||
<path name="adapted-voice-earpiece">
|
||||
<ctl name="Boost Peak Current Limit" value="3.50A" />
|
||||
<ctl name="Digital PCM Volume" value="817" />
|
||||
<ctl name="Boost Peak Current Limit" value="3.50A" />
|
||||
<ctl name="Digital PCM Volume" value="817" />
|
||||
</path>
|
||||
<path name="adapted-voice-earpiece-battery-throttled">
|
||||
<path name="adapted-voice-earpiece" />
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
AUDIO_TABLE_FOLDER := husky
|
||||
|
||||
# Choose AIDL config by build flag.
|
||||
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
|
||||
ifeq ($(USE_AUDIO_HAL_AIDL),true)
|
||||
PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
|
||||
PRODUCT_PACKAGES += audio_aidl_configs
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
|
||||
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
|
||||
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \
|
||||
frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
|
||||
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
|
||||
|
||||
# AudioEffectHAL Configuration
|
||||
PRODUCT_COPY_FILES += \
|
||||
|
|
|
|||
|
|
@ -308,6 +308,7 @@
|
|||
<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_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="liboffloadeffect.so"/>
|
||||
<module libname="audio_amcs_ext.so"/>
|
||||
<module libname="audio_bluenote_aoc.so"/>
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
<mixPort name="incall capture" role="sink">
|
||||
<mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
<mixPort name="incall capture" role="sink">
|
||||
<mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@
|
|||
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
<mixPort name="incall capture" role="sink">
|
||||
<mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
<mixPort name="incall capture" role="sink">
|
||||
<mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
|
|
|
|||
|
|
@ -23,10 +23,11 @@
|
|||
<feature name="PlaybackThermalThrottle">
|
||||
<argument name="PollWaitMs" value="20000" />
|
||||
<argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
|
||||
<argument name="ThermistorType" value="SKIN" />
|
||||
<argument name="ThermistorType" value="UNKNOWN" />
|
||||
<argument name="ThrottlingSeverity" value="MODERATE" />
|
||||
</feature>
|
||||
<feature name="RuntimeTuningDump" />
|
||||
<!-- <feature name="spatializer-offload" /> -->
|
||||
</features>
|
||||
|
||||
<voipVolume>
|
||||
|
|
|
|||
|
|
@ -425,6 +425,10 @@
|
|||
<path name="primary-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="primary-playback-0 -> hdmi-device">
|
||||
<path name="primary-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="raw-playback -> speaker">
|
||||
<ctl name="TDM_0_RX Mixer RAW" value="1" />
|
||||
</path>
|
||||
|
|
@ -493,6 +497,10 @@
|
|||
<path name="raw-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="raw-playback-0 -> hdmi-device">
|
||||
<path name="raw-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="deep-buffer-playback -> speaker">
|
||||
<ctl name="TDM_0_RX Mixer EP6" value="1" />
|
||||
</path>
|
||||
|
|
@ -561,6 +569,10 @@
|
|||
<path name="deep-buffer-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="deep-buffer-playback-0 -> hdmi-device">
|
||||
<path name="deep-buffer-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="compress-offload-playback">
|
||||
<ctl name="LVM Enable" value="1" />
|
||||
</path>
|
||||
|
|
@ -634,6 +646,10 @@
|
|||
<path name="compress-offload-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="compress-offload-playback-0 -> hdmi-device">
|
||||
<path name="compress-offload-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="mmap-playback -> speaker">
|
||||
<ctl name="TDM_0_RX Mixer EP1" value="1" />
|
||||
</path>
|
||||
|
|
@ -702,6 +718,10 @@
|
|||
<path name="mmap-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="mmap-playback-0 -> hdmi-device">
|
||||
<path name="mmap-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="hifi-playback-0 -> usb">
|
||||
<ctl name="USB_RX Mixer HIFI" value="1" />
|
||||
</path>
|
||||
|
|
@ -782,6 +802,10 @@
|
|||
<path name="voip-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="voip-playback-0 -> hdmi-device">
|
||||
<path name="voip-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="immersive-playback -> speaker">
|
||||
<ctl name="TDM_0_RX Mixer IMSV" value="1" />
|
||||
</path>
|
||||
|
|
@ -818,6 +842,14 @@
|
|||
<path name="immersive-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="immersive-playback-0 -> bluetooth-low-energy-headset">
|
||||
<path name="immersive-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
|
||||
<path name="immersive-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="immersive-playback-0 -> usb">
|
||||
<ctl name="USB_RX Mixer IMSV" value="1" />
|
||||
</path>
|
||||
|
|
@ -830,6 +862,58 @@
|
|||
<path name="immersive-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback -> speaker">
|
||||
<ctl name="TDM_0_RX Mixer EP4" value="1" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> speaker">
|
||||
<path name="spatializer-offload-playback -> speaker" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> speaker-earpiece">
|
||||
<path name="spatializer-offload-playback -> speaker" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> speaker-safe">
|
||||
<path name="spatializer-offload-playback -> speaker" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback -> bt">
|
||||
<ctl name="BT_RX Mixer EP4" value="1" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
|
||||
<path name="spatializer-offload-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> bluetooth-a2dp-headphone">
|
||||
<path name="spatializer-offload-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> bluetooth-a2dp-speaker">
|
||||
<path name="spatializer-offload-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> bluetooth-low-energy-headset">
|
||||
<path name="spatializer-offload-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> bluetooth-low-energy-speaker">
|
||||
<path name="spatializer-offload-playback -> bt" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> usb">
|
||||
<ctl name="USB_RX Mixer EP4" value="1" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> usb-headset">
|
||||
<path name="spatializer-offload-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="spatializer-offload-playback-0 -> usb-device">
|
||||
<path name="spatializer-offload-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="haptic-playback -> speaker">
|
||||
<ctl name="TDM_0_RX Mixer EP3" value="1" />
|
||||
<ctl name="TDM_0_RX Mixer EP8" value="1" />
|
||||
|
|
@ -901,6 +985,10 @@
|
|||
<path name="haptic-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<path name="haptic-playback-0 -> hdmi-device">
|
||||
<path name="haptic-playback-0 -> usb" />
|
||||
</path>
|
||||
|
||||
<!-- audio capture dynamic route -->
|
||||
<path name="microphones -> primary-capture-0">
|
||||
<ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
|
||||
|
|
@ -986,14 +1074,11 @@
|
|||
<ctl name="EP3 TX Mixer BT_TX" value="1" />
|
||||
</path>
|
||||
|
||||
<path name="microphones -> sound-trigger-capture-0">
|
||||
</path>
|
||||
<path name="microphones -> sound-trigger-capture-0" />
|
||||
|
||||
<path name="microphones -> sound-trigger-tap-capture-0">
|
||||
</path>
|
||||
<path name="microphones -> sound-trigger-tap-capture-0" />
|
||||
|
||||
<path name="microphones -> hotword-lookback-capture-0">
|
||||
</path>
|
||||
<path name="microphones -> hotword-lookback-capture-0" />
|
||||
|
||||
<!-- voice-call dynamic route -->
|
||||
<path name="voice-call-downlink-0 -> speaker">
|
||||
|
|
@ -1092,6 +1177,10 @@
|
|||
<ctl name="Incall Capture Stream0" value="UL_DL" />
|
||||
</path>
|
||||
|
||||
<path name="telephony-rx (MIC) -> in-call-capture-0">
|
||||
<ctl name="Incall Capture Stream0" value="DL" />
|
||||
</path>
|
||||
|
||||
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
|
||||
<ctl name="Incall Capture Stream1" value="DL" />
|
||||
</path>
|
||||
|
|
@ -1104,6 +1193,10 @@
|
|||
<ctl name="Incall Capture Stream1" value="UL_DL" />
|
||||
</path>
|
||||
|
||||
<path name="telephony-rx (MIC) -> in-call-capture-1">
|
||||
<ctl name="Incall Capture Stream1" value="DL" />
|
||||
</path>
|
||||
|
||||
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
|
||||
<ctl name="Incall Capture Stream2" value="DL" />
|
||||
</path>
|
||||
|
|
@ -1116,6 +1209,10 @@
|
|||
<ctl name="Incall Capture Stream2" value="UL_DL" />
|
||||
</path>
|
||||
|
||||
<path name="telephony-rx (MIC) -> in-call-capture-2">
|
||||
<ctl name="Incall Capture Stream2" value="DL" />
|
||||
</path>
|
||||
|
||||
<path name="microphones -> mmap-capture-0">
|
||||
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
|
||||
</path>
|
||||
|
|
@ -1167,7 +1264,6 @@
|
|||
<path name="speaker (VOICE)">
|
||||
<ctl name="ASPTX1 Slot Position" value="1" />
|
||||
<ctl name="R ASPTX1 Slot Position" value="0" />
|
||||
<!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
|
||||
<ctl name="R Main AMP Enable Switch" value="1" />
|
||||
<ctl name="Main AMP Enable Switch" value="1" />
|
||||
<!-- load Enable FIR -->
|
||||
|
|
@ -1396,8 +1492,8 @@
|
|||
</path>
|
||||
|
||||
<path name="adapted-voice-earpiece">
|
||||
<ctl name="Boost Peak Current Limit" value="3.50A" />
|
||||
<ctl name="Digital PCM Volume" value="817" />
|
||||
<ctl name="Boost Peak Current Limit" value="3.50A" />
|
||||
<ctl name="Digital PCM Volume" value="817" />
|
||||
</path>
|
||||
<path name="adapted-voice-earpiece-battery-throttled">
|
||||
<path name="adapted-voice-earpiece" />
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
AUDIO_TABLE_FOLDER := shiba
|
||||
|
||||
# Choose AIDL config by build flag.
|
||||
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
|
||||
ifeq ($(USE_AUDIO_HAL_AIDL),true)
|
||||
PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
|
||||
PRODUCT_PACKAGES += audio_aidl_configs
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
|
||||
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
|
||||
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \
|
||||
frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
|
||||
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
|
||||
|
||||
# AudioEffectHAL Configuration
|
||||
PRODUCT_COPY_FILES += \
|
||||
|
|
|
|||
|
|
@ -308,6 +308,7 @@
|
|||
<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_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="liboffloadeffect.so"/>
|
||||
<module libname="audio_amcs_ext.so"/>
|
||||
<module libname="audio_bluenote_aoc.so"/>
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
<mixPort name="incall capture" role="sink">
|
||||
<mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
<mixPort name="incall capture" role="sink">
|
||||
<mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@
|
|||
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
<mixPort name="incall capture" role="sink">
|
||||
<mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
<mixPort name="incall capture" role="sink">
|
||||
<mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
|
|
|
|||
|
|
@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
|||
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
|
||||
|
||||
ifdef RELEASE_GOOGLE_HUSKY_KERNEL_VERSION
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION)
|
||||
endif
|
||||
|
||||
ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR
|
||||
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers
|
||||
endif
|
||||
|
||||
LOCAL_PATH := device/google/shusky
|
||||
|
||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
|
|
@ -44,12 +53,17 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layer
|
|||
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/shusky/husky/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb \
|
||||
device/google/shusky/husky/display_golden_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-hk3_cal0.pb
|
||||
device/google/shusky/husky/display_golden_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-hk3_cal0.pb \
|
||||
device/google/shusky/display_golden_external_display_cal2.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_external_display_cal2.pb
|
||||
|
||||
CAMERA_PRODUCT ?= husky
|
||||
|
||||
include device/google/shusky/audio/husky/audio-tables.mk
|
||||
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true)
|
||||
USE_AUDIO_HAL_AIDL := true
|
||||
endif
|
||||
|
||||
include device/google/shusky/camera/camera.mk
|
||||
include device/google/shusky/audio/husky/audio-tables.mk
|
||||
include device/google/zuma/device-shipping-common.mk
|
||||
include hardware/google/pixel/vibrator/cs40l26/device.mk
|
||||
include device/google/gs-common/bcmbt/bluetooth.mk
|
||||
|
|
@ -125,6 +139,11 @@ PRODUCT_PACKAGES += \
|
|||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.audio.spatializer_enabled=true
|
||||
|
||||
# Sound Dose
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.audio.sounddose-vendor-impl \
|
||||
audio_sounddose_aoc
|
||||
|
||||
# Audio CCA property
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.audio.cca.enabled=false
|
||||
|
|
@ -180,13 +199,19 @@ PRODUCT_PRODUCT_PROPERTIES += \
|
|||
|
||||
# Bluetooth LE Audio
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
ro.bluetooth.leaudio_switcher.supported=true \
|
||||
bluetooth.profile.bap.unicast.client.enabled=true \
|
||||
bluetooth.profile.csip.set_coordinator.enabled=true \
|
||||
bluetooth.profile.hap.client.enabled=true \
|
||||
bluetooth.profile.mcp.server.enabled=true \
|
||||
bluetooth.profile.ccp.server.enabled=true \
|
||||
bluetooth.profile.vcp.controller.enabled=true
|
||||
ro.bluetooth.leaudio_switcher.supported?=true \
|
||||
bluetooth.profile.bap.unicast.client.enabled?=true \
|
||||
bluetooth.profile.csip.set_coordinator.enabled?=true \
|
||||
bluetooth.profile.hap.client.enabled?=true \
|
||||
bluetooth.profile.mcp.server.enabled?=true \
|
||||
bluetooth.profile.ccp.server.enabled?=true \
|
||||
bluetooth.profile.vcp.controller.enabled?=true
|
||||
|
||||
ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true)
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
bluetooth.profile.bap.broadcast.assist.enabled=true \
|
||||
bluetooth.profile.bap.broadcast.source.enabled=true
|
||||
endif
|
||||
|
||||
# Bluetooth LE Audio enable hardware offloading
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
|
|
@ -199,7 +224,7 @@ PRODUCT_COPY_FILES += \
|
|||
|
||||
# LE Audio Unicast Allowlist
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
persist.bluetooth.leaudio.allow_list=SM-R510
|
||||
persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5
|
||||
|
||||
# Bluetooth LE Audio CIS handover to SCO
|
||||
# Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683.
|
||||
|
|
@ -259,7 +284,7 @@ PRODUCT_PACKAGES += \
|
|||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
|
||||
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
|
||||
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
|
||||
else
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
|
||||
|
|
@ -296,7 +321,7 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
# Fingerprint HAL
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
|
||||
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
|
||||
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2
|
||||
else
|
||||
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
|
||||
|
|
@ -324,9 +349,6 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
# Media Performance Class 14
|
||||
PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34
|
||||
|
||||
# Modem
|
||||
PRODUCT_PROPERTY_OVERRIDES += persist.vendor.radio.volte_mif_off=true
|
||||
|
||||
# config of display brightness dimming
|
||||
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.dimming.usage?=1
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
|
|
@ -378,7 +400,7 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
|
||||
# Increment the SVN for any official public releases
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=13
|
||||
ro.vendor.build.svn=19
|
||||
|
||||
# WLC userdebug specific
|
||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
|
|
@ -440,4 +462,12 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
PRODUCT_PACKAGES += \
|
||||
NfcOverlayHusky \
|
||||
|
||||
# Set support hide display cutout feature
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
ro.support_hide_display_cutout=true
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
NoCutoutOverlay \
|
||||
AvoidAppsInCutoutOverlay
|
||||
|
||||
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
|
||||
|
|
|
|||
|
|
@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
|||
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
|
||||
|
||||
ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION)
|
||||
endif
|
||||
|
||||
ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR
|
||||
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)/kernel-headers
|
||||
endif
|
||||
|
||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
USE_UWBFIELDTESTQM := true
|
||||
endif
|
||||
|
|
@ -99,7 +108,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
|||
|
||||
# DCK properties based on target
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.gms.dck.eligible_wcc=3
|
||||
ro.gms.dck.eligible_wcc=3 \
|
||||
ro.gms.dck.se_capability=1
|
||||
|
||||
# Bluetooth hci_inject test tool
|
||||
PRODUCT_PACKAGES_DEBUG += \
|
||||
|
|
@ -157,6 +167,12 @@ PRODUCT_PRODUCT_PROPERTIES += \
|
|||
bluetooth.profile.ccp.server.enabled=true \
|
||||
bluetooth.profile.vcp.controller.enabled=true
|
||||
|
||||
ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true)
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
bluetooth.profile.bap.broadcast.assist.enabled=true \
|
||||
bluetooth.profile.bap.broadcast.source.enabled=true
|
||||
endif
|
||||
|
||||
# Bluetooth LE Audio enable hardware offloading
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
ro.bluetooth.leaudio_offload.supported=true \
|
||||
|
|
@ -217,7 +233,7 @@ PRODUCT_PACKAGES += \
|
|||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
|
||||
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
|
||||
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
|
||||
else
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
|
||||
|
|
|
|||
|
|
@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
|||
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
|
||||
|
||||
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION)
|
||||
endif
|
||||
|
||||
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR
|
||||
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers
|
||||
endif
|
||||
|
||||
LOCAL_PATH := device/google/shusky
|
||||
|
||||
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)
|
||||
|
|
@ -32,8 +41,12 @@ $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/Wallp
|
|||
DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay
|
||||
CAMERA_PRODUCT ?= shiba
|
||||
|
||||
include device/google/shusky/audio/shiba/audio-tables.mk
|
||||
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true)
|
||||
USE_AUDIO_HAL_AIDL := true
|
||||
endif
|
||||
|
||||
include device/google/shusky/camera/camera.mk
|
||||
include device/google/shusky/audio/shiba/audio-tables.mk
|
||||
include device/google/zuma/device-shipping-common.mk
|
||||
include hardware/google/pixel/vibrator/cs40l26/device.mk
|
||||
include device/google/gs-common/bcmbt/bluetooth.mk
|
||||
|
|
@ -113,6 +126,11 @@ PRODUCT_PACKAGES += \
|
|||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.audio.spatializer_enabled=true
|
||||
|
||||
# Sound Dose
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.audio.sounddose-vendor-impl \
|
||||
audio_sounddose_aoc
|
||||
|
||||
# Audio CCA property
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.audio.cca.enabled=false
|
||||
|
|
@ -168,13 +186,19 @@ PRODUCT_PRODUCT_PROPERTIES += \
|
|||
|
||||
# Bluetooth LE Audio
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
ro.bluetooth.leaudio_switcher.supported=true \
|
||||
bluetooth.profile.bap.unicast.client.enabled=true \
|
||||
bluetooth.profile.csip.set_coordinator.enabled=true \
|
||||
bluetooth.profile.hap.client.enabled=true \
|
||||
bluetooth.profile.mcp.server.enabled=true \
|
||||
bluetooth.profile.ccp.server.enabled=true \
|
||||
bluetooth.profile.vcp.controller.enabled=true
|
||||
ro.bluetooth.leaudio_switcher.supported?=true \
|
||||
bluetooth.profile.bap.unicast.client.enabled?=true \
|
||||
bluetooth.profile.csip.set_coordinator.enabled?=true \
|
||||
bluetooth.profile.hap.client.enabled?=true \
|
||||
bluetooth.profile.mcp.server.enabled?=true \
|
||||
bluetooth.profile.ccp.server.enabled?=true \
|
||||
bluetooth.profile.vcp.controller.enabled?=true
|
||||
|
||||
ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true)
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
bluetooth.profile.bap.broadcast.assist.enabled=true \
|
||||
bluetooth.profile.bap.broadcast.source.enabled=true
|
||||
endif
|
||||
|
||||
# Bluetooth LE Audio enable hardware offloading
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
|
|
@ -187,7 +211,7 @@ PRODUCT_COPY_FILES += \
|
|||
|
||||
# LE Audio Unicast Allowlist
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
persist.bluetooth.leaudio.allow_list=SM-R510
|
||||
persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5
|
||||
|
||||
# Bluetooth LE Audio CIS handover to SCO
|
||||
# Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683.
|
||||
|
|
@ -246,7 +270,7 @@ PRODUCT_PACKAGES += \
|
|||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
|
||||
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
|
||||
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
|
||||
else
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
|
||||
|
|
@ -279,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
# Fingerprint HAL
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
|
||||
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
|
||||
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2
|
||||
else
|
||||
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
|
||||
|
|
@ -315,7 +339,8 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/shusky/shiba/display_colordata_google-bigsurf_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_google-bigsurf_cal0.pb \
|
||||
device/google/shusky/shiba/display_colordata_google-shoreline_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_google-shoreline_cal0.pb \
|
||||
device/google/shusky/shiba/display_golden_google-bigsurf_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-bigsurf_cal0.pb \
|
||||
device/google/shusky/shiba/display_golden_google-shoreline_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-shoreline_cal0.pb
|
||||
device/google/shusky/shiba/display_golden_google-shoreline_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-shoreline_cal0.pb \
|
||||
device/google/shusky/display_golden_external_display_cal2.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_external_display_cal2.pb
|
||||
|
||||
# Camera Vendor property
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
|
|
@ -324,9 +349,6 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
# Media Performance Class 14
|
||||
PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34
|
||||
|
||||
# Modem
|
||||
PRODUCT_PROPERTY_OVERRIDES += persist.vendor.radio.volte_mif_off=true
|
||||
|
||||
# Display LBE
|
||||
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
|
||||
|
||||
|
|
@ -352,7 +374,7 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
|
||||
# Increment the SVN for any official public releases
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=13
|
||||
ro.vendor.build.svn=19
|
||||
|
||||
# P23 Devices no longer need rlsservice
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
|
|
@ -406,4 +428,12 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
PRODUCT_PACKAGES += \
|
||||
NfcOverlayShiba
|
||||
|
||||
# Set support hide display cutout feature
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
ro.support_hide_display_cutout=true
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
NoCutoutOverlay \
|
||||
AvoidAppsInCutoutOverlay
|
||||
|
||||
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
|
||||
|
|
|
|||
BIN
display_golden_external_display_cal2.pb
Normal file
BIN
display_golden_external_display_cal2.pb
Normal file
Binary file not shown.
|
|
@ -29,7 +29,7 @@ RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
|
|||
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
|
||||
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
|
||||
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
|
||||
else
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
|
||||
|
|
|
|||
|
|
@ -289,6 +289,8 @@
|
|||
<!-- MMS user agent profile url -->
|
||||
<string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/G1MNW.xml</string>
|
||||
|
||||
<bool name="config_safe_sound_dosage_enabled">true</bool>
|
||||
|
||||
<!-- The max vibration strength allowed in audio haptic channels. -->
|
||||
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
<device name="cp2ap_wakeup">
|
||||
<subsystem>Cellular_data</subsystem>
|
||||
</device>
|
||||
<device name="MAILBOX_AOCF12APx1100">
|
||||
<device name="MAILBOX_AOCF12APx1300">
|
||||
<subsystem>Sound_trigger</subsystem>
|
||||
</device>
|
||||
<device name="MAILBOX_AOCA322APx100">
|
||||
|
|
|
|||
|
|
@ -28,4 +28,7 @@
|
|||
<dimen name="lock_icon_padding">57px</dimen>
|
||||
|
||||
<dimen name="udfps_burn_in_offset_y">19px</dimen>
|
||||
|
||||
<!-- Pixel pitch of the device. um/px -->
|
||||
<item name="pixel_pitch" format="float" type="dimen">51.9</item>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -32,4 +32,5 @@
|
|||
<integer-array name="antenna_y">
|
||||
<item>103</item>
|
||||
</integer-array>
|
||||
<bool name="nfc_observe_mode_supported">true</bool>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -159,3 +159,17 @@ Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc
|
|||
Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ
|
||||
HInwg85pGm+sEkYbYFRBD0woPBsL3g==
|
||||
-----END CERTIFICATE-----
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIICGTCCAZ+gAwIBAgIQCeCTZaz32ci5PhwLBCou8zAKBggqhkjOPQQDAzBOMQsw
|
||||
CQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJjAkBgNVBAMTHURp
|
||||
Z2lDZXJ0IFRMUyBFQ0MgUDM4NCBSb290IEc1MB4XDTIxMDExNTAwMDAwMFoXDTQ2
|
||||
MDExNDIzNTk1OVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJ
|
||||
bmMuMSYwJAYDVQQDEx1EaWdpQ2VydCBUTFMgRUNDIFAzODQgUm9vdCBHNTB2MBAG
|
||||
ByqGSM49AgEGBSuBBAAiA2IABMFEoc8Rl1Ca3iOCNQfN0MsYndLxf3c1TzvdlHJS
|
||||
7cI7+Oz6e2tYIOyZrsn8aLN1udsJ7MgT9U7GCh1mMEy7H0cKPGEQQil8pQgO4CLp
|
||||
0zVozptjn4S1mU1YoI71VOeVyaNCMEAwHQYDVR0OBBYEFMFRRVBZqz7nLFr6ICIS
|
||||
B4CIfBFqMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49
|
||||
BAMDA2gAMGUCMQCJao1H5+z8blUD2WdsJk6Dxv3J+ysTvLd6jLRl0mlpYxNjOyZQ
|
||||
LgGheQaRnUi/wr4CMEfDFXuxoJGZSZOoPHzoRgaLLPIxAJSdYsiJvRmEFOml+wG4
|
||||
DXZDjC5Ty3zfDBeWUA==
|
||||
-----END CERTIFICATE-----
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
CpLppeUseAgnssLocForEmptyDbh="true"
|
||||
CpLppHighAccuracyShapeMode="1"
|
||||
ReAidingOnHotStart="false"
|
||||
ReAidingIntervalSec="1200"
|
||||
ReAidingIntervalSec="3600"
|
||||
RuntimeSwLteFilterEnable="true"
|
||||
MaxThreadNum="13"
|
||||
SensorsMask="0x244"
|
||||
|
|
@ -93,6 +93,8 @@
|
|||
|
||||
EnableB1C="false"
|
||||
EnableCoex="true"
|
||||
|
||||
RTICacheTimeoutSec="3600"
|
||||
/>
|
||||
|
||||
<gll_features
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
CpLppeUseAgnssLocForEmptyDbh="true"
|
||||
CpLppHighAccuracyShapeMode="1"
|
||||
ReAidingOnHotStart="false"
|
||||
ReAidingIntervalSec="1200"
|
||||
ReAidingIntervalSec="3600"
|
||||
RuntimeSwLteFilterEnable="true"
|
||||
MaxThreadNum="13"
|
||||
SensorsMask="0x244"
|
||||
|
|
@ -93,6 +93,8 @@
|
|||
|
||||
EnableB1C="false"
|
||||
EnableCoex="true"
|
||||
|
||||
RTICacheTimeoutSec="3600"
|
||||
/>
|
||||
|
||||
<gll_features
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
CpLppeUseAgnssLocForEmptyDbh="true"
|
||||
CpLppHighAccuracyShapeMode="1"
|
||||
ReAidingOnHotStart="false"
|
||||
ReAidingIntervalSec="1200"
|
||||
ReAidingIntervalSec="3600"
|
||||
RuntimeSwLteFilterEnable="true"
|
||||
MaxThreadNum="13"
|
||||
SensorsMask="0x244"
|
||||
|
|
@ -93,6 +93,8 @@
|
|||
|
||||
EnableB1C="false"
|
||||
EnableCoex="true"
|
||||
|
||||
RTICacheTimeoutSec="3600"
|
||||
/>
|
||||
|
||||
<gll_features
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
CpLppeUseAgnssLocForEmptyDbh="true"
|
||||
CpLppHighAccuracyShapeMode="1"
|
||||
ReAidingOnHotStart="false"
|
||||
ReAidingIntervalSec="1200"
|
||||
ReAidingIntervalSec="3600"
|
||||
RuntimeSwLteFilterEnable="true"
|
||||
MaxThreadNum="13"
|
||||
SensorsMask="0x244"
|
||||
|
|
@ -92,6 +92,8 @@
|
|||
|
||||
EnableB1C="false"
|
||||
EnableCoex="true"
|
||||
|
||||
RTICacheTimeoutSec="3600"
|
||||
/>
|
||||
|
||||
<gll_features
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
CpLppeUseAgnssLocForEmptyDbh="true"
|
||||
CpLppHighAccuracyShapeMode="1"
|
||||
ReAidingOnHotStart="false"
|
||||
ReAidingIntervalSec="1200"
|
||||
ReAidingIntervalSec="3600"
|
||||
RuntimeSwLteFilterEnable="true"
|
||||
MaxThreadNum="13"
|
||||
SensorsMask="0x244"
|
||||
|
|
@ -92,6 +92,8 @@
|
|||
|
||||
EnableB1C="false"
|
||||
EnableCoex="true"
|
||||
|
||||
RTICacheTimeoutSec="3600"
|
||||
/>
|
||||
|
||||
<gll_features
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
CpLppeUseAgnssLocForEmptyDbh="true"
|
||||
CpLppHighAccuracyShapeMode="1"
|
||||
ReAidingOnHotStart="false"
|
||||
ReAidingIntervalSec="1200"
|
||||
ReAidingIntervalSec="3600"
|
||||
RuntimeSwLteFilterEnable="true"
|
||||
MaxThreadNum="13"
|
||||
SensorsMask="0x244"
|
||||
|
|
@ -92,6 +92,8 @@
|
|||
|
||||
EnableB1C="false"
|
||||
EnableCoex="true"
|
||||
|
||||
RTICacheTimeoutSec="3600"
|
||||
/>
|
||||
|
||||
<gll_features
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ NFC_DEBUG_ENABLED=0
|
|||
|
||||
###############################################################################
|
||||
# Vendor specific mode to enable FW (RF & SWP) traces.
|
||||
STNFC_FW_DEBUG_ENABLED=0
|
||||
STNFC_FW_DEBUG_ENABLED=1
|
||||
|
||||
###############################################################################
|
||||
# File used for NFA storage
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@
|
|||
"1280",
|
||||
"1100"
|
||||
],
|
||||
"DefaultIndex": 0,
|
||||
"DefaultIndex": 1,
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
|
|
@ -297,6 +297,7 @@
|
|||
"Path": "/proc/vendor_sched/groups/cam/uclamp_min",
|
||||
"Values": [
|
||||
"765",
|
||||
"250",
|
||||
"0"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
|
|
@ -777,15 +778,6 @@
|
|||
"20 40"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "SchedLibMaskIn",
|
||||
"Path": "/proc/vendor_sched/sched_lib_mask_in",
|
||||
"Values": [
|
||||
"0x100",
|
||||
"0x0"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
}
|
||||
],
|
||||
"Actions": [
|
||||
|
|
@ -948,12 +940,6 @@
|
|||
"Duration": 5000,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "SchedLibMaskIn",
|
||||
"Duration": 5000,
|
||||
"Value": "0x100"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "CPUBigClusterMaxFreq",
|
||||
|
|
@ -1032,12 +1018,6 @@
|
|||
"Duration": 2000,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "SchedLibMaskIn",
|
||||
"Duration": 5000,
|
||||
"Value": "0x100"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_PMU",
|
||||
"Node": "PMU_POLL",
|
||||
|
|
@ -1636,6 +1616,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_EXTREME",
|
||||
"Node": "CAMUClampBoost",
|
||||
"Duration": 0,
|
||||
"Value": "250"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_EXTREME",
|
||||
"Node": "PMU_LIT_LIMIT_FREQ",
|
||||
|
|
@ -1924,6 +1910,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_STANDARD",
|
||||
"Node": "CPUDVFSHeadroom",
|
||||
"Duration": 0,
|
||||
"Value": "1280"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_STANDARD",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
|
@ -2062,6 +2054,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_LOW",
|
||||
"Node": "CPUDVFSHeadroom",
|
||||
"Duration": 0,
|
||||
"Value": "1280"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_LOW",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
|
@ -2543,12 +2541,6 @@
|
|||
"Duration": 0,
|
||||
"Value": "419000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "GAME",
|
||||
"Node": "CPUUtilThreshold",
|
||||
"Duration": 0,
|
||||
"Value": "1280"
|
||||
},
|
||||
{
|
||||
"PowerHint": "GAME",
|
||||
"Node": "VIRTUAL-SKIN-CPU-MID",
|
||||
|
|
@ -2609,12 +2601,6 @@
|
|||
"Duration": 0,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "GAME",
|
||||
"Node": "SchedLibMaskIn",
|
||||
"Duration": 0,
|
||||
"Value": "0x100"
|
||||
},
|
||||
{
|
||||
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
|
||||
"Node": "PMU_POLL",
|
||||
|
|
@ -2945,7 +2931,7 @@
|
|||
"Name": "REFRESH_120FPS",
|
||||
"PID_On": true,
|
||||
"PID_Po": 2.0,
|
||||
"PID_Pu": 1.0,
|
||||
"PID_Pu": 0.6,
|
||||
"PID_I": 0.0,
|
||||
"PID_I_Init": 200,
|
||||
"PID_I_High": 512,
|
||||
|
|
|
|||
|
|
@ -283,6 +283,7 @@
|
|||
"Path": "/proc/vendor_sched/groups/cam/uclamp_min",
|
||||
"Values": [
|
||||
"765",
|
||||
"250",
|
||||
"0"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
|
|
@ -799,15 +800,6 @@
|
|||
"20 40"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "SchedLibMaskIn",
|
||||
"Path": "/proc/vendor_sched/sched_lib_mask_in",
|
||||
"Values": [
|
||||
"0x100",
|
||||
"0x0"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
}
|
||||
],
|
||||
"Actions": [
|
||||
|
|
@ -970,12 +962,6 @@
|
|||
"Duration": 5000,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "SchedLibMaskIn",
|
||||
"Duration": 5000,
|
||||
"Value": "0x100"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "CPUBigClusterMaxFreq",
|
||||
|
|
@ -1054,12 +1040,6 @@
|
|||
"Duration": 2000,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "SchedLibMaskIn",
|
||||
"Duration": 5000,
|
||||
"Value": "0x100"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_PMU",
|
||||
"Node": "PMU_POLL",
|
||||
|
|
@ -1497,6 +1477,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_EXTREME",
|
||||
"Node": "CAMUClampBoost",
|
||||
"Duration": 0,
|
||||
"Value": "250"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_EXTREME",
|
||||
"Node": "PMU_LIT_LIMIT_FREQ",
|
||||
|
|
@ -2368,12 +2354,6 @@
|
|||
"Duration": 0,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "GAME",
|
||||
"Node": "SchedLibMaskIn",
|
||||
"Duration": 0,
|
||||
"Value": "0x100"
|
||||
},
|
||||
{
|
||||
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
|
||||
"Node": "PMU_POLL",
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@
|
|||
"1280",
|
||||
"1100"
|
||||
],
|
||||
"DefaultIndex": 0,
|
||||
"DefaultIndex": 1,
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
|
|
@ -297,6 +297,7 @@
|
|||
"Path": "/proc/vendor_sched/groups/cam/uclamp_min",
|
||||
"Values": [
|
||||
"765",
|
||||
"250",
|
||||
"0"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
|
|
@ -777,15 +778,6 @@
|
|||
"20 40"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "SchedLibMaskIn",
|
||||
"Path": "/proc/vendor_sched/sched_lib_mask_in",
|
||||
"Values": [
|
||||
"0x100",
|
||||
"0x0"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
}
|
||||
],
|
||||
"Actions": [
|
||||
|
|
@ -948,12 +940,6 @@
|
|||
"Duration": 5000,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "SchedLibMaskIn",
|
||||
"Duration": 5000,
|
||||
"Value": "0x100"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "CPUBigClusterMaxFreq",
|
||||
|
|
@ -1032,12 +1018,6 @@
|
|||
"Duration": 2000,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "SchedLibMaskIn",
|
||||
"Duration": 5000,
|
||||
"Value": "0x100"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_PMU",
|
||||
"Node": "PMU_POLL",
|
||||
|
|
@ -1540,6 +1520,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_EXTREME",
|
||||
"Node": "CAMUClampBoost",
|
||||
"Duration": 0,
|
||||
"Value": "250"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_EXTREME",
|
||||
"Node": "PMU_LIT_LIMIT_FREQ",
|
||||
|
|
@ -1828,6 +1814,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_STANDARD",
|
||||
"Node": "CPUDVFSHeadroom",
|
||||
"Duration": 0,
|
||||
"Value": "1280"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_STANDARD",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
|
@ -1966,6 +1958,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_LOW",
|
||||
"Node": "CPUDVFSHeadroom",
|
||||
"Duration": 0,
|
||||
"Value": "1280"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_LOW",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
|
@ -2489,12 +2487,6 @@
|
|||
"Duration": 0,
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "GAME",
|
||||
"Node": "CPUUtilThreshold",
|
||||
"Duration": 0,
|
||||
"Value": "1280"
|
||||
},
|
||||
{
|
||||
"PowerHint": "GAME",
|
||||
"Node": "VIRTUAL-SKIN-CPU-MID",
|
||||
|
|
@ -2513,12 +2505,6 @@
|
|||
"Duration": 0,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "GAME",
|
||||
"Node": "SchedLibMaskIn",
|
||||
"Duration": 0,
|
||||
"Value": "0x100"
|
||||
},
|
||||
{
|
||||
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
|
||||
"Node": "PMU_POLL",
|
||||
|
|
@ -2849,7 +2835,7 @@
|
|||
"Name": "REFRESH_120FPS",
|
||||
"PID_On": true,
|
||||
"PID_Po": 2.0,
|
||||
"PID_Pu": 1.0,
|
||||
"PID_Pu": 0.6,
|
||||
"PID_I": 0.0,
|
||||
"PID_I_Init": 200,
|
||||
"PID_I_High": 512,
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
#include <android/binder_manager.h>
|
||||
#include <android/binder_process.h>
|
||||
#include <log/log.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider;
|
||||
using aidl::android::hardware::power::stats::EnergyConsumerType;
|
||||
|
|
@ -33,37 +34,44 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
|
|||
|
||||
void addDisplay(std::shared_ptr<PowerStats> p) {
|
||||
// Add display residency stats
|
||||
std::vector<std::string> states = {
|
||||
"Off",
|
||||
"LP: 1008x2244@1",
|
||||
"LP: 1008x2244@30",
|
||||
"On: 1008x2244@1",
|
||||
"On: 1008x2244@10",
|
||||
"On: 1008x2244@30",
|
||||
"On: 1008x2244@60",
|
||||
"On: 1008x2244@120",
|
||||
"HBM: 1008x2244@1",
|
||||
"HBM: 1008x2244@10",
|
||||
"HBM: 1008x2244@30",
|
||||
"HBM: 1008x2244@60",
|
||||
"HBM: 1008x2244@120",
|
||||
"LP: 1344x2992@1",
|
||||
"LP: 1344x2992@30",
|
||||
"On: 1344x2992@1",
|
||||
"On: 1344x2992@10",
|
||||
"On: 1344x2992@30",
|
||||
"On: 1344x2992@60",
|
||||
"On: 1344x2992@120",
|
||||
"HBM: 1344x2992@1",
|
||||
"HBM: 1344x2992@10",
|
||||
"HBM: 1344x2992@30",
|
||||
"HBM: 1344x2992@60",
|
||||
"HBM: 1344x2992@120"};
|
||||
struct stat buffer;
|
||||
if (stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
|
||||
// time_in_state doesn't exist
|
||||
std::vector<std::string> states = {
|
||||
"Off",
|
||||
"LP: 1008x2244@1",
|
||||
"LP: 1008x2244@30",
|
||||
"On: 1008x2244@1",
|
||||
"On: 1008x2244@10",
|
||||
"On: 1008x2244@30",
|
||||
"On: 1008x2244@60",
|
||||
"On: 1008x2244@120",
|
||||
"HBM: 1008x2244@1",
|
||||
"HBM: 1008x2244@10",
|
||||
"HBM: 1008x2244@30",
|
||||
"HBM: 1008x2244@60",
|
||||
"HBM: 1008x2244@120",
|
||||
"LP: 1344x2992@1",
|
||||
"LP: 1344x2992@30",
|
||||
"On: 1344x2992@1",
|
||||
"On: 1344x2992@10",
|
||||
"On: 1344x2992@30",
|
||||
"On: 1344x2992@60",
|
||||
"On: 1344x2992@120",
|
||||
"HBM: 1344x2992@1",
|
||||
"HBM: 1344x2992@10",
|
||||
"HBM: 1344x2992@30",
|
||||
"HBM: 1344x2992@60",
|
||||
"HBM: 1344x2992@120"};
|
||||
|
||||
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
|
||||
"Display",
|
||||
"/sys/class/backlight/panel0-backlight/state",
|
||||
states));
|
||||
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
|
||||
"Display",
|
||||
"/sys/class/backlight/panel0-backlight/state",
|
||||
states));
|
||||
} else {
|
||||
// time_in_state exists
|
||||
addDisplayMRR(p);
|
||||
}
|
||||
|
||||
// Add display energy consumer
|
||||
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
#include <android/binder_manager.h>
|
||||
#include <android/binder_process.h>
|
||||
#include <log/log.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider;
|
||||
using aidl::android::hardware::power::stats::EnergyConsumerType;
|
||||
|
|
@ -33,18 +34,25 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
|
|||
|
||||
void addDisplay(std::shared_ptr<PowerStats> p) {
|
||||
// Add display residency stats
|
||||
std::vector<std::string> states = {
|
||||
"Off",
|
||||
"LP: 1080x2400@30",
|
||||
"On: 1080x2400@60",
|
||||
"On: 1080x2400@120",
|
||||
"HBM: 1080x2400@60",
|
||||
"HBM: 1080x2400@120"};
|
||||
struct stat buffer;
|
||||
if (stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
|
||||
// time_in_state doesn't exist
|
||||
std::vector<std::string> states = {
|
||||
"Off",
|
||||
"LP: 1080x2400@30",
|
||||
"On: 1080x2400@60",
|
||||
"On: 1080x2400@120",
|
||||
"HBM: 1080x2400@60",
|
||||
"HBM: 1080x2400@120"};
|
||||
|
||||
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
|
||||
"Display",
|
||||
"/sys/class/backlight/panel0-backlight/state",
|
||||
states));
|
||||
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
|
||||
"Display",
|
||||
"/sys/class/backlight/panel0-backlight/state",
|
||||
states));
|
||||
} else {
|
||||
// time_in_state exists
|
||||
addDisplayMRR(p);
|
||||
}
|
||||
|
||||
// Add display energy consumer
|
||||
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ USES_DEVICE_GOOGLE_SHUSKY := true
|
|||
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
|
||||
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
|
||||
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
|
||||
else
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
|
||||
|
|
|
|||
|
|
@ -174,4 +174,11 @@
|
|||
|
||||
<!-- Enable aggregation of Wifi link layer radio stats from all radios -->
|
||||
<bool translatable="false" name="config_wifiLinkLayerAllRadiosStatsAggregationEnabled">true</bool>
|
||||
|
||||
<!-- Boolean indicating performing a partial initial scan is enabled -->
|
||||
<bool translatable="false" name="config_wifiEnablePartialInitialScan">true</bool>
|
||||
<!-- Configure the max number of new channels to add into the initial partial scan list per network.
|
||||
If equals to 0, it means there's no limit on the max number of channels to include per network.-->
|
||||
<integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,11 @@
|
|||
IMAGES/vendor_dlkm.img \
|
||||
RADIO/bootloader.img \
|
||||
RADIO/radio.img \
|
||||
system_ext/etc/permissions/com.android.qns.xml \
|
||||
system_ext/etc/permissions/com.shannon.imsservice.xml \
|
||||
system_ext/etc/permissions/com.shannon.rcsservice.xml \
|
||||
system_ext/lib64/libmediaadaptor.so \
|
||||
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
|
||||
system_ext/priv-app/ShannonIms/ShannonIms.apk \
|
||||
system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
|
||||
"
|
||||
;;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,22 +22,6 @@ ifneq ($(filter husky,$(TARGET_DEVICE)),)
|
|||
endif
|
||||
|
||||
ifneq ($(filter husky,$(TARGET_DEVICE)),)
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
||||
LOCAL_MODULE := PixelQualifiedNetworksService
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_BUILT_MODULE_STEM := package.apk
|
||||
LOCAL_SYSTEM_EXT_MODULE := true
|
||||
LOCAL_PRIVILEGED_MODULE := true
|
||||
LOCAL_MODULE_OWNER := google
|
||||
LOCAL_MODULE_CLASS := APPS
|
||||
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
||||
LOCAL_CERTIFICATE := platform
|
||||
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
|
||||
LOCAL_LICENSE_CONDITIONS := notice
|
||||
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
|
||||
include $(BUILD_PREBUILT)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
||||
LOCAL_MODULE := ShannonIms
|
||||
|
|
@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
|
|||
|
||||
# AOSP packages required by the blobs
|
||||
PRODUCT_PACKAGES := \
|
||||
PixelQualifiedNetworksService \
|
||||
ShannonIms \
|
||||
ShannonRcs \
|
||||
|
||||
|
|
@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \
|
|||
|
||||
# blob(s) necessary for husky hardware
|
||||
PRODUCT_COPY_FILES := \
|
||||
vendor/google_devices/husky/proprietary/com.android.qns.xml:system_ext/etc/permissions/com.android.qns.xml:google \
|
||||
vendor/google_devices/husky/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
|
||||
vendor/google_devices/husky/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,11 @@
|
|||
IMAGES/vendor_dlkm.img \
|
||||
RADIO/bootloader.img \
|
||||
RADIO/radio.img \
|
||||
system_ext/etc/permissions/com.android.qns.xml \
|
||||
system_ext/etc/permissions/com.shannon.imsservice.xml \
|
||||
system_ext/etc/permissions/com.shannon.rcsservice.xml \
|
||||
system_ext/lib64/libmediaadaptor.so \
|
||||
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
|
||||
system_ext/priv-app/ShannonIms/ShannonIms.apk \
|
||||
system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
|
||||
"
|
||||
;;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,22 +22,6 @@ ifneq ($(filter shiba,$(TARGET_DEVICE)),)
|
|||
endif
|
||||
|
||||
ifneq ($(filter shiba,$(TARGET_DEVICE)),)
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
||||
LOCAL_MODULE := PixelQualifiedNetworksService
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_BUILT_MODULE_STEM := package.apk
|
||||
LOCAL_SYSTEM_EXT_MODULE := true
|
||||
LOCAL_PRIVILEGED_MODULE := true
|
||||
LOCAL_MODULE_OWNER := google
|
||||
LOCAL_MODULE_CLASS := APPS
|
||||
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
||||
LOCAL_CERTIFICATE := platform
|
||||
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
|
||||
LOCAL_LICENSE_CONDITIONS := notice
|
||||
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
|
||||
include $(BUILD_PREBUILT)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
||||
LOCAL_MODULE := ShannonIms
|
||||
|
|
@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
|
|||
|
||||
# AOSP packages required by the blobs
|
||||
PRODUCT_PACKAGES := \
|
||||
PixelQualifiedNetworksService \
|
||||
ShannonIms \
|
||||
ShannonRcs \
|
||||
|
||||
|
|
@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \
|
|||
|
||||
# blob(s) necessary for shiba hardware
|
||||
PRODUCT_COPY_FILES := \
|
||||
vendor/google_devices/shiba/proprietary/com.android.qns.xml:system_ext/etc/permissions/com.android.qns.xml:google \
|
||||
vendor/google_devices/shiba/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
|
||||
vendor/google_devices/shiba/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
|
|||
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
|
||||
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
|
||||
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
|
||||
else
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
|
||||
|
|
|
|||
|
|
@ -283,6 +283,8 @@
|
|||
<!-- MMS user agent profile url -->
|
||||
<string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/GKWS6.xml</string>
|
||||
|
||||
<bool name="config_safe_sound_dosage_enabled">true</bool>
|
||||
|
||||
<!-- The max vibration strength allowed in audio haptic channels. -->
|
||||
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
<device name="cp2ap_wakeup">
|
||||
<subsystem>Cellular_data</subsystem>
|
||||
</device>
|
||||
<device name="MAILBOX_AOCF12APx1100">
|
||||
<device name="MAILBOX_AOCF12APx1300">
|
||||
<subsystem>Sound_trigger</subsystem>
|
||||
</device>
|
||||
<device name="MAILBOX_AOCA322APx100">
|
||||
|
|
|
|||
|
|
@ -30,4 +30,7 @@
|
|||
<!-- Offset should not be more than 1mm -->
|
||||
<dimen name="udfps_burn_in_offset_x">6px</dimen>
|
||||
<dimen name="udfps_burn_in_offset_y">17px</dimen>
|
||||
|
||||
<!-- Pixel pitch of the device. um/px -->
|
||||
<item name="pixel_pitch" format="float" type="dimen">59.5</item>
|
||||
</resources>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 536 KiB |
|
|
@ -32,4 +32,5 @@
|
|||
<integer-array name="antenna_y">
|
||||
<item>97</item>
|
||||
</integer-array>
|
||||
<bool name="nfc_observe_mode_supported">true</bool>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -582,21 +582,21 @@
|
|||
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
|
||||
"MaxReleaseStep": 1,
|
||||
"MaxThrottleStep": 1,
|
||||
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
|
||||
"CdevCeiling": [0, 2, 6, 6, 6, 6, 6]
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-1",
|
||||
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
|
||||
"MaxReleaseStep": 1,
|
||||
"MaxThrottleStep": 2,
|
||||
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
|
||||
"CdevCeiling": [0, 6, 9, 9, 9, 9, 9]
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-2",
|
||||
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
|
||||
"MaxReleaseStep": 1,
|
||||
"MaxThrottleStep": 2,
|
||||
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
|
||||
"CdevCeiling": [0, 8, 12, 12, 12, 12, 12]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -175,17 +175,7 @@
|
|||
"Multiplier":1,
|
||||
"Monitor":true,
|
||||
"PollingDelay":0,
|
||||
"PassiveDelay":1000,
|
||||
"BindedCdevInfo": [
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-2",
|
||||
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-gpufreq-0",
|
||||
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
|
||||
}
|
||||
]
|
||||
"PassiveDelay":1000
|
||||
},
|
||||
{
|
||||
"Name":"BCL_AUDIO_BAACL",
|
||||
|
|
@ -239,17 +229,7 @@
|
|||
"Multiplier":1,
|
||||
"Monitor":true,
|
||||
"PollingDelay":0,
|
||||
"PassiveDelay":1000,
|
||||
"BindedCdevInfo": [
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-2",
|
||||
"LimitInfo": [0, 0, 0, 0, 7, 10, 10]
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-gpufreq-0",
|
||||
"LimitInfo": [0, 0, 0, 0, 2, 2, 2]
|
||||
}
|
||||
]
|
||||
"PassiveDelay":1000
|
||||
},
|
||||
{
|
||||
"Name":"vdroop2",
|
||||
|
|
@ -276,17 +256,7 @@
|
|||
"Multiplier":1,
|
||||
"Monitor":true,
|
||||
"PollingDelay":0,
|
||||
"PassiveDelay":1000,
|
||||
"BindedCdevInfo": [
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-2",
|
||||
"LimitInfo": [0, 0, 0, 0, 7, 10, 10]
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-gpufreq-0",
|
||||
"LimitInfo": [0, 0, 0, 0, 4, 4, 4]
|
||||
}
|
||||
]
|
||||
"PassiveDelay":1000
|
||||
},
|
||||
{
|
||||
"Name":"smpl_gm",
|
||||
|
|
@ -313,161 +283,7 @@
|
|||
"Multiplier":1,
|
||||
"Monitor":true,
|
||||
"PollingDelay":0,
|
||||
"PassiveDelay":1000,
|
||||
"BindedCdevInfo": [
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-2",
|
||||
"LimitInfo": [0, 0, 0, 0, 7, 10, 10]
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-gpufreq-0",
|
||||
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name":"ocp_cpu2",
|
||||
"Type":"BCL_CURRENT",
|
||||
"HotThreshold":[
|
||||
"NaN",
|
||||
"NaN",
|
||||
"NaN",
|
||||
"NaN",
|
||||
12000,
|
||||
"NaN",
|
||||
"NaN"
|
||||
],
|
||||
"HotHysteresis":[
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
100,
|
||||
0.0,
|
||||
0.0
|
||||
],
|
||||
"VrThreshold":"NaN",
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"ocp_tpu",
|
||||
"Type":"BCL_CURRENT",
|
||||
"HotThreshold":[
|
||||
"NaN",
|
||||
"NaN",
|
||||
"NaN",
|
||||
"NaN",
|
||||
10500,
|
||||
"NaN",
|
||||
"NaN"
|
||||
],
|
||||
"HotHysteresis":[
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
100,
|
||||
0.0,
|
||||
0.0
|
||||
],
|
||||
"VrThreshold":"NaN",
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"ocp_gpu",
|
||||
"Type":"BCL_CURRENT",
|
||||
"HotThreshold":[
|
||||
"NaN",
|
||||
"NaN",
|
||||
"NaN",
|
||||
"NaN",
|
||||
12000,
|
||||
"NaN",
|
||||
"NaN"
|
||||
],
|
||||
"HotHysteresis":[
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
100,
|
||||
0.0,
|
||||
0.0
|
||||
],
|
||||
"VrThreshold":"NaN",
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"soft_ocp_cpu2",
|
||||
"Type":"BCL_CURRENT",
|
||||
"HotThreshold":[
|
||||
"NaN",
|
||||
"NaN",
|
||||
"NaN",
|
||||
"NaN",
|
||||
9000,
|
||||
"NaN",
|
||||
"NaN"
|
||||
],
|
||||
"HotHysteresis":[
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
100,
|
||||
0.0,
|
||||
0.0
|
||||
],
|
||||
"VrThreshold":"NaN",
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"soft_ocp_tpu",
|
||||
"Type":"BCL_CURRENT",
|
||||
"HotThreshold":[
|
||||
"NaN",
|
||||
"NaN",
|
||||
"NaN",
|
||||
"NaN",
|
||||
8500,
|
||||
"NaN",
|
||||
"NaN"
|
||||
],
|
||||
"HotHysteresis":[
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
100,
|
||||
0.0,
|
||||
0.0
|
||||
],
|
||||
"VrThreshold":"NaN",
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"soft_ocp_gpu",
|
||||
"Type":"BCL_CURRENT",
|
||||
"HotThreshold":[
|
||||
"NaN",
|
||||
"NaN",
|
||||
"NaN",
|
||||
"NaN",
|
||||
9000,
|
||||
"NaN",
|
||||
"NaN"
|
||||
],
|
||||
"HotHysteresis":[
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
100,
|
||||
0.0,
|
||||
0.0
|
||||
],
|
||||
"VrThreshold":"NaN",
|
||||
"Multiplier":1
|
||||
"PassiveDelay":1000
|
||||
},
|
||||
{
|
||||
"Name":"TPU",
|
||||
|
|
|
|||
|
|
@ -550,21 +550,21 @@
|
|||
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
|
||||
"MaxReleaseStep": 1,
|
||||
"MaxThrottleStep": 1,
|
||||
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
|
||||
"CdevCeiling": [0, 2, 6, 6, 6, 6, 6]
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-1",
|
||||
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
|
||||
"MaxReleaseStep": 1,
|
||||
"MaxThrottleStep": 2,
|
||||
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
|
||||
"CdevCeiling": [0, 6, 9, 9, 9, 9, 9]
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-2",
|
||||
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
|
||||
"MaxReleaseStep": 1,
|
||||
"MaxThrottleStep": 2,
|
||||
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
|
||||
"CdevCeiling": [0, 8, 12, 12, 12, 12, 12]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue