Merge "Fix ambient display time unit error" into pi-dev

am: a15aa6e2fd

Change-Id: I9eafd677e57ddf8c03a0c1c06bc9d68cc10e7b42
This commit is contained in:
Mike Ma
2018-04-06 12:44:41 -07:00
committed by android-build-merger

View File

@@ -657,7 +657,7 @@ public class BatteryStatsHelper {
* {@link #removeHiddenBatterySippers(List)}.
*/
private void addAmbientDisplayUsage() {
long ambientDisplayMs = mStats.getScreenDozeTime(mRawRealtimeUs, mStatsType);
long ambientDisplayMs = mStats.getScreenDozeTime(mRawRealtimeUs, mStatsType) / 1000;
double power = mPowerProfile.getAveragePower(PowerProfile.POWER_AMBIENT_DISPLAY)
* ambientDisplayMs / (60 * 60 * 1000);
if (power > 0) {