commit 03165cb14e37884ef1dca82b14911669e3d282e0
author Roshan Pius <rpius@google.com> Mon Oct 16 20:57:54 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 16 20:57:54 2023 +0000
tree 6e2da120da0ce305c3062f46c51bacb245ecf0da
parent 1b16559dc3001856ae2db56160aff068cb20bd0d
parent 9d13504a960644a13bb34b7afe366842c04976a6

[automerger skipped] Merge "redbull: Replace NFC app with NFC apex" into main am: d547e0f06a am: e7bdc0596f am: 96e86cc8dd am: dbabd3072f am: 9d13504a96 -s ours

am skip reason: Merged-In Icaf4f6809d262439b171aa75a23972fc6ec7a61b with SHA-1 1b16559dc3 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redbull/+/2779509

Change-Id: I8575d5e3baf6848d88f8acc8b42ec468c52e7c6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 2d14f84..811279b 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -1034,7 +1034,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

device_framework_matrix_product.xml

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 2401dd7..5860544 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -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>