Snap for 12078078 from 797258bb19 to 25D4-release

Change-Id: Ifdd8b5b4eb43974c774aa9dd2956ee0a2d553055

audio/tegu/aidl_config/audio_platform_configuration.xml

@@ -31,7 +31,7 @@
       <argument name="Curves" value="blackbird,condor=0,46.35,0.1950549451;54.6,57,0.98625" />
     </feature>
     <!-- <feature name="MicrophoneCompensation" /> -->
-    <!-- <feature name="spatializer-offload" /> -->
+    <feature name="spatializer-offload" />
   </features>
 
   <voipVolume>

audio/tegu/audio-tables.mk

@@ -77,3 +77,10 @@ PRODUCT_COPY_FILES += \
     device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tas2572/ti_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ti_cal_mixer_paths.xml
 
 endif
+
+# Offload spatializer config
+PRODUCT_PACKAGES += \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.base \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural

device-tegu.mk

@@ -104,6 +104,12 @@ PRODUCT_COPY_FILES += \
 # lhbm peak brightness delay: decided by kernel
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.primarydisplay.lhbm.frames_to_reach_peak_brightness=0
 
+PRODUCT_SOONG_NAMESPACES += device/google/tegu/radio/coex
+
+# Coex Configs
+PRODUCT_PACKAGES += \
+        display_primary_ssc_coex_table
+
 # Thermal VT estimator
 PRODUCT_PACKAGES += \
     libthermal_tflite_wrapper
@@ -119,7 +125,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.bluetooth.a2dp_offload.supported=true \
     persist.bluetooth.a2dp_offload.disabled=false \
-    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
+    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
 
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \
@@ -153,10 +159,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
 
-# Spatial Audio
-PRODUCT_PACKAGES += \
-	libspatialaudio \
-	librondo
+# declare use of spatial audio
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.audio.spatializer_enabled=true
+
+# declare use of stereo spatialization
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.audio.stereo_spatialization_enabled=true
 
 ifneq ($(USE_AUDIO_HAL_AIDL),true)
 # HIDL Sound Dose

perf/powerhint-tegu.json

@@ -702,9 +702,10 @@
       "Values": [
         "76",
         "55",
-        "38",
-        "36",
         "10",
+        "47",
+        "45",
+        "36",
         "30",
         "28"
       ],
@@ -727,10 +728,9 @@
       "Values": [
         "59",
         "30",
-        "20",
         "2",
-        "18",
-        "15"
+        "23",
+        "20"
       ],
       "DefaultIndex": 0
     },
@@ -751,8 +751,7 @@
         "62",
         "0",
         "20",
-        "22",
-        "15"
+        "22"
       ],
       "DefaultIndex": 0
     },
@@ -1776,7 +1775,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "36"
+      "Value": "47"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -1788,7 +1787,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "15"
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -1800,7 +1799,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_BIG_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "15"
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -1914,7 +1913,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "38"
+      "Value": "45"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1926,7 +1925,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "20"
+      "Value": "30"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -2070,7 +2069,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "30"
+      "Value": "47"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2082,7 +2081,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "18"
+      "Value": "23"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2995,7 +2994,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "28"
+      "Value": "47"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3007,7 +3006,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "18"
+      "Value": "23"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",

radio/coex/Android.bp

@@ -0,0 +1,31 @@
+//
+// Copyright (C) 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+soong_namespace {
+}
+
+package {
+    default_applicable_licenses: [
+        "//device/google/tegu:device_google_tegu_license",
+    ],
+}
+
+prebuilt_etc {
+    name: "display_primary_ssc_coex_table",
+    filename: "display_primary_ssc_coex_table.csv",
+    vendor: true,
+    src: "display_primary_ssc_coex_table.csv",
+    relative_install_path: "modem",
+}

radio/coex/display_primary_ssc_coex_table.csv

@@ -0,0 +1,5 @@
+1,0
+SNH,0
+CHA,0
+
+717000,723000,1