From ec0d43627b3a7d560a5dd7be701b81a68368f077 Mon Sep 17 00:00:00 2001 From: Jia-yi Chen Date: Thu, 15 Jul 2021 10:54:25 -0700 Subject: [PATCH 1/2] thermal: Update thermal table 1) Adjust dc_icl settings due to one more level 100000 in dts 2) Change fcc ODPM-lo at MODERATE from 0 back to 1 3) Adjust wlc_fcc settings due to one more level in dts Bug: 193785535 Test: Boot Change-Id: If8b6a1439d4464968589f1ed8f6234fac6991977 --- thermal_info_config_oriole.json | 13 +++++++++---- thermal_info_config_raven.json | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index bfcf177..e058a37 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -336,20 +336,25 @@ "LimitInfo": [0, 2, 3, 4, 4, 4, 4], "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], - "CdevFloorWithPowerLink": [0, 0, 0, 2, 4 ,4 ,4], + "CdevFloorWithPowerLink": [0, 0, 1, 2, 4 ,4 ,4], "ReleaseLogic": "RELEASE_TO_FLOOR", "ThrottlingWithPowerLink":true }, { "CdevRequest": "dc_icl", - "LimitInfo": [0, 1, 2, 3, 3, 3, 3] + "LimitInfo": [0, 1, 2, 4, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true }, { "CdevRequest": "wlc_fcc", - "LimitInfo": [0, 1, 1, 4, 4, 4, 4], + "LimitInfo": [0, 2, 2, 5, 5, 5, 5], "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], - "CdevFloorWithPowerLink": [0, 0, 0, 1, 4 ,4 ,4], + "CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5], "ReleaseLogic": "RELEASE_TO_FLOOR", "ThrottlingWithPowerLink":true } diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 1336c62..9cfd109 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -336,20 +336,25 @@ "LimitInfo": [0, 2, 3, 4, 4, 4, 4], "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], - "CdevFloorWithPowerLink": [0, 0, 0, 2, 3 ,4 ,4], + "CdevFloorWithPowerLink": [0, 0, 1, 2, 3 ,4 ,4], "ReleaseLogic": "RELEASE_TO_FLOOR", "ThrottlingWithPowerLink":true }, { "CdevRequest": "dc_icl", - "LimitInfo": [0, 1, 2, 3, 3, 3, 3] + "LimitInfo": [0, 1, 2, 4, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true }, { "CdevRequest": "wlc_fcc", - "LimitInfo": [0, 1, 1, 2, 3, 3, 3], + "LimitInfo": [0, 2, 2, 3, 4, 4, 4], "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], - "CdevFloorWithPowerLink": [0, 0, 0, 1, 2 ,3 ,3], + "CdevFloorWithPowerLink": [0, 1, 1, 2, 3, 4, 4], "ReleaseLogic": "RELEASE_TO_FLOOR", "ThrottlingWithPowerLink":true } From 34a89635a92901b192976d6a3338f5270a59389c Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Thu, 15 Jul 2021 18:46:57 +0800 Subject: [PATCH 2/2] Bluetooth: Add sar_test in userdebug build Bug: 193757202 Test: make Change-Id: Ie940b6e770d2682cc3fff7fbc79a5bcc43645efd --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 4f4e99c..f774537 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -64,6 +64,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth_power_limits_oriole.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv +# Bluetooth SAR test tool +PRODUCT_PACKAGES_DEBUG += \ + sar_test + # MIPI Coex Configs PRODUCT_COPY_FILES += \ device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv \ diff --git a/device-raven.mk b/device-raven.mk index fff0e88..b0ef424 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -70,6 +70,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth_power_limits_raven.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv +# Bluetooth SAR test tool +PRODUCT_PACKAGES_DEBUG += \ + sar_test + # Camera PRODUCT_COPY_FILES += \ device/google/raviole/media_profiles_raven.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml