From 1dbbc0a53b85e13e6ec269218ba3b6c61f4efd03 Mon Sep 17 00:00:00 2001 From: George Lee Date: Mon, 8 Mar 2021 09:28:34 -0800 Subject: [PATCH 1/5] thermal: cellular mitigation on critical battery Enable cellular mitigation on critical battery condition. Bug: 181572536 Test: Local Test Signed-off-by: George Lee Change-Id: I310c3b67bc6a7f83a724005665eeda50b29469f7 --- thermal_info_config_oriole.json | 29 +++++++++++++++++++++++++++++ thermal_info_config_raven.json | 29 +++++++++++++++++++++++++++++ thermal_info_config_slider.json | 29 +++++++++++++++++++++++++++++ thermal_info_config_whitefin.json | 29 +++++++++++++++++++++++++++++ 4 files changed, 116 insertions(+) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index afa79f0..a2e12e5 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -295,6 +295,35 @@ "Multiplier":1, "Monitor":false }, + { + "Name":"critical-battery-cell", + "Type":"BCL_VOLTAGE", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "vdroop1", + "Combination":[ + "battery", + "battery_cycle", + "vdroop1" + ], + "Coefficient":[ + "-10000", + "400", + "1200" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + 3.00, + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true + }, { "Name":"FLASH_LED_REDUCE", "Type":"UNKNOWN", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 872b284..b6689c5 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -295,6 +295,35 @@ "Multiplier":1, "Monitor":false }, + { + "Name":"critical-battery-cell", + "Type":"BCL_VOLTAGE", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "vdroop1", + "Combination":[ + "battery", + "battery_cycle", + "vdroop1" + ], + "Coefficient":[ + "-10000", + "400", + "1200" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + 3.00, + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true + }, { "Name":"FLASH_LED_REDUCE", "Type":"UNKNOWN", diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json index b4c90a0..b2735b9 100644 --- a/thermal_info_config_slider.json +++ b/thermal_info_config_slider.json @@ -102,6 +102,35 @@ "Multiplier":0.001, "Monitor":false }, + { + "Name":"critical-battery-cell", + "Type":"BCL_VOLTAGE", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "smpl_gm", + "Combination":[ + "battery", + "battery_cycle", + "smpl_gm" + ], + "Coefficient":[ + "-10000", + "400", + "1400" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + 3.00, + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true + }, { "Name":"FLASH_LED_REDUCE", "Type":"UNKNOWN", diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json index b4c90a0..b2735b9 100644 --- a/thermal_info_config_whitefin.json +++ b/thermal_info_config_whitefin.json @@ -102,6 +102,35 @@ "Multiplier":0.001, "Monitor":false }, + { + "Name":"critical-battery-cell", + "Type":"BCL_VOLTAGE", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "smpl_gm", + "Combination":[ + "battery", + "battery_cycle", + "smpl_gm" + ], + "Coefficient":[ + "-10000", + "400", + "1400" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + 3.00, + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true + }, { "Name":"FLASH_LED_REDUCE", "Type":"UNKNOWN", From 4c4329ca5d64983828c87b5c106c5b11ec30b4ce Mon Sep 17 00:00:00 2001 From: Kai Shi Date: Wed, 24 Mar 2021 18:17:25 -0700 Subject: [PATCH 2/5] Update wifi currents based on the measurement. Test: manual Bug: 183661133 Change-Id: I87b1178d84e44a9540ad4f91de27940ec1c94dec --- .../frameworks/base/core/res/res/xml/power_profile.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml index a0f185f..fbffec0 100644 --- a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -176,11 +176,11 @@ 3700 - 79 + 38 - 118 + 98 - 331 + 470 3700 From 3f8dc9ad6da1ad2689af43e2e901b07330f375bf Mon Sep 17 00:00:00 2001 From: Kai Shi Date: Thu, 25 Mar 2021 13:25:29 -0700 Subject: [PATCH 3/5] Update wifi currents based on the measurement. Test: manual Bug: 183661133 Change-Id: Ib11d0998be6c0286548b8c559b19ad3ab20cc169 --- .../frameworks/base/core/res/res/xml/power_profile.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml index a0f185f..fbffec0 100644 --- a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -176,11 +176,11 @@ 3700 - 79 + 38 - 118 + 98 - 331 + 470 3700 From 7ecf2249734612dc8e07c15ed6f1f0baea37d2ea Mon Sep 17 00:00:00 2001 From: Eddie Tashjian Date: Thu, 25 Mar 2021 13:25:38 -0700 Subject: [PATCH 4/5] Add Oriole front cam display mipi table. Bug: 179208113 Test: Check file presence. Change-Id: I5df7da48d642e462327de4046f9b074ee1e38f43 --- device-oriole.mk | 3 ++- radio/oriole_camera_front_mipi_coex_table.csv | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 radio/oriole_camera_front_mipi_coex_table.csv diff --git a/device-oriole.mk b/device-oriole.mk index e0cd622..ab1a6ad 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -48,7 +48,8 @@ PRODUCT_COPY_FILES += \ # 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 + device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv \ + device/google/raviole/radio/oriole_camera_front_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_front_mipi_coex_table.csv # Camera PRODUCT_COPY_FILES += \ diff --git a/radio/oriole_camera_front_mipi_coex_table.csv b/radio/oriole_camera_front_mipi_coex_table.csv new file mode 100644 index 0000000..c21cd6b --- /dev/null +++ b/radio/oriole_camera_front_mipi_coex_table.csv @@ -0,0 +1,7 @@ +694270,706560 + +930000,955000,694270 +2446000,2473000,694270 +5640000,5840000,694270 +2412000,2442000,706560 +5500000,5600000,706560 From 3f822142e6ca20336974689d4280670724c86bea Mon Sep 17 00:00:00 2001 From: allenwtsu Date: Mon, 22 Mar 2021 12:16:08 +0800 Subject: [PATCH 5/5] Add MMS UA, UAProf for O6/R4 Bug: 179612596 Test: by manual Change-Id: I7c3522c3a2be89b964cc56277b777ba91c9fef60 --- .../overlay/frameworks/base/core/res/res/values/config.xml | 5 +++++ raven/overlay/frameworks/base/core/res/res/values/config.xml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index a8a0167..47175d3 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -165,6 +165,11 @@ com.google.sensor.long_press + + gb7n6 + + http://www.gstatic.com/android/sms/GB7N6.xml + com.google.sensor.quick_pickup diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 87a2410..f8536b0 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -153,4 +153,9 @@ 750.0 900.0 + + + g8v0u + + http://www.gstatic.com/android/sms/G8V0U.xml