Update SVN to 2 am: 050c3b4416
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15841970
Change-Id: I32a28e8f13d4217aeb4ed2dc60f5187ec6eca8ee
diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index 6a9b434..4080c14 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -528,7 +528,6 @@
</path>
<path name="voice-callC usb-headset-mic">
- <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_OFF"/>
<ctl name="EP4 TX Mixer USB_TX" value="1"/>
</path>
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 6a9b434..4080c14 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -528,7 +528,6 @@
</path>
<path name="voice-callC usb-headset-mic">
- <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_OFF"/>
<ctl name="EP4 TX Mixer USB_TX" value="1"/>
</path>
diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml
index 467a1ff..9b9568b 100644
--- a/audio/slider/config/mixer_paths.xml
+++ b/audio/slider/config/mixer_paths.xml
@@ -537,7 +537,6 @@
</path>
<path name="voice-callC usb-headset-mic">
- <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_OFF"/>
<ctl name="EP4 TX Mixer USB_TX" value="1"/>
</path>
diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml
index 9b297ff..7016b41 100644
--- a/audio/whitefin/config/mixer_paths.xml
+++ b/audio/whitefin/config/mixer_paths.xml
@@ -639,7 +639,6 @@
</path>
<path name="voice-callC usb-headset-mic">
- <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_OFF"/>
<ctl name="EP4 TX Mixer USB_TX" value="1"/>
</path>
diff --git a/device-oriole.mk b/device-oriole.mk
index 17b8364..e0161b7 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -14,7 +14,8 @@
# limitations under the License.
#
-TARGET_KERNEL_DIR := device/google/raviole-kernel
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
diff --git a/device-raven.mk b/device-raven.mk
index c73450c..14fff58 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -14,7 +14,8 @@
# limitations under the License.
#
-TARGET_KERNEL_DIR := device/google/raviole-kernel
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
diff --git a/device-slider.mk b/device-slider.mk
index f4e6b57..8acb9ff 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -14,7 +14,8 @@
# limitations under the License.
#
-TARGET_KERNEL_DIR := device/google/raviole-kernel
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 17e4d45..a61250b 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -14,7 +14,8 @@
# limitations under the License.
#
-TARGET_KERNEL_DIR := device/google/raviole-kernel
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 7e201c0..16e5a16 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -374,17 +374,65 @@
"ReleaseLogic": "DECREASE"
},
{
+ "CdevRequest": "tpu_cooling",
+ "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
+ }
+ ]
+ },
+ {
+ "Name":"VIRTUAL-SKIN-CHARGE",
+ "Type":"UNKNOWN",
+ "VirtualSensor":true,
+ "TriggerSensor":"quiet_therm",
+ "Formula":"MAXIMUM",
+ "Combination":[
+ "VIRTUAL-QI-GNSS",
+ "VIRTUAL-QI-BATT",
+ "VIRTUAL-USB2-DISP",
+ "VIRTUAL-QUIET-BATT"
+ ],
+ "Coefficient":[
+ "1.0",
+ "1.0",
+ "1.0",
+ "1.0"
+ ],
+ "HotThreshold":[
+ "NAN",
+ "39.0",
+ "41.0",
+ "43.0",
+ "45.0",
+ "47.0",
+ "55.0"
+ ],
+ "HotHysteresis":[
+ 0.0,
+ 1.9,
+ 1.9,
+ 1.9,
+ 1.9,
+ 1.9,
+ 1.9
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.001,
+ "Monitor":true,
+ "PollingDelay":300000,
+ "PassiveDelay":7000,
+ "BindedCdevInfo": [
+ {
"CdevRequest": "fcc",
- "LimitInfo": [0, 2, 3, 4, 4, 4, 4],
+ "LimitInfo": [0, 2, 3, 3, 4, 4, 4],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
- "CdevFloorWithPowerLink": [0, 0, 1, 2, 4 ,4 ,4],
+ "CdevFloorWithPowerLink": [0, 0, 2, 2, 4 ,4 ,4],
"ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true
},
{
"CdevRequest": "dc_icl",
- "LimitInfo": [0, 1, 2, 4, 4, 4, 4],
+ "LimitInfo": [0, 1, 2, 3, 4, 4, 4],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
"CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4],
@@ -393,16 +441,12 @@
},
{
"CdevRequest": "wlc_fcc",
- "LimitInfo": [0, 2, 2, 5, 5, 5, 5],
+ "LimitInfo": [0, 2, 2, 4, 5, 5, 5],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
"CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5],
"ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
}
]
},
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 66f5af7..b4b899a 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -374,17 +374,65 @@
"ReleaseLogic": "DECREASE"
},
{
+ "CdevRequest": "tpu_cooling",
+ "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
+ }
+ ]
+ },
+ {
+ "Name":"VIRTUAL-SKIN-CHARGE",
+ "Type":"UNKNOWN",
+ "VirtualSensor":true,
+ "TriggerSensor":"quiet_therm",
+ "Formula":"MAXIMUM",
+ "Combination":[
+ "VIRTUAL-NEUTRAL-QI",
+ "VIRTUAL-USB2-BATT",
+ "VIRTUAL-GNSS-BATT",
+ "VIRTUAL-QI-DISP"
+ ],
+ "Coefficient":[
+ "1.0",
+ "1.0",
+ "1.0",
+ "1.0"
+ ],
+ "HotThreshold":[
+ "NAN",
+ "39.0",
+ "41.0",
+ "43.0",
+ "45.0",
+ "47.0",
+ "55.0"
+ ],
+ "HotHysteresis":[
+ 0.0,
+ 1.9,
+ 1.9,
+ 1.9,
+ 1.9,
+ 1.9,
+ 1.9
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.001,
+ "Monitor":true,
+ "PollingDelay":300000,
+ "PassiveDelay":7000,
+ "BindedCdevInfo": [
+ {
"CdevRequest": "fcc",
- "LimitInfo": [0, 2, 3, 4, 4, 4, 4],
+ "LimitInfo": [0, 2, 3, 3, 4, 4, 4],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
- "CdevFloorWithPowerLink": [0, 0, 1, 2, 3 ,4 ,4],
+ "CdevFloorWithPowerLink": [0, 0, 2, 2, 3 ,4 ,4],
"ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true
},
{
"CdevRequest": "dc_icl",
- "LimitInfo": [0, 1, 2, 4, 4, 4, 4],
+ "LimitInfo": [0, 1, 2, 3, 4, 4, 4],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
"CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4],
@@ -393,16 +441,12 @@
},
{
"CdevRequest": "wlc_fcc",
- "LimitInfo": [0, 2, 2, 3, 4, 4, 4],
+ "LimitInfo": [0, 3, 3, 4, 5, 5, 5],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
- "CdevFloorWithPowerLink": [0, 1, 1, 2, 3, 4, 4],
+ "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 5, 5],
"ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
}
]
},