commit e49caaa3166c99c1e257198cb4d72eff2300487c
author Wei Wang <wvw@google.com> Wed Oct 31 02:24:49 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 31 02:24:49 2018 +0000
tree c05bc18fe8fa26799e5d9899f67aa5a45f948624
parent afb9523bc81aa2f07c4ee9a7e122cb0bcba0e903
parent 3911b8dee50d17f974df6d1b171e3dd4f287b34e

Merge "ThermalService: Report temperature for ThermalHAL 2.0"

services/thermalservice/libthermalcallback/ThermalChangedCallback.cpp

diff --git a/services/thermalservice/libthermalcallback/ThermalChangedCallback.cpp b/services/thermalservice/libthermalcallback/ThermalChangedCallback.cpp
index 0efd732..bb48387 100644
--- a/services/thermalservice/libthermalcallback/ThermalChangedCallback.cpp
+++ b/services/thermalservice/libthermalcallback/ThermalChangedCallback.cpp
@@ -68,6 +68,8 @@
                              static_cast<size_t>(ThrottlingSeverity::SEVERE))
                 ? true
                 : false;
+        value = temperature.value == UNKNOWN_TEMPERATURE ? NAN :
+                temperature.value;
         android::os::Temperature thermal_svc_temp(value, type);
         mThermalService->notifyThrottling(isThrottling, thermal_svc_temp);
     } else {