Add VR mode check for thermal notification

am: d51ac7322e

Change-Id: I056136375b74a38a4973951fb33f795e784bab1e
This commit is contained in:
Andrew Sapperstein
2017-01-05 03:07:01 +00:00
committed by android-build-merger

View File

@@ -240,23 +240,29 @@ public class PowerUI extends SystemUI {
} }
private void updateTemperatureWarning() { private void updateTemperatureWarning() {
// TODO: Add VR mode check PhoneStatusBar phoneStatusBar = getComponent(PhoneStatusBar.class);
float[] temps = mHardwarePropertiesManager.getDeviceTemperatures( if (phoneStatusBar != null && phoneStatusBar.isDeviceInVrMode()) {
HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN, // ensure the warning isn't showing, since VR shows its own warning
HardwarePropertiesManager.TEMPERATURE_CURRENT); mWarnings.dismissTemperatureWarning();
boolean shouldShowTempWarning = false; } else {
for (float temp : temps) { float[] temps = mHardwarePropertiesManager.getDeviceTemperatures(
if (temp >= mThrottlingTemp) { HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN,
shouldShowTempWarning = true; HardwarePropertiesManager.TEMPERATURE_CURRENT);
break; boolean shouldShowTempWarning = false;
for (float temp : temps) {
if (temp >= mThrottlingTemp) {
shouldShowTempWarning = true;
break;
}
}
if (shouldShowTempWarning) {
mWarnings.showTemperatureWarning();
} else {
mWarnings.dismissTemperatureWarning();
} }
} }
if (shouldShowTempWarning) {
mWarnings.showTemperatureWarning();
} else {
mWarnings.dismissTemperatureWarning();
}
// TODO: skip this when in VR mode since we already get a callback
mHandler.postDelayed(this::updateTemperatureWarning, TEMPERATURE_INTERVAL); mHandler.postDelayed(this::updateTemperatureWarning, TEMPERATURE_INTERVAL);
} }