Snap for 11921613 from 710acad3df to 25D4-release

Change-Id: I1027c74b79ecea7014d988a8e5293aea7686968b

device-tegu.mk

@@ -57,7 +57,8 @@ include device/google/tegu/audio/tegu/audio-tables.mk
 include device/google/zumapro/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
-include device/google/gs-common/touch/syna/syna20.mk
+include device/google/gs-common/touch/gti/predump_gti.mk
+include device/google/gs-common/touch/syna/predump_syna20.mk
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,tegu)

thermal/thermal_info_config_charge_tegu.json

@@ -182,6 +182,35 @@
                     "LimitInfo": [0, 1, 1, 1, 1, 26, 26]
                 }
             ]
+        },
+        {
+            "Name":"USB-MINUS-CHARGER",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["usb_pwr_therm", "charging_therm"],
+            "Coefficient":[1.0, -1.0],
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-USB-THROTTLING",
+            "Type":"USB_PORT",
+            "Version":"0.1",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "usb_pwr_therm",
+            "Combination":["usb_pwr_therm", "USB-MINUS-CHARGER"],
+            "Coefficient":[46000, 7000],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "2.0", "NAN", "NAN"],
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "usbc-port",
+                    "LimitInfo": [0, 0, 0, 0, 1, 1, 1]
+                }
+            ],
+            "Multiplier":1,
+            "PollingDelay":300000,
+            "PassiveDelay":7000
         }
     ],
     "CoolingDevices":[