diff --git a/aosp_akita.mk b/aosp_akita.mk index bf2b33c..d9c41e8 100644 --- a/aosp_akita.mk +++ b/aosp_akita.mk @@ -27,6 +27,3 @@ PRODUCT_DEVICE := akita PRODUCT_MODEL := AOSP on akita PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/akita/manifest.xml diff --git a/audio/akita/prebuilt/libspeechenhancer/Android.bp b/audio/akita/prebuilt/libspeechenhancer/Android.bp new file mode 100644 index 0000000..9d4a232 --- /dev/null +++ b/audio/akita/prebuilt/libspeechenhancer/Android.bp @@ -0,0 +1,43 @@ +// Copyright (C) 2024 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. +soong_namespace { +} + +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +cc_prebuilt_library_shared { + name: "libspeechenhancer", + vendor: true, + owner: "google", + proprietary: true, + allow_undefined_symbols: true, + arch: { + arm64: { + srcs: ["arm64/libspeechenhancer.so"], + }, + }, + + shared_libs: [ + "libcutils", + "libEGL", + "libGLESv2", + "libbinder_ndk", + "liblog", + "libsync", + "libz", + "libnativewindow", + ], +} diff --git a/audio/akita/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/akita/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so new file mode 100644 index 0000000..861ef15 Binary files /dev/null and b/audio/akita/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so differ diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml index 0e06d14..49e1f04 100644 --- a/bluetooth/le_audio_codec_capabilities.xml +++ b/bluetooth/le_audio_codec_capabilities.xml @@ -52,6 +52,7 @@ + @@ -74,6 +75,7 @@ + diff --git a/conf/init.akita.rc b/conf/init.akita.rc index 0923b31..55c5056 100644 --- a/conf/init.akita.rc +++ b/conf/init.akita.rc @@ -84,6 +84,7 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_ms chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/0-0043/default/owt_lib_compat chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us diff --git a/device-akita.mk b/device-akita.mk index 79605c7..07a6e7c 100644 --- a/device-akita.mk +++ b/device-akita.mk @@ -281,6 +281,13 @@ PRODUCT_PACKAGES += \ endif +# HdMic Audio +PRODUCT_SOONG_NAMESPACES += device/google/akita/audio/akita/prebuilt/libspeechenhancer +PRODUCT_PROPERTY_OVERRIDES += \ + persist.vendor.app.audio.gsenet.version=1 +PRODUCT_PACKAGES += \ + libspeechenhancer + # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.cca.enabled=false @@ -331,7 +338,7 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts # include GNSSD -include device/google/akita/location/gnssd/device-gnss.mk +include device/google/akita/location/device-gnss.mk # Set zram size PRODUCT_VENDOR_PROPERTIES += \ diff --git a/location/gnssd/release/ca.pem b/location/ca.pem similarity index 100% rename from location/gnssd/release/ca.pem rename to location/ca.pem diff --git a/location/device-gnss.mk b/location/device-gnss.mk new file mode 100644 index 0000000..916c549 --- /dev/null +++ b/location/device-gnss.mk @@ -0,0 +1,19 @@ +# include common gnss binaries +-include vendor/samsung_slsi/gps/s5300/gnss_release.mk + +# include customized gps config files +PRODUCT_COPY_FILES += \ + device/google/akita/location/ca.pem:vendor/etc/gnss/ca.pem + +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/akita/location/gps.cfg:vendor/etc/gnss/gps.cfg + PRODUCT_VENDOR_PROPERTIES += \ + vendor.gps.aol.enabled=true +else + PRODUCT_COPY_FILES += \ + device/google/akita/location/gps_user.cfg:vendor/etc/gnss/gps.cfg +endif + +# include pixel gnss hal service +-include vendor/google_devices/gs-common/proprietary/gps/pixel_gnss_hal.mk diff --git a/location/factory-gnss.mk b/location/factory-gnss.mk new file mode 100644 index 0000000..d9c2b88 --- /dev/null +++ b/location/factory-gnss.mk @@ -0,0 +1,2 @@ +# include factory gnss binaries +-include vendor/samsung_slsi/gps/s5300/gnss_factory.mk diff --git a/location/gnssd/Android.bp b/location/gnssd/Android.bp deleted file mode 100644 index 3c9d04d..0000000 --- a/location/gnssd/Android.bp +++ /dev/null @@ -1,81 +0,0 @@ -soong_namespace { -} - -package { - default_applicable_licenses: ["vendor_samsung_slsi_gnss_license"], -} - -license { - name: "vendor_samsung_slsi_gnss_license", - visibility: [":__subpackages__"], - license_kinds: [ - "legacy_by_exception_only", // by exception only - "legacy_proprietary", // by exception only - ], -} - -cc_prebuilt_binary { - name: "android.hardware.gnss-service", - arch: { - arm64: { - srcs: ["release/android.hardware.gnss-service"], - shared_libs: [ - "libbase", - "libbinder_ndk", - "libcutils", - "liblog", - "libutils", - "android.frameworks.sensorservice-V1-ndk", - "android.hardware.gnss-V3-ndk", - "libsensorndkbridge", - "libc++", - "libc", - "libm", - "libdl", - "libz", - ], - }, - }, - compile_multilib: "64", - vendor: true, - relative_install_path: "hw", - strip: { - none: true, - }, - required: [ - "libsighandler", - ], - init_rc: ["init.gnss.rc"], - vintf_fragments: ["android.hardware.gnss@default.xml"], -} - -cc_prebuilt_binary { - name: "gnssd", - arch: { - arm64: { - srcs: ["release/gnssd"], - shared_libs: [ - "liblog", - "libssl", - "libcrypto", - "libandroid_net", - "libc++", - "libc", - "libm", - "libdl", - "libcurl", - "libz", - ], - }, - }, - compile_multilib: "64", - vendor: true, - relative_install_path: "hw", - strip: { - none: true, - }, - required: [ - "libcustomgnss", - "libsighandler", - ], -} diff --git a/location/gnssd/android.hardware.gnss@default.xml b/location/gnssd/android.hardware.gnss@default.xml deleted file mode 100644 index 8d06407..0000000 --- a/location/gnssd/android.hardware.gnss@default.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - android.hardware.gnss - 3 - IGnss/default - - diff --git a/location/gnssd/device-gnss.mk b/location/gnssd/device-gnss.mk deleted file mode 100644 index 9f0e349..0000000 --- a/location/gnssd/device-gnss.mk +++ /dev/null @@ -1,2 +0,0 @@ -$(call inherit-product-if-exists, device/google/akita/location/gnssd/gnss_release.mk) - diff --git a/location/gnssd/device_framework_matrix_product.xml b/location/gnssd/device_framework_matrix_product.xml deleted file mode 100644 index 2c93444..0000000 --- a/location/gnssd/device_framework_matrix_product.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - android.hardware.gnss - 3 - - IGnss - vendor - - - diff --git a/location/gnssd/gnss_release.mk b/location/gnssd/gnss_release.mk deleted file mode 100644 index 6730743..0000000 --- a/location/gnssd/gnss_release.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Enable coredump funtcion for all the ROM. -$(call soong_config_set_bool,sighandler,coredump,true) -# Enable pixel gnss hal service --include vendor/google/gnss/aidl_service/pixel_gnss_hal.mk - -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/akita/location/gnssd/device_framework_matrix_product.xml - -PRODUCT_PACKAGES += \ - gnssd \ - android.hardware.gnss-service \ - android.hardware.location.gps.prebuilt.xml - -PRODUCT_COPY_FILES += \ - device/google/akita/location/gnssd/release/ca.pem:vendor/etc/gnss/ca.pem \ - device/google/akita/location/gnssd/release/kepler.bin:vendor/firmware/kepler.bin - -PRODUCT_SOONG_NAMESPACES += \ - device/google/akita/location/gnssd - -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) - PRODUCT_COPY_FILES += \ - device/google/akita/location/gnssd/release/gps.cfg:vendor/etc/gnss/gps.cfg - PRODUCT_VENDOR_PROPERTIES += \ - vendor.gps.aol.enabled=true -else - PRODUCT_COPY_FILES += \ - device/google/akita/location/gnssd/release/gps_user.cfg:vendor/etc/gnss/gps.cfg -endif diff --git a/location/gnssd/init.gnss.rc b/location/gnssd/init.gnss.rc deleted file mode 100644 index accee2f..0000000 --- a/location/gnssd/init.gnss.rc +++ /dev/null @@ -1,36 +0,0 @@ -on post-fs-data - mkdir /data/vendor/gps 0771 system system - mkdir /data/vendor/gps/logs 0771 gps system - mkdir /data/vendor/gps/overlay 0777 gps system - -# Directory for GPS - rm /data/system/gps/gps_started - rm /data/system/gps/glonass_started - rm /data/system/gps/beidou_started - rm /data/system/gps/smd_started - rm /data/system/gps/sv_cno.info - -# Permissions for gnss - chmod 0660 /dev/gnss_ipc - chown system system /dev/gnss_ipc - chmod 0660 /dev/gnss_dump - chown system system /dev/gnss_dump - chmod 0660 /dev/gnss_boot - chown system system /dev/gnss_boot - chmod 0660 /sys/devices/platform/gnssif/coredump - chown system system /sys/devices/platform/gnssif/coredump - -# GPS daemon -service gnssd /vendor/bin/hw/gnssd - class main - user gps - group system inet net_raw wakelock sdcard_rw - capabilities BLOCK_SUSPEND - ioprio be 0 - seclabel u:r:gnssd:s0 - -service slsi_gnss_service /vendor/bin/hw/android.hardware.gnss-service - class main - user system - group system gps - diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service deleted file mode 100644 index 35eed54..0000000 Binary files a/location/gnssd/release/android.hardware.gnss-service and /dev/null differ diff --git a/location/gnssd/release/android.hardware.location.gps.xml b/location/gnssd/release/android.hardware.location.gps.xml deleted file mode 100644 index 3abccf3..0000000 --- a/location/gnssd/release/android.hardware.location.gps.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/location/gnssd/release/build.properties b/location/gnssd/release/build.properties deleted file mode 100644 index d9e713e..0000000 --- a/location/gnssd/release/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -BUILD_TIMESTAMP_UTC=2024-12-02 20:55:44.202302 -USER_COMMIT=b6b33124ee635ea551601e3d5fb9bd0958c2bb21 -BASE_COMMIT=f40f31115750f412c4860692772ef6b0b4141105 -GNSS_SW_VER_BRANCH=R4.13 -GNSS_SW_VER_STRING=4.13.2_28_Release_248164 -WORD_SIZE=arm64 -ANDROID_VERSION=34 diff --git a/location/gnssd/release/gnssd b/location/gnssd/release/gnssd deleted file mode 100644 index 1c88321..0000000 Binary files a/location/gnssd/release/gnssd and /dev/null differ diff --git a/location/gnssd/release/kepler.bin b/location/gnssd/release/kepler.bin deleted file mode 100644 index 77f7ab4..0000000 Binary files a/location/gnssd/release/kepler.bin and /dev/null differ diff --git a/location/gnssd/release/gps.cfg b/location/gps.cfg similarity index 76% rename from location/gnssd/release/gps.cfg rename to location/gps.cfg index 2a3bbcf..b2d3328 100644 --- a/location/gnssd/release/gps.cfg +++ b/location/gps.cfg @@ -1,6 +1,6 @@ ############################################ GlueLayer_ToolConfigSelection=3 -debug_console=1 +debug_console=0 debug_enable=4 mem_dump_to_node=1 force_instant_logging=0 @@ -10,11 +10,11 @@ debug_dir=/data/vendor/gps/logs ############################################ GlueLayer_IsGedKeyExist=1 GlueLayer_EnableGnssCfgInterface=1 +GlueLayer_IsUseCustomGnssLib=1 - -uni_log_max_file_count=5 +uni_log_max_file_count=15 uni_log_max_size_mb=20 -uni_log_total_max_size_mb=100 +uni_log_total_max_size_mb=300 # to enable ism stream for GAAM ism_stream_enable=1 @@ -24,12 +24,28 @@ gnss_device_type=K041 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +# 1pps timemark output: 0: disable 1: enable +ChipCfg_Timemark_Option=0 + +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + # send debug req on MCW oddity #Chip_Configuration_Io_Options=0x85 # Disable dynamic HSI Chip_Configuration_Dynamic_HSI=0 +# Set UBSAN to operate on logging mode on FW +# 0: disable 1: crash mode 2: logging mode +Chip_Configuration_ubsan_opt=2 + +# MCW Link failure behavior: 0 = SW Assert (default), 1 = GNSS restart (hot start) +Chip_Configuration_FeatureCfg_SDL_BYASS=1 + +# 4 - Crash CP when GNSS asserted for CPMB timeout (for CP log collection) +Chip_Configuration_cpdbgsync=4 + # borrow this field to force CP crash on GAL bad ISM #Chip_Configuration_WT1=1 @@ -48,6 +64,15 @@ gnss_device_data_port_chpp_present=1 GlueLayer_YearOfHW=2023 scheduling_enabled=1 +# 0x01 = Precise time aiding +# 0x02 = Coarse time aiding * +# 0x04 = Local time aiding * +# 0x08 = CP time aiding +# 0x10 = Frequency counter aiding +# 0x20 = Frequency non-counter aiding +# 0x40 = CP Frequency aiding * +# 0x80 = Extend BE collection * +# 0xFFFF0000 Frequency aiding PPM mask (example - 0x00020000 is .2PPM) ### temporarily disable precise time aiding ### Chip_Configuration_AidingConfiguration=0x00020046 @@ -100,11 +125,15 @@ Chip_Configuration_WatchdogPeriod = 0 Chip_Configuration_GNSSConstConstraintDef=0x602F Chip_Configuration_RfMiscCtrl=0x80008001 -# Disable BDS in the U.S. -bdsUsedInUSPolicy=2 -sbasUsedInUSPolicy=2 -qzssUsedInUSPolicy=2 -navicUsedInUSPolicy=2 +# Certain constellation permission overriding LocTech config setting: only to possibly +# disallow constellations allowed in LocTech, not vice versa. Note: GPS and GAL are +# allowed in all markets so no such overriding. +# 0: not to override (default), 1-disabled, 2- disabled if in US +#gloUsedPolicy=2 +bdsUsedPolicy=2 +sbasUsedPolicy=2 +qzssUsedPolicy=2 +navicUsedPolicy=2 # DVS: 0 = Disabled (default), 1 = Enabled # DFS: 0 = Disabled (default), 1 = Enabled @@ -144,6 +173,9 @@ rtc_min_num_of_fixes=10 # increase rtc uncertainty from Host to hedge against bad fixes additional_rtc_uncertainty_ms=10 +# debug output time interval for LAL metrics logging (0 means disable) +lal_metrics_interval_ms=0 + # set to 1 for FW SGEE download - Requires Android FW to be properly configured Sif_UseFwXtraInterface=1 @@ -151,10 +183,29 @@ Sif_UseFwXtraInterface=1 # ACT C/No loss limit: 0dB to 15dB (0 = ACT is disabled by default) 3dB = 50% Duty Cycle, 6dB = 25% Duty Cycle, 9dB = 12.5% Duty Cycle Chip_Configuration_FeatureCfg_ACT = 5 +# GNSS power value +SingleBandAcq=379 +MultiBandAcq=5 +SingleBandFullTrkNm=341 +SingleBandFullTrkUd=306 +MultiBandFullTrkNm=5 +MultiBandFullTrkUd=5 +SingleBandDutyCycleTrkNm=313 +SingleBandDutyCycleTrkUd=271 +MultiBandDutyCycleTrkNm=5 +MultiBandDutyCycleTrkUd=5 +SingleBandVddGnssNmTrk=73 +MultiBandVddGnssNmTrk=5 +SingleBandVddGnssUdTrk=36 +MultiBandVddGnssUdTrk=5 + ChipCfg_DspMemdumpEnable=1 -Agnss_IsGloAidingEnable=0 +Agnss_IsGloAidingEnable=1 +Agnss_IsGalAidingEnable=1 +Agnss_IsBdsAidingEnable=1 Agnss_SuplUseCpNi=1 +Agnss_SuplAidIntvlCrossSess=1 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 SETCaps_SuplUT1=20 @@ -166,6 +217,12 @@ GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsRilCIDReqEnable=0 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 + +# 0x0001: CHIP_CONFIG_MEMS_ACCEL_AVAILABLE +# 0x0002: CHIP_CONFIG_MEMS_MAGN_AVAILABLE +# 0x0004: CHIP_CONFIG_MEMS_GYRO_AVAILABLE +# 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE +# 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE Chip_Configuration_mems_data_Configuration=5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 @@ -216,6 +273,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 @@ -265,4 +323,8 @@ GNSS_CARRIER_ID=8 GNSS_CARRIER_ID=9 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 +# TELUS +GNSS_CARRIER_ID=10 +ENABLE_5G_CP_CAPS_MSA=0 +ENABLE_5G_CP_CAPS_MSB=0 GNSS_CARRIER_CONFIG_END diff --git a/location/gnssd/release/gps_user.cfg b/location/gps_user.cfg similarity index 81% rename from location/gnssd/release/gps_user.cfg rename to location/gps_user.cfg index 7366ef2..383e418 100644 --- a/location/gnssd/release/gps_user.cfg +++ b/location/gps_user.cfg @@ -1,15 +1,20 @@ GlueLayer_ToolConfigSelection=3 debug_console=0 debug_enable=0 -mem_dump_to_node=1 +mem_dump_to_node=0 GlueLayer_IsGedKeyExist=1 GlueLayer_EnableGnssCfgInterface=1 +GlueLayer_IsUseCustomGnssLib=1 ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK gnss_device_type=K041 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +ChipCfg_Timemark_Option=0 +Is1PPSTimeSyncEnable=0 Chip_Configuration_Dynamic_HSI=0 +Chip_Configuration_ubsan_opt=2 +Chip_Configuration_FeatureCfg_SDL_BYASS=1 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 chpp_log_level=0 @@ -28,10 +33,10 @@ spam_dog_ms=0 Chip_Configuration_WatchdogPeriod = 0 Chip_Configuration_GNSSConstConstraintDef=0x602F Chip_Configuration_RfMiscCtrl=0x80008001 -bdsUsedInUSPolicy=2 -sbasUsedInUSPolicy=2 -qzssUsedInUSPolicy=2 -navicUsedInUSPolicy=2 +bdsUsedPolicy=2 +sbasUsedPolicy=2 +qzssUsedPolicy=2 +navicUsedPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 Chip_Configuration_FeatureCfg_MTPL = 0 @@ -40,11 +45,29 @@ gnss_rfic_chip_id=55200001 UseRtcForAiding=1 rtc_min_num_of_fixes=10 additional_rtc_uncertainty_ms=10 +lal_metrics_interval_ms=0 Sif_UseFwXtraInterface=1 Chip_Configuration_FeatureCfg_ACT = 5 +SingleBandAcq=379 +MultiBandAcq=5 +SingleBandFullTrkNm=341 +SingleBandFullTrkUd=306 +MultiBandFullTrkNm=5 +MultiBandFullTrkUd=5 +SingleBandDutyCycleTrkNm=313 +SingleBandDutyCycleTrkUd=271 +MultiBandDutyCycleTrkNm=5 +MultiBandDutyCycleTrkUd=5 +SingleBandVddGnssNmTrk=73 +MultiBandVddGnssNmTrk=5 +SingleBandVddGnssUdTrk=36 +MultiBandVddGnssUdTrk=5 ChipCfg_DspMemdumpEnable=1 -Agnss_IsGloAidingEnable=0 +Agnss_IsGloAidingEnable=1 +Agnss_IsGalAidingEnable=1 +Agnss_IsBdsAidingEnable=1 Agnss_SuplUseCpNi=1 +Agnss_SuplAidIntvlCrossSess=1 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 SETCaps_SuplUT1=20 @@ -98,6 +121,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 @@ -138,4 +162,7 @@ GNSS_CARRIER_ID=8 GNSS_CARRIER_ID=9 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 +GNSS_CARRIER_ID=10 +ENABLE_5G_CP_CAPS_MSA=0 +ENABLE_5G_CP_CAPS_MSB=0 GNSS_CARRIER_CONFIG_END diff --git a/manifest.xml b/manifest.xml deleted file mode 100644 index cf97ba9..0000000 --- a/manifest.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - android.hardware.audio - hwbinder - 7.1 - - IDevicesFactory - default - - - - android.hardware.audio.effect - hwbinder - 7.0 - - IEffectsFactory - default - - - - android.hardware.soundtrigger - hwbinder - 2.3 - - ISoundTriggerHw - default - - - - android.hardware.media.omx - hwbinder - 1.0 - - IOmx - default - - - IOmxStore - default - - - - android.hardware.graphics.allocator - hwbinder - 4.0 - - IAllocator - default - - - - android.hardware.graphics.composer - hwbinder - 2.4 - - IComposer - default - - - - android.hardware.renderscript - passthrough - 1.0 - - IDevice - default - - - - android.hardware.dumpstate - hwbinder - 1.1 - - IDumpstateDevice - default - - - - android.hardware.bluetooth.audio - hwbinder - 2.1 - - IBluetoothAudioProvidersFactory - default - - - - android.hardware.boot - hwbinder - @1.2::IBootControl/default - - - android.hardware.neuralnetworks - hwbinder - @1.3::IDevice/google-edgetpu - - - android.hardware.health - hwbinder - 2.1 - - IHealth - default - - - - vendor.google.whitechapel.audio.audioext - hwbinder - 3.0 - - IAudioExt - default - - - - diff --git a/powerhint-akita.json b/powerhint-akita.json index 814dac9..c925fc3 100644 --- a/powerhint-akita.json +++ b/powerhint-akita.json @@ -111,7 +111,17 @@ "2000", "500" ], - "DefaultIndex": 0, + "DefaultIndex": 2, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterResponseTimeMs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/response_time_ms", + "Values": [ + "9", + "13" + ], + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -151,7 +161,17 @@ "2000", "500" ], - "DefaultIndex": 0, + "DefaultIndex": 3, + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterResponseTimeMs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/response_time_ms", + "Values": [ + "52", + "56" + ], + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -191,7 +211,17 @@ "2000", "500" ], - "DefaultIndex": 0, + "DefaultIndex": 3, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterResponseTimeMs", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/response_time_ms", + "Values": [ + "178", + "180" + ], + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -274,6 +304,70 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "AutoMigrationMarginsEnable", + "Path": "/proc/vendor_sched/auto_migration_margins_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, + { + "Name": "AutoDvfsHeadroomEnable", + "Path": "/proc/vendor_sched/auto_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, + { + "Name": "TARampupMultiplier", + "Path": "/proc/vendor_sched/groups/ta/rampup_multiplier", + "Values": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, + { + "Name": "AdpfRampupMultiplier", + "Path": "/proc/vendor_sched/adpf_rampup_multiplier", + "Values": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" + ], + "DefaultIndex": 4, + "ResetOnInit": true + }, + { + "Name": "PerTaskMaxIowaitBoost", + "Path": "/proc/vendor_sched/per_task_iowait_boost_max_value", + "Values": [ + "0", + "512" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, { "Name": "CPUUClampMaxFilterEnable", "Path": "/proc/vendor_sched/uclamp_max_filter_enable", @@ -900,6 +994,26 @@ "20 40" ], "ResetOnInit": true + }, + { + "Name": "AAModeProperty", + "Path": "vendor.powerhal.mode.aa", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true, + "Type": "Property" + }, + { + "Name": "SYSTEM_UI_ADPF_PROFILES", + "Path": ":SYSTEM_UI", + "Values": [ + "SYSTEM_UI_PROFILE" + ], + "DefaultIndex": 0, + "ResetOnInit": true, + "Type": "Event" } ], "Actions": [ @@ -1117,6 +1231,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TARampupMultiplier", + "Duration": 5000, + "Value": "4" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUSkipMask", @@ -1220,6 +1340,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "TARampupMultiplier", + "Duration": 2000, + "Value": "4" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -1385,6 +1511,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPUSkipMask", @@ -1805,6 +1937,42 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPUDVFSHeadroom", @@ -1973,6 +2141,42 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", @@ -2165,6 +2369,42 @@ "Duration": 0, "Value": "cam1" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUUtilThreshold", @@ -2255,6 +2495,42 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUDVFSHeadroom", @@ -2465,6 +2741,24 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUDVFSHeadroom", @@ -2731,6 +3025,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "AUTOMOTIVE_PROJECTION", + "Node": "AAModeProperty", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -2742,6 +3042,48 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "MaskHint", + "Value":"DISPLAY_UPDATE_IMMINENT", + "EnableProperty": "vendor.powerhal.mode.aa" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "MaskHint", + "Value":"CPU_LOAD_RESET", + "EnableProperty": "vendor.powerhal.mode.aa" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "TARampupMultiplier", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "AdpfRampupMultiplier", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "CPULittleClusterResponseTimeMs", + "Duration": 0, + "Value": "13" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "CPUMidClusterResponseTimeMs", + "Duration": 0, + "Value": "56" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "CPUBigClusterResponseTimeMs", + "Duration": 0, + "Value": "180" + }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", "Node": "CPULittleClusterDownRateLimitUs", @@ -2844,6 +3186,54 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "GAME", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "TARampupMultiplier", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "AdpfRampupMultiplier", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterResponseTimeMs", + "Duration": 0, + "Value": "9" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterResponseTimeMs", + "Duration": 0, + "Value": "52" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterResponseTimeMs", + "Duration": 0, + "Value": "178" + }, + { + "PowerHint": "GAME", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", @@ -3030,6 +3420,42 @@ "Duration": 2000, "Value": "44" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "PowerHALCameraRunning", @@ -3184,14 +3610,14 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 231, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "GpuBoost": true, @@ -3220,14 +3646,14 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 231, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "GpuBoost": true, @@ -3256,14 +3682,14 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 231, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "GpuBoost": true, @@ -3280,79 +3706,42 @@ "MaxRecordsNum": 300 }, { - "Name": "UiHighBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, + "Name": "SYSTEM_UI_PROFILE", + "PID_On": true, + "PID_Po": 2.0, + "PID_Pu": 0.5, + "PID_I": 0.0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500.0, + "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 196, - "UclampMin_Low": 196, - "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0, - "GpuBooost" : false - }, - { - "Name": "UiLowBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 730, + "UclampMin_LoadReset": 730, + "UclampMin_High": 480, + "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, - "SamplingWindow_I": 1, + "SamplingWindow_I": 0, "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 52, - "UclampMin_Low": 52, - "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, + "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0, - "GpuBooost" : false - }, - { - "Name": "UiLowNoneBoost", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 0, - "UclampMin_Low": 0, - "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0, - "GpuBooost" : false + "StaleTimeFactor": 15.0, + "GpuBoost": true, + "GpuCapacityBoostMax": 25000, + "HeuristicBoost_On": true, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.3, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 } ] } diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index 1035c0f..b6188f3 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -31,6 +31,7 @@ WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true +WIFI_BRCM_OPEN_SOURCE_MULTI_AKM := enabled PRODUCT_COPY_FILES += \ device/google/akita/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \