Prevent DivideByZero error in BatteryStatsImpl am: ba88e68fe4 am: 4e4ff058c1 (794a18f5) · Commits · e / os / android_frameworks_base

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

+29 −20

Original line number	Diff line number	Diff line
		@@ -7732,26 +7732,35 @@ public final class BatteryStatsImpl extends BatteryStats {
		}

		final Uid u = getUidStatsLocked(mapUid(entry.uid));
		if (entry.rxBytes != 0) {
		u.noteNetworkActivityLocked(NETWORK_WIFI_RX_DATA, entry.rxBytes,
		entry.rxPackets);
		u.noteNetworkActivityLocked(NETWORK_WIFI_TX_DATA, entry.txBytes,
		entry.txPackets);
		mNetworkByteActivityCounters[NETWORK_WIFI_RX_DATA].addCountLocked(
		entry.rxBytes);
		mNetworkPacketActivityCounters[NETWORK_WIFI_RX_DATA].addCountLocked(
		entry.rxPackets);

		rxPackets.put(u.getUid(), entry.rxPackets);
		txPackets.put(u.getUid(), entry.txPackets);

		// Sum the total number of packets so that the Rx Power and Tx Power can
		// Sum the total number of packets so that the Rx Power can
		// be evenly distributed amongst the apps.
		totalRxPackets += entry.rxPackets;
		totalTxPackets += entry.txPackets;
		}

		mNetworkByteActivityCounters[NETWORK_WIFI_RX_DATA].addCountLocked(
		entry.rxBytes);
		if (entry.txBytes != 0) {
		u.noteNetworkActivityLocked(NETWORK_WIFI_TX_DATA, entry.txBytes,
		entry.txPackets);
		mNetworkByteActivityCounters[NETWORK_WIFI_TX_DATA].addCountLocked(
		entry.txBytes);
		mNetworkPacketActivityCounters[NETWORK_WIFI_RX_DATA].addCountLocked(
		entry.rxPackets);
		mNetworkPacketActivityCounters[NETWORK_WIFI_TX_DATA].addCountLocked(
		entry.txPackets);

		txPackets.put(u.getUid(), entry.txPackets);

		// Sum the total number of packets so that the Tx Power can
		// be evenly distributed amongst the apps.
		totalTxPackets += entry.txPackets;
		}
		}
		}