diff --git a/akita/BoardConfig.mk b/akita/BoardConfig.mk
index 90f1034..ced9ead 100644
--- a/akita/BoardConfig.mk
+++ b/akita/BoardConfig.mk
@@ -39,6 +39,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on
include device/google/zuma/BoardConfig-common.mk
-include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-include vendor/google_devices/akita/proprietary/BoardConfigVendor.mk
include device/google/akita-sepolicy/akita-sepolicy.mk
include device/google/akita/wifi/BoardConfig-wifi.mk
diff --git a/akita/overlay_packages/SettingsAkitaOverlay/res/drawable/regulatory_info_g6gpr_in.png b/akita/overlay_packages/SettingsAkitaOverlay/res/drawable/regulatory_info_g6gpr_in.png
new file mode 100644
index 0000000..0367efa
Binary files /dev/null and b/akita/overlay_packages/SettingsAkitaOverlay/res/drawable/regulatory_info_g6gpr_in.png differ
diff --git a/audio/akita/aidl_config/Android.bp b/audio/akita/aidl_config/Android.bp
new file mode 100644
index 0000000..630183f
--- /dev/null
+++ b/audio/akita/aidl_config/Android.bp
@@ -0,0 +1,63 @@
+// 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 {
+ imports: [
+ "frameworks/av/services/audiopolicy/config",
+ ],
+}
+
+package {
+ default_applicable_licenses: [
+ "Android-Apache-2.0",
+ ],
+}
+
+prebuilt_etc {
+ name: "audio_policy_volumes.xml",
+ src: "audio_policy_volumes.xml",
+ soc_specific: true,
+}
+
+prebuilt_etc {
+ name: "imported_default_volume_tables.xml",
+ src: "//frameworks/av/services/audiopolicy/config:default_volume_tables.xml",
+ soc_specific: true,
+ filename_from_src: true,
+}
+
+prebuilt_etc {
+ name: "audio_platform_configuration.xml",
+ src: "audio_platform_configuration.xml",
+ soc_specific: true,
+ required: [
+ "audio_policy_volumes.xml",
+ "imported_default_volume_tables.xml",
+ ],
+}
+
+prebuilt_etc {
+ name: "mixer_paths_aidl.xml",
+ src: "mixer_paths_aidl.xml",
+ soc_specific: true,
+}
+
+phony {
+ name: "audio_aidl_configs",
+ soc_specific: true,
+ required: [
+ "audio_platform_configuration.xml",
+ "mixer_paths_aidl.xml",
+ ],
+}
diff --git a/audio/akita/aidl_config/audio_platform_configuration.xml b/audio/akita/aidl_config/audio_platform_configuration.xml
new file mode 100644
index 0000000..f864b87
--- /dev/null
+++ b/audio/akita/aidl_config/audio_platform_configuration.xml
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.01
+ 0.02
+ 0.04
+ 0.10
+ 0.21
+ 0.47
+ 1.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MIC
+ CAMCORDER
+
+
+ MIC
+ CAMCORDER
+
+
+
+
+
+
diff --git a/audio/akita/aidl_config/audio_policy_volumes.xml b/audio/akita/aidl_config/audio_policy_volumes.xml
new file mode 100644
index 0000000..8a138a0
--- /dev/null
+++ b/audio/akita/aidl_config/audio_policy_volumes.xml
@@ -0,0 +1,265 @@
+
+
+
+
+
+
+ 0,-4200
+ 33,-2800
+ 66,-1400
+ 100,0
+
+
+ 0,-2400
+ 33,-1600
+ 66,-800
+ 100,0
+
+
+ 0,-2400
+ 33,-1600
+ 66,-800
+ 100,0
+
+
+
+
+ 1,-3000
+ 33,-2600
+ 66,-2200
+ 100,-1800
+
+
+ 1,-5200
+ 13,-5000
+ 28,-4400
+ 56,-3380
+ 71,-3120
+ 85,-2750
+ 100,-2150
+
+
+
+
+
+
+ 1,-4935
+ 14,-3320
+ 28,-2960
+ 71,-1400
+ 100,0
+
+
+
+
+
+
+ 1,-6920
+ 4,-6920
+ 8,-6664
+ 12,-6374
+ 16,-6082
+ 20,-5759
+ 24,-5410
+ 28,-5038
+ 32,-4807
+ 36,-4577
+ 40,-4339
+ 44,-4132
+ 48,-3860
+ 52,-3569
+ 56,-3223
+ 60,-2823
+ 64,-2452
+ 68,-2078
+ 72,-1795
+ 76,-1561
+ 80,-1226
+ 84,-956
+ 88,-789
+ 92,-635
+ 96,-505
+ 100,0
+
+
+
+
+
+
+ 0,-5600
+ 14,-4670
+ 28,-3060
+ 71,-1050
+ 100,-100
+
+
+
+
+
+
+ 1,-6350
+ 14,-4300
+ 28,-3710
+ 66,-2100
+ 85,-1550
+ 100,-780
+
+
+
+
+
+ 0,-4200
+ 33,-2800
+ 66,-1400
+ 100,0
+
+
+ 0,-2400
+ 33,-1600
+ 66,-800
+ 100,0
+
+
+ 0,-4200
+ 33,-2800
+ 66,-1400
+ 100,0
+
+
+
+
+ 1,-3000
+ 33,-2600
+ 66,-2200
+ 100,-1800
+
+
+ 1,-5200
+ 13,-5000
+ 28,-4400
+ 56,-3380
+ 71,-3120
+ 85,-2750
+ 100,-2150
+
+
+
+
+
+ 1,-3000
+ 33,-2600
+ 66,-2200
+ 100,-1800
+
+
+ 1,-6600
+ 13,-6220
+ 28,-5500
+ 42,-4600
+ 57,-4250
+ 100,-2780
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/akita/aidl_config/mixer_paths_aidl.xml b/audio/akita/aidl_config/mixer_paths_aidl.xml
new file mode 100644
index 0000000..59cad52
--- /dev/null
+++ b/audio/akita/aidl_config/mixer_paths_aidl.xml
@@ -0,0 +1,1508 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/akita/audio-tables.mk b/audio/akita/audio-tables.mk
index 65242e8..e18e4aa 100644
--- a/audio/akita/audio-tables.mk
+++ b/audio/akita/audio-tables.mk
@@ -16,6 +16,11 @@
AUDIO_TABLE_FOLDER := akita
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+PRODUCT_SOONG_NAMESPACES += device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
+PRODUCT_PACKAGES += audio_aidl_configs
+
+else
# Platform Configuration for AudioHAL / SoundTriggerHAL
PRODUCT_COPY_FILES += \
device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \
@@ -27,6 +32,8 @@ PRODUCT_COPY_FILES += \
device/google/akita/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
+endif
+
# AudioEffectHAL Configuration
PRODUCT_COPY_FILES += \
device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
@@ -76,3 +83,13 @@ PRODUCT_COPY_FILES += \
device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
endif
+
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+# Offload spatializer config
+PRODUCT_COPY_FILES += \
+ device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \
+ device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \
+ device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \
+ device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \
+
+endif
diff --git a/audio/akita/config/audio_platform_configuration.xml b/audio/akita/config/audio_platform_configuration.xml
index ceebcf3..7d469a6 100644
--- a/audio/akita/config/audio_platform_configuration.xml
+++ b/audio/akita/config/audio_platform_configuration.xml
@@ -173,14 +173,14 @@
-
-
+
+
-
-
+
+
diff --git a/audio/akita/tuning/spatializer/base b/audio/akita/tuning/spatializer/base
new file mode 100644
index 0000000..38cc646
Binary files /dev/null and b/audio/akita/tuning/spatializer/base differ
diff --git a/audio/akita/tuning/spatializer/mode_2_ch b/audio/akita/tuning/spatializer/mode_2_ch
new file mode 100644
index 0000000..470c56c
Binary files /dev/null and b/audio/akita/tuning/spatializer/mode_2_ch differ
diff --git a/audio/akita/tuning/spatializer/mode_6_ch b/audio/akita/tuning/spatializer/mode_6_ch
new file mode 100644
index 0000000..94ec635
Binary files /dev/null and b/audio/akita/tuning/spatializer/mode_6_ch differ
diff --git a/audio/akita/tuning/spatializer/mode_xaural b/audio/akita/tuning/spatializer/mode_xaural
new file mode 100644
index 0000000..b3a3a96
Binary files /dev/null and b/audio/akita/tuning/spatializer/mode_xaural differ
diff --git a/device-akita.mk b/device-akita.mk
index 1cad8ae..ecdee39 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -14,20 +14,12 @@
# limitations under the License.
#
-PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_devices/release/phones/pixel_2024_midyear/release_config_map.textproto)
+PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_devices/release/phones/./pixel_2024_midyear/release_config_map.textproto)
-ifdef RELEASE_KERNEL_AKITA_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_AKITA_VERSION)
-endif
-
-ifdef RELEASE_KERNEL_AKITA_DIR
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_AKITA_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_AKITA_DIR)/kernel-headers
-else
-TARGET_KERNEL_DIR ?= device/google/akita-kernels/5.15/trunk
-TARGET_BOARD_KERNEL_HEADERS ?= device/google/akita-kernels/5.15/trunk/kernel-headers
-endif
ifneq ($(TARGET_BOOTS_16K),true)
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION)
@@ -42,11 +34,14 @@ $(call inherit-product-if-exists, vendor/google_devices/akita/proprietary/Wallpa
DEVICE_PACKAGE_OVERLAYS += device/google/akita/akita/overlay
+ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true)
+USE_AUDIO_HAL_AIDL := true
+endif
+
include device/google/akita/audio/akita/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
-include device/google/gs-common/touch/gti/gti.mk
+include device/google/gs-common/touch/gti/predump_gti.mk
include device/google/gs-common/modem/radio_ext/radio_ext.mk
# go/lyric-soong-variables
@@ -268,6 +263,12 @@ endif
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.server.automatic_turn_on=true
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+# AIDL
+
+else
+# HIDL
+
# Spatial Audio
PRODUCT_PACKAGES += \
libspatialaudio \
@@ -278,6 +279,8 @@ PRODUCT_PACKAGES += \
android.hardware.audio.sounddose-vendor-impl \
audio_sounddose_aoc \
+endif
+
# Audio CCA property
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.cca.enabled=false
@@ -362,13 +365,6 @@ PRODUCT_VENDOR_PROPERTIES += \
PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.udfps.auto_exposure_compensation_supported=true
-# Fingerprint Auth Filter
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_VENDOR_PROPERTIES += \
- persist.vendor.udfps.auth_filter.log_all_coverages=true \
- persist.vendor.udfps.auth_filter.data_collection_enabled=false
-endif
-
# OIS with system imu
PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.ois_with_system_imu=true
@@ -445,5 +441,6 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
# Bluetooth device id
+# Akita: 0x410F
PRODUCT_PRODUCT_PROPERTIES += \
- bluetooth.device_id.product_id=20495
+ bluetooth.device_id.product_id=16655
diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index ab02581..e408e17 100644
Binary files a/location/gnssd/release/android.hardware.gnss-service and b/location/gnssd/release/android.hardware.gnss-service differ
diff --git a/location/gnssd/release/gnssd b/location/gnssd/release/gnssd
index 9794e30..e1da79b 100644
Binary files a/location/gnssd/release/gnssd and b/location/gnssd/release/gnssd differ
diff --git a/location/gnssd/release/kepler.bin b/location/gnssd/release/kepler.bin
index c61f8f8..1e94029 100644
Binary files a/location/gnssd/release/kepler.bin and b/location/gnssd/release/kepler.bin differ
diff --git a/manifest.xml b/manifest.xml
index 9f8994b..cf97ba9 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -48,15 +48,6 @@
default
-
- android.hardware.graphics.mapper
- passthrough
- 4.0
-
- IMapper
- default
-
-
android.hardware.graphics.composer
hwbinder
diff --git a/powerhint-akita.json b/powerhint-akita.json
index 442f06b..0f0ac7b 100644
--- a/powerhint-akita.json
+++ b/powerhint-akita.json
@@ -219,7 +219,6 @@
"0",
"1"
],
- "DefaultIndex": 0,
"ResetOnInit": true
},
{
@@ -285,6 +284,15 @@
"DefaultIndex": 0,
"ResetOnInit": true
},
+ {
+ "Name": "CPUSkipMask",
+ "Path": "/proc/vendor_sched/cpu_skip_mask",
+ "Values": [
+ "0x0",
+ "0x100"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "BGUClampMaxBoost",
"Path": "/proc/vendor_sched/groups/bg/uclamp_max",
@@ -309,7 +317,7 @@
"Name": "CAMUClampBoost",
"Path": "/proc/vendor_sched/groups/cam/uclamp_min",
"Values": [
- "765",
+ "720",
"250",
"0"
],
@@ -430,7 +438,6 @@
"1",
"0"
],
- "DefaultIndex": 0,
"ResetOnInit": true
},
{
@@ -460,6 +467,15 @@
],
"ResetOnInit": true
},
+ {
+ "Name": "SysGroupCfsSkipMask",
+ "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
+ "Values": [
+ "0x0",
+ "0x100"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -467,7 +483,6 @@
"1",
"0"
],
- "DefaultIndex": 0,
"ResetOnInit": true
},
{
@@ -858,6 +873,12 @@
"Duration": 1000,
"Value": "0-3"
},
+ {
+ "PowerHint": "LAUNCH",
+ "Node": "CPUSkipMask",
+ "Duration": 5000,
+ "Value": "0x0"
+ },
{
"PowerHint": "LAUNCH",
"Node": "ReducePreferIdle",
@@ -999,6 +1020,12 @@
"Duration": 5000,
"Value": "1"
},
+ {
+ "PowerHint": "LAUNCH_EXTEND",
+ "Node": "CPUSkipMask",
+ "Duration": 2000,
+ "Value": "0x0"
+ },
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUBigClusterMaxFreq",
@@ -1260,6 +1287,12 @@
"Duration": 0,
"Value": "0"
},
+ {
+ "PowerHint": "CAMERA_LAUNCH",
+ "Node": "CPUSkipMask",
+ "Duration": 1000,
+ "Value": "0x0"
+ },
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "CPU_BIG_TSKIN_BYPASS",
@@ -1324,7 +1357,7 @@
"PowerHint": "CAMERA_LAUNCH",
"Node": "CAMUClampBoost",
"Duration": 1000,
- "Value": "765"
+ "Value": "720"
},
{
"PowerHint": "CAMERA_LAUNCH",
@@ -1438,7 +1471,7 @@
"PowerHint": "CAMERA_SHOT",
"Node": "CAMUClampBoost",
"Duration": 100,
- "Value": "765"
+ "Value": "720"
},
{
"PowerHint": "CAMERA_BACKEND_BOOST",
@@ -1734,6 +1767,12 @@
"Duration": 0,
"Value": "camera"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_EXTREME",
+ "Node": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x0"
+ },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning",
@@ -1896,6 +1935,12 @@
"Duration": 0,
"Value": "camera"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x0"
+ },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "AutoPreferIdle",
@@ -2046,6 +2091,12 @@
"Duration": 0,
"Value": "camera"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x0"
+ },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "AutoPreferIdle",
@@ -2136,6 +2187,12 @@
"Duration": 0,
"Value": "4-8"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x0"
+ },
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "PowerHALCameraRunning",
@@ -2280,6 +2337,12 @@
"Duration": 0,
"Value": "30"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x0"
+ },
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
@@ -2935,6 +2998,12 @@
"Duration": 0,
"Value": "0-8"
},
+ {
+ "PowerHint": "CAMERA_PROJECT11",
+ "Node": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x0"
+ },
{
"PowerHint": "CAMERA_PROJECT11",
"Node": "MIFTargetLoad",
diff --git a/thermal_info_config_akita.json b/thermal_info_config_akita.json
index 7f8d79b..66b2901 100644
--- a/thermal_info_config_akita.json
+++ b/thermal_info_config_akita.json
@@ -8,20 +8,17 @@
{
"Name":"modem_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"gnss_tcxo_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"usb_conn_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 36.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
- "TempPath":"/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -29,7 +26,6 @@
{
"Name":"rffe_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/rffe_therm/tz_temp",
"Multiplier":0.001
},
{
@@ -37,7 +33,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 36.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
- "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -47,7 +42,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 36.5, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
- "TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -55,13 +49,11 @@
{
"Name":"display_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/display_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001
},
{
diff --git a/thermal_info_config_charge_akita.json b/thermal_info_config_charge_akita.json
index dc6b51e..6c4a296 100644
--- a/thermal_info_config_charge_akita.json
+++ b/thermal_info_config_charge_akita.json
@@ -8,20 +8,17 @@
{
"Name":"modem_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"gnss_tcxo_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"usb_conn_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 46.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
- "TempPath":"/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -29,13 +26,11 @@
{
"Name":"rffe_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/rffe_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"soc_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
"Multiplier":0.001
},
{
@@ -43,7 +38,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 36.5, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
- "TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -51,13 +45,11 @@
{
"Name":"display_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/display_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001
},
{
diff --git a/thermal_info_config_charge_proto.json b/thermal_info_config_charge_proto.json
index 1e68fff..eeefb8a 100644
--- a/thermal_info_config_charge_proto.json
+++ b/thermal_info_config_charge_proto.json
@@ -8,20 +8,17 @@
{
"Name":"modem_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"gnss_tcxo_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"usb_conn_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
- "TempPath":"/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -29,7 +26,6 @@
{
"Name":"rffe_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/rffe_therm/tz_temp",
"Multiplier":0.001
},
{
@@ -37,7 +33,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 29.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
- "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -45,19 +40,16 @@
{
"Name":"charger_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"display_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/display_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001
},
{
diff --git a/thermal_info_config_proto.json b/thermal_info_config_proto.json
index ed38a76..24734af 100644
--- a/thermal_info_config_proto.json
+++ b/thermal_info_config_proto.json
@@ -8,20 +8,17 @@
{
"Name":"modem_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"gnss_tcxo_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"usb_conn_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
- "TempPath":"/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -29,7 +26,6 @@
{
"Name":"rffe_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/rffe_therm/tz_temp",
"Multiplier":0.001
},
{
@@ -37,7 +33,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 27.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
- "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -45,19 +40,16 @@
{
"Name":"charger_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"display_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/display_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001
},
{