diff --git a/audio/akita/config/audio_platform_configuration.xml b/audio/akita/config/audio_platform_configuration.xml
index e4de84f..ceebcf3 100644
--- a/audio/akita/config/audio_platform_configuration.xml
+++ b/audio/akita/config/audio_platform_configuration.xml
@@ -303,7 +303,7 @@
-
+
diff --git a/device-akita.mk b/device-akita.mk
index 6575441..6ec8206 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -14,8 +14,7 @@
# limitations under the License.
#
-PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_devices/release/phones/pixel_2024/release_config_map.mk)
-
+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)
@@ -383,7 +382,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=10
+ ro.vendor.build.svn=15
# Keyboard height ratio and bottom padding in dp for portrait mode
PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/location/gnssd/gnss_release.mk b/location/gnssd/gnss_release.mk
index 443e2c7..452d7d9 100644
--- a/location/gnssd/gnss_release.mk
+++ b/location/gnssd/gnss_release.mk
@@ -1,5 +1,5 @@
# Enable pixel gnss hal service
-include vendor/google/gnss/aidl_service/pixel_gnss_hal.mk
+-include vendor/google/gnss/aidl_service/pixel_gnss_hal.mk
PRODUCT_PACKAGES += \
gnssd \
diff --git a/thermal_info_config_akita.json b/thermal_info_config_akita.json
index 71f21ad..fc255eb 100644
--- a/thermal_info_config_akita.json
+++ b/thermal_info_config_akita.json
@@ -207,10 +207,6 @@
"PollingDelay":300000,
"PassiveDelay":7000,
"BindedCdevInfo": [
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
- },
{
"CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 99, 99]
@@ -480,7 +476,7 @@
]
},
{
- "Name":"VIRTUAL-SKIN-CPU-GPU",
+ "Name":"VIRTUAL-SKIN-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
@@ -500,7 +496,7 @@
"K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
- "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
+ "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"]
},
@@ -540,6 +536,15 @@
"BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 9, 9, 9, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+ },
+ {
+ "CdevRequest": "tpu_cooling",
+ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+ "MaxReleaseStep": 1,
+ "MaxThrottleStep": 1,
+ "BindedPowerRail": "S7M_VDD_TPU",
+ "CdevCeiling": [0, 7, 7, 7, 7, 7, 7],
+ "LimitInfo": [0, 0, 0, 0, 0, 7, 7]
}
]
},
@@ -879,6 +884,11 @@
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
+ {
+ "Name":"S7M_VDD_TPU",
+ "PowerSampleDelay":7000,
+ "PowerSampleCount":1
+ },
{
"Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true,