Snap for 12335440 from ef8d5262e2 to 24Q4-release

Change-Id: Ifc9faa297cf0fc03b5bde8b584ed6f50d69f2061
2024-09-07 02:31:47 +00:00 · 2024-09-07 02:31:47 +00:00 · b813f35e4e
commit b813f35e4e
parent 93f0fe626e ef8d5262e2
22 changed files with 16 additions and 3 deletions
--- a/audio/caiman/tuning/spatializer/base
+++ b/audio/caiman/tuning/spatializer/base
--- a/audio/caiman/tuning/spatializer/mode_2_ch
+++ b/audio/caiman/tuning/spatializer/mode_2_ch
--- a/audio/caiman/tuning/spatializer/mode_6_ch
+++ b/audio/caiman/tuning/spatializer/mode_6_ch
--- a/audio/caiman/tuning/spatializer/mode_xaural
+++ b/audio/caiman/tuning/spatializer/mode_xaural
--- a/audio/komodo/tuning/spatializer/base
+++ b/audio/komodo/tuning/spatializer/base
--- a/audio/komodo/tuning/spatializer/mode_2_ch
+++ b/audio/komodo/tuning/spatializer/mode_2_ch
--- a/audio/komodo/tuning/spatializer/mode_6_ch
+++ b/audio/komodo/tuning/spatializer/mode_6_ch
--- a/audio/komodo/tuning/spatializer/mode_xaural
+++ b/audio/komodo/tuning/spatializer/mode_xaural
--- a/audio/tokay/tuning/spatializer/base
+++ b/audio/tokay/tuning/spatializer/base
--- a/audio/tokay/tuning/spatializer/mode_2_ch
+++ b/audio/tokay/tuning/spatializer/mode_2_ch
--- a/audio/tokay/tuning/spatializer/mode_6_ch
+++ b/audio/tokay/tuning/spatializer/mode_6_ch
--- a/audio/tokay/tuning/spatializer/mode_xaural
+++ b/audio/tokay/tuning/spatializer/mode_xaural
--- a/caiman/BoardConfig.mk
+++ b/caiman/BoardConfig.mk
@ -28,6 +28,7 @@ include device/google/caimito/device-caimito-common.mk

 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/caiman/proprietary/BoardConfigVendor.mk
 include device/google/caimito-sepolicy/caiman-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk
--- a/device-caiman.mk
+++ b/device-caiman.mk
@ -70,6 +70,7 @@ include device/google/gs-common/touch/gti/predump_gti.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
 include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
+include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk

 # Increment the SVN for any official public releases
 ifdef RELEASE_SVN_CAIMAN
@ -485,8 +486,9 @@ PRODUCT_PACKAGES += \
 endif

 # Bluetooth device id
+# Caiman: 0x4110
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20496
+    bluetooth.device_id.product_id=16656

 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \
--- a/device-komodo.mk
+++ b/device-komodo.mk
@ -70,6 +70,7 @@ include device/google/gs-common/touch/gti/predump_gti.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
 include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
+include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk

 # Increment the SVN for any official public releases
 ifdef RELEASE_SVN_KOMODO
@ -486,8 +487,9 @@ PRODUCT_PACKAGES += \
 endif

 # Bluetooth device id
+# Komodo: 0x4111
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20497
+    bluetooth.device_id.product_id=16657

 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@ -44,6 +44,7 @@ include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/stm/stm20.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
+include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk

 # go/lyric-soong-variables
 # Set to 'ripcurrent' as ripcurrent camera service is compatible with ripcurrent24.
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@ -47,6 +47,7 @@ include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/stm/stm20.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
+include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk

 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,ripcurrentpro)
--- a/device-tokay.mk
+++ b/device-tokay.mk
@ -60,6 +60,7 @@ include device/google/gs-common/touch/gti/predump_gti.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
 include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
+include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk

 # Increment the SVN for any official public releases
 ifdef RELEASE_SVN_TOKAY
@ -451,8 +452,9 @@ PRODUCT_PACKAGES += \
 endif

 # Bluetooth device id
+# Tokay: 0x4112
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20498
+    bluetooth.device_id.product_id=16658

 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \
--- a/komodo/BoardConfig.mk
+++ b/komodo/BoardConfig.mk
@ -28,6 +28,7 @@ include device/google/caimito/device-caimito-common.mk

 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/komodo/proprietary/BoardConfigVendor.mk
 include device/google/caimito-sepolicy/komodo-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk
--- a/ripcurrent24/BoardConfig.mk
+++ b/ripcurrent24/BoardConfig.mk
@ -24,5 +24,6 @@ include device/google/caimito/device-caimito-common.mk

 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 include device/google/caimito-sepolicy/ripcurrent24-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk
--- a/ripcurrentpro/BoardConfig.mk
+++ b/ripcurrentpro/BoardConfig.mk
@ -24,5 +24,6 @@ include device/google/caimito/device-caimito-common.mk

 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 include device/google/caimito-sepolicy/ripcurrentpro-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk
--- a/tokay/BoardConfig.mk
+++ b/tokay/BoardConfig.mk
@ -28,6 +28,7 @@ include device/google/caimito/device-caimito-common.mk

 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/tokay/proprietary/BoardConfigVendor.mk
 include device/google/caimito-sepolicy/tokay-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk