Merge "BatteryStats: Fix DivideByZero error" (9fa3cd3d) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/os/BatteryStatsImpl.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -8160,7 +8160,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		final int size = delta.size();
		for (int i = 0; i < size; i++) {
		final NetworkStats.Entry entry = delta.getValues(i, mTmpNetworkStatsEntry);
		if (entry.rxPackets == 0 \|\| entry.txPackets == 0) {
		if (entry.rxPackets == 0 && entry.txPackets == 0) {
		continue;
		}

		@@ -8211,13 +8211,13 @@ public final class BatteryStatsImpl extends BatteryStats {
		if (activityInfo != null) {
		ControllerActivityCounterImpl activityCounter =
		u.getOrCreateModemControllerActivityLocked();
		if (entry.rxPackets != 0) {
		if (totalRxPackets > 0 && entry.rxPackets > 0) {
		final long rxMs = (entry.rxPackets * activityInfo.getRxTimeMillis())
		/ totalRxPackets;
		activityCounter.getRxTimeCounter().addCountLocked(rxMs);
		}

		if (entry.txPackets != 0) {
		if (totalTxPackets > 0 && entry.txPackets > 0) {
		for (int lvl = 0; lvl < ModemActivityInfo.TX_POWER_LEVELS; lvl++) {
		long txMs = entry.txPackets * activityInfo.getTxTimeMillis()[lvl];
		txMs /= totalTxPackets;