Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: I89c74b4e4dc5c774d02016255f285b9141552c6e
Change-Id: Iacf13924e8e41150890ce5dc376a3d72eaff0bf6
diff --git a/device-common.mk b/device-common.mk
index bc4ae6f..d2a32f3 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -1031,7 +1031,7 @@
-include hardware/google/pixel/pixelstats/device.mk
# thermal
--include hardware/google/pixel/thermal/device.mk
+include device/google/gs-common/thermal/thermal_hal/device.mk
# power HAL
-include hardware/google/pixel/power-libperfmgr/aidl/device.mk
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 2401dd7..19ea038 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -67,7 +67,7 @@
</hal>
<hal format="aidl" optional="true">
<name>vendor.google.google_battery</name>
- <version>2</version>
+ <version>2-3</version>
<interface>
<name>IGoogleBattery</name>
<instance>default</instance>
@@ -222,7 +222,7 @@
</hal>
<hal format="aidl" optional="true">
<name>vendor.google.wifi_ext</name>
- <version>1</version>
+ <version>2-3</version>
<interface>
<name>IWifiExt</name>
<instance>default</instance>
diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index 80efc85..d1eb99e 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -182,6 +182,12 @@
<Limit name="measured-frame-rate-720x480" range="113-114" />
<Limit name="measured-frame-rate-1280x720" range="54-54" />
</MediaCodec>
+ <MediaCodec name="c2.android.av1-dav1d.decoder" type="video/av01" update="true">
+ <Limit name="measured-frame-rate-352x288" range="323-351" />
+ <Limit name="measured-frame-rate-640x360" range="180-185" />
+ <Limit name="measured-frame-rate-720x480" range="113-114" />
+ <Limit name="measured-frame-rate-1280x720" range="54-54" />
+ </MediaCodec>
</Decoders>
<Encoders>
