summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com>2023-12-31 18:43:01 -0800
committerSecurityBot <android-nexus-securitybot@system.gserviceaccount.com>2023-12-31 18:43:01 -0800
commitd248338b88f72a7d1961ac080865d776add6f395 (patch)
tree3cdefed9594dd411458a7b3492c2198b125f82db
parent2d627e604c3bda4474b0b03cd67b11afc1a63f02 (diff)
parent6ffe2304e8f7e3eaad53a09d3067976a0bb49462 (diff)
downloadbms-d248338b88f72a7d1961ac080865d776add6f395.tar.gz
Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15-24Q2
SBMerger: 571992243 Change-Id: I5e420530ff4231b404ced359e8ff9f37e808cd6c Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
-rw-r--r--google_charger.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/google_charger.c b/google_charger.c
index 5f2db8e..9a404fe 100644
--- a/google_charger.c
+++ b/google_charger.c
@@ -4797,7 +4797,8 @@ static int chg_therm_set_wlc_online(struct chg_drv *chg_drv)
if (!wlc_psy)
return PPS_PSY_OFFLINE;
- ret = power_supply_get_property(wlc_psy, POWER_SUPPLY_PROP_ONLINE, &pval);
+ /* use wlc_present due to wlc_online report 1 during wlc_spoof */
+ ret = power_supply_get_property(wlc_psy, POWER_SUPPLY_PROP_PRESENT, &pval);
if (ret < 0 || pval.intval == PPS_PSY_OFFLINE) {
int dc_icl;