Snap for 11648291 from 7b34240fe7 to 24Q3-release

Change-Id: Ica8741197e5f3e749ce2e56b3a40adc68e209ccf

audio/caiman/aidl_config/mixer_paths_aidl.xml

@@ -895,6 +895,18 @@
     <ctl name="BT_RX Mixer EP4" value="1" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
     <path name="spatializer-offload-playback -> bt" />
   </path>

audio/komodo/aidl_config/mixer_paths_aidl.xml

@@ -895,6 +895,18 @@
     <ctl name="BT_RX Mixer EP4" value="1" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
     <path name="spatializer-offload-playback -> bt" />
   </path>

audio/tokay/aidl_config/mixer_paths_aidl.xml

@@ -895,6 +895,18 @@
     <ctl name="BT_RX Mixer EP4" value="1" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
     <path name="spatializer-offload-playback -> bt" />
   </path>

device-caiman.mk

@@ -52,6 +52,7 @@ include device/google/gs-common/touch/gti/gti.mk
 include device/google/gs-common/touch/syna/syna20.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
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,caiman)
@@ -308,6 +309,9 @@ PRODUCT_VENDOR_PROPERTIES += \
     vendor.primarydisplay.op.hs_switch_min_dbv=1088 \
     vendor.primarydisplay.op.hist_delta_th=8
 
+# Display fixed TE2
+PRODUCT_VENDOR_PROPERTIES += vendor.primarydisplay.fixed_te2.default_rate_hz=120
+
 # Vibrator HAL
 ACTUATOR_MODEL := luxshare_ict_081545
 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1

device-komodo.mk

@@ -52,6 +52,7 @@ include device/google/gs-common/touch/gti/gti.mk
 include device/google/gs-common/touch/syna/syna20.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
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,komodo)
@@ -78,6 +79,9 @@ PRODUCT_VENDOR_PROPERTIES += \
     vendor.primarydisplay.op.hs_switch_min_dbv=1088 \
     vendor.primarydisplay.op.hist_delta_th=8
 
+# Display fixed TE2
+PRODUCT_VENDOR_PROPERTIES += vendor.primarydisplay.fixed_te2.default_rate_hz=120
+
 # Init files
 PRODUCT_COPY_FILES += \
 	device/google/caimito/conf/init.komodo.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.komodo.rc

device-tokay.mk

@@ -42,6 +42,7 @@ include device/google/gs-common/touch/gti/gti.mk
 include device/google/gs-common/touch/syna/syna20.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
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,tokay)

perf/powerhint-caiman.json

@@ -2195,7 +2195,7 @@
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "TAPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
@@ -2279,13 +2279,13 @@
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
-      "Value": "1100"
+      "Value": "1280 1100 1055"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CPUUtilThreshold",
       "Duration": 0,
-      "Value": "1100"
+      "Value": "1100 1024 1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",

perf/powerhint-komodo.json

@@ -2189,7 +2189,7 @@
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
@@ -2279,13 +2279,13 @@
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
-      "Value": "1100"
+      "Value": "1280 1100 1055"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CPUUtilThreshold",
       "Duration": 0,
-      "Value": "1100"
+      "Value": "1100 1024 1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",

perf/powerhint-ripcurrentpro.json

@@ -2184,7 +2184,7 @@
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "TAPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
@@ -2268,13 +2268,13 @@
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
-      "Value": "1100"
+      "Value": "1280 1100 1055"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CPUUtilThreshold",
       "Duration": 0,
-      "Value": "1100"
+      "Value": "1100 1024 1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",

perf/powerhint-tokay.json

@@ -2195,7 +2195,7 @@
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "TAPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
@@ -2279,13 +2279,13 @@
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
-      "Value": "1100"
+      "Value": "1280 1100 1055"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CPUUtilThreshold",
       "Duration": 0,
-      "Value": "1100"
+      "Value": "1100 1024 1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",

threadnetwork/hal/Android.bp

@@ -7,6 +7,7 @@ prebuilt_etc {
 override_apex {
     name: "com.google.caimito.hardware.threadnetwork",
     base: "com.android.hardware.threadnetwork",
+    package_name: "com.google.android.hardware.threadnetwork",
     prebuilts: [
         "caimito_threadnetwork_hal_service.rc",
         "threadnetwork-default.xml",