Snap for 12199801 from 6a105ee92a to 25D4-release

Change-Id: I7fc6fe38b8e29142e35db47ec1e25768b7825fe7

audio/tegu/audio-tables.mk

@@ -58,7 +58,25 @@ PRODUCT_PACKAGES += \
     waves_config.ini \
     waves_preset.mps \
     compens_spk_l.conf \
-    compens_spk_r.conf
+    compens_spk_r.conf \
+    downlink_bluetooth_headset_config.pb \
+    downlink_dock_config.pb \
+    downlink_external_speaker_config.pb \
+    downlink_handset_config.pb \
+    downlink_speaker_config.pb \
+    downlink_wired_headset_config.pb \
+    uplink_bluetooth_headset_aec_off_config.pb \
+    uplink_bluetooth_headset_aec_on_config.pb \
+    uplink_dock_aec_off_config.pb \
+    uplink_dock_aec_on_config.pb \
+    uplink_external_speaker_aec_off_config.pb \
+    uplink_external_speaker_aec_on_config.pb \
+    uplink_handset_aec_off_config.pb \
+    uplink_handset_aec_on_config.pb \
+    uplink_speaker_aec_off_config.pb \
+    uplink_speaker_aec_on_config.pb \
+    uplink_wired_headset_aec_off_config.pb \
+    uplink_wired_headset_aec_on_config.pb
 
 # userdebug and eng specific
 PRODUCT_PACKAGES_DEBUG += \

audio/tegu/tuning/Android.bp

@@ -144,6 +144,114 @@ prebuilt_etc {
     soc_specific: true,
 }
 
+prebuilt_etc {
+    name: "downlink_bluetooth_headset_config.pb",
+    src: "apmg3/downlink_bluetooth_headset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_dock_config.pb",
+    src: "apmg3/downlink_dock_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_external_speaker_config.pb",
+    src: "apmg3/downlink_external_speaker_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_handset_config.pb",
+    src: "apmg3/downlink_handset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_speaker_config.pb",
+    src: "apmg3/downlink_speaker_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_wired_headset_config.pb",
+    src: "apmg3/downlink_wired_headset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_bluetooth_headset_aec_off_config.pb",
+    src: "apmg3/uplink_bluetooth_headset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_bluetooth_headset_aec_on_config.pb",
+    src: "apmg3/uplink_bluetooth_headset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_dock_aec_off_config.pb",
+    src: "apmg3/uplink_dock_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_dock_aec_on_config.pb",
+    src: "apmg3/uplink_dock_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_external_speaker_aec_off_config.pb",
+    src: "apmg3/uplink_external_speaker_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_external_speaker_aec_on_config.pb",
+    src: "apmg3/uplink_external_speaker_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_handset_aec_off_config.pb",
+    src: "apmg3/uplink_handset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_handset_aec_on_config.pb",
+    src: "apmg3/uplink_handset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_speaker_aec_off_config.pb",
+    src: "apmg3/uplink_speaker_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_speaker_aec_on_config.pb",
+    src: "apmg3/uplink_speaker_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_wired_headset_aec_off_config.pb",
+    src: "apmg3/uplink_wired_headset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_wired_headset_aec_on_config.pb",
+    src: "apmg3/uplink_wired_headset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
 prebuilt_etc {
     name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
     src: "spatializer/base",

thermal/thermal_info_config_tegu.json

@@ -1261,11 +1261,11 @@
                         },
                         {
                             "Monitor": ["north_therm"],
-                            "TempRange": [-20.0, 55.0]
+                            "TempRange": [-20.0, 60.0]
                         },
                         {
                             "Monitor": ["rfpa_therm"],
-                            "TempRange": [-20.0, 60.0]
+                            "TempRange": [-20.0, 55.0]
                         },
                         {
                             "Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],