Merge cherrypicks of ['googleplex-android-review.googlesource.com/28027779', 'googleplex-android-review.googlesource.com/28027780'] into 24Q3-release.

Change-Id: Icbf3f8a7e14f4a91e3bd26ac98ac72075564c697

audio/caiman/audio-tables.mk

@@ -61,7 +61,8 @@ PRODUCT_PACKAGES += \
     waves_config.ini \
     waves_preset.mps \
     compens_spk_l.conf \
-    compens_spk_r.conf
+    compens_spk_r.conf \
+    default_mic_compensation.bin
 
 # userdebug and eng specific
 PRODUCT_PACKAGES_DEBUG += \

audio/caiman/tuning/Android.bp

@@ -160,3 +160,9 @@ prebuilt_etc {
     filename_from_src: true,
     relative_install_path: "spatializer",
 }
+
+prebuilt_etc {
+    name: "default_mic_compensation.bin",
+    src: "compensation/default_mic_compensation.bin",
+    soc_specific: true,
+}

audio/komodo/audio-tables.mk

@@ -61,7 +61,8 @@ PRODUCT_PACKAGES += \
     waves_config.ini \
     waves_preset.mps \
     compens_spk_l.conf \
-    compens_spk_r.conf
+    compens_spk_r.conf \
+    default_mic_compensation.bin
 
 # userdebug and eng specific
 PRODUCT_PACKAGES_DEBUG += \

audio/komodo/tuning/Android.bp

@@ -160,3 +160,9 @@ prebuilt_etc {
     filename_from_src: true,
     relative_install_path: "spatializer",
 }
+
+prebuilt_etc {
+    name: "default_mic_compensation.bin",
+    src: "compensation/default_mic_compensation.bin",
+    soc_specific: true,
+}

audio/tokay/audio-tables.mk

@@ -61,7 +61,8 @@ PRODUCT_PACKAGES += \
     waves_config.ini \
     waves_preset.mps \
     compens_spk_l.conf \
-    compens_spk_r.conf
+    compens_spk_r.conf \
+    default_mic_compensation.bin
 
 # userdebug and eng specific
 PRODUCT_PACKAGES_DEBUG += \

audio/tokay/tuning/Android.bp

@@ -160,3 +160,9 @@ prebuilt_etc {
     filename_from_src: true,
     relative_install_path: "spatializer",
 }
+
+prebuilt_etc {
+    name: "default_mic_compensation.bin",
+    src: "compensation/default_mic_compensation.bin",
+    soc_specific: true,
+}

conf/init.caiman.rc

@@ -79,3 +79,7 @@ on property:sys.boot_completed=1
 # it should be written by the system init.
 on property:ro.boot.hardware.sku=GWVK6
     setprop audio.camerasound.force true
+
+# Check serial no. from specific CM4 devices for audio.
+on property:ro.boot.serialno=*
+    setprop vendor.audio_hal.device.serialno ${ro.boot.serialno}

conf/init.komodo.rc

@@ -83,3 +83,7 @@ on property:sys.boot_completed=1
 # it should be written by the system init.
 on property:ro.boot.hardware.sku=GQ57S
     setprop audio.camerasound.force true
+
+# Check serial no. from specific KM4 devices for audio.
+on property:ro.boot.serialno=*
+    setprop vendor.audio_hal.device.serialno ${ro.boot.serialno}

conf/init.tokay.rc

@@ -81,3 +81,7 @@ on fs
 # it should be written by the system init.
 on property:ro.boot.hardware.sku=G1B60
     setprop audio.camerasound.force true
+
+# Check serial no. from specific TK4 devices for audio.
+on property:ro.boot.serialno=*
+    setprop vendor.audio_hal.device.serialno ${ro.boot.serialno}