commit 4c0fc595f14cda0d20e126d3c27b2107538b3aca
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Aug 30 15:56:26 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 30 15:56:26 2023 +0000
tree d85cb78f613f4d6ced52b5a8db330a45e9bd7772
parent 13ac4f282d138c84d2592a9a65df0d6996f592ac
parent 7621732e5d98cebf83715e4090907af3d563bbe2

Merge "redbull: update thermal HAL makefile path" into main

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index c8f99c0..3c1dee6 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -845,7 +845,7 @@
 # Increment the SVN for any official public releases
 ifeq ($(PRODUCT_DEVICE_SVN_OVERRIDE),)
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.build.svn=71
+	ro.vendor.build.svn=72
 endif
 
 # Enable iwlan service logging for debug

device_framework_matrix_product.xml

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index d98ef31..5860544 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -42,31 +42,6 @@
         </interface>
     </hal>
     <hal format="hidl" optional="false">
-        <name>android.hardware.media.c2</name>
-        <version>1.0</version>
-        <interface>
-            <name>IComponentStore</name>
-            <instance>default</instance>
-            <instance>software</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
-        <name>android.hardware.radio</name>
-        <version>1.2</version>
-        <interface>
-            <name>ISap</name>
-            <instance>slot2</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
-        <name>android.hardware.radio.config</name>
-        <version>1.1</version>
-        <interface>
-            <name>IRadioConfig</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
         <name>vendor.display.color</name>
         <version>1.0-5</version>
         <interface>
@@ -247,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>

init.hardware.rc

diff --git a/init.hardware.rc b/init.hardware.rc
index db681cb..669c8dd 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -661,6 +661,7 @@
     mkdir /data/vendor/wifidump 771 root system
     mkdir /data/vendor/ramdump 771 root system
     mkdir /data/vendor/ssrdump 771 root system
+    mkdir /data/vendor/ssrdump/coredump 771 root system
     mkdir /data/vendor/ssrlog  775 root system
     start vendor.ss_ramdump