Merge "Prevent zero-division when number of TX or RX packets is 0." into main (97605df9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/power/stats/BatteryStatsImpl.java

+14 −10

Original line number	Diff line number	Diff line
		@@ -12746,21 +12746,25 @@ public class BatteryStatsImpl extends BatteryStats {

		// Distribute the remaining Tx power appropriately between all apps that transmitted
		// packets.
		if (totalTxPackets != 0 && leftOverTxTimeMs != 0) {
		for (int i = 0; i < txPackets.size(); i++) {
		final int uid = txPackets.keyAt(i);
		final long myTxTimeMs = (txPackets.valueAt(i) * leftOverTxTimeMs)
		/ totalTxPackets;
		txTimesMs.incrementValue(uid, myTxTimeMs);
		}
		}

		// Distribute the remaining Rx power appropriately between all apps that received
		// packets.
		if (totalRxPackets != 0 && leftOverRxTimeMs != 0) {
		for (int i = 0; i < rxPackets.size(); i++) {
		final int uid = rxPackets.keyAt(i);
		final long myRxTimeMs = (rxPackets.valueAt(i) * leftOverRxTimeMs)
		/ totalRxPackets;
		rxTimesMs.incrementValue(uid, myRxTimeMs);
		}
		}

		for (int i = 0; i < txTimesMs.size(); i++) {
		final int uid = txTimesMs.keyAt(i);