Merge "Collect background network data stats in BatteryStats" (a94c4b5b) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryStats.java

+30 −3

Original line number	Diff line number	Diff line
		@@ -2186,7 +2186,11 @@ public abstract class BatteryStats implements Parcelable {
		public static final int NETWORK_WIFI_TX_DATA = 3;
		public static final int NETWORK_BT_RX_DATA = 4;
		public static final int NETWORK_BT_TX_DATA = 5;
		public static final int NUM_NETWORK_ACTIVITY_TYPES = NETWORK_BT_TX_DATA + 1;
		public static final int NETWORK_MOBILE_BG_RX_DATA = 6;
		public static final int NETWORK_MOBILE_BG_TX_DATA = 7;
		public static final int NETWORK_WIFI_BG_RX_DATA = 8;
		public static final int NETWORK_WIFI_BG_TX_DATA = 9;
		public static final int NUM_NETWORK_ACTIVITY_TYPES = NETWORK_WIFI_BG_TX_DATA + 1;

		public abstract long getNetworkActivityBytes(int type, int which);
		public abstract long getNetworkActivityPackets(int type, int which);
		@@ -3233,16 +3237,39 @@ public abstract class BatteryStats implements Parcelable {
		final long wifiWakeup = u.getWifiRadioApWakeupCount(which);
		final long btBytesRx = u.getNetworkActivityBytes(NETWORK_BT_RX_DATA, which);
		final long btBytesTx = u.getNetworkActivityBytes(NETWORK_BT_TX_DATA, which);
		// Background data transfers
		final long mobileBytesBgRx = u.getNetworkActivityBytes(NETWORK_MOBILE_BG_RX_DATA,
		which);
		final long mobileBytesBgTx = u.getNetworkActivityBytes(NETWORK_MOBILE_BG_TX_DATA,
		which);
		final long wifiBytesBgRx = u.getNetworkActivityBytes(NETWORK_WIFI_BG_RX_DATA, which);
		final long wifiBytesBgTx = u.getNetworkActivityBytes(NETWORK_WIFI_BG_TX_DATA, which);
		final long mobilePacketsBgRx = u.getNetworkActivityPackets(NETWORK_MOBILE_BG_RX_DATA,
		which);
		final long mobilePacketsBgTx = u.getNetworkActivityPackets(NETWORK_MOBILE_BG_TX_DATA,
		which);
		final long wifiPacketsBgRx = u.getNetworkActivityPackets(NETWORK_WIFI_BG_RX_DATA,
		which);
		final long wifiPacketsBgTx = u.getNetworkActivityPackets(NETWORK_WIFI_BG_TX_DATA,
		which);

		if (mobileBytesRx > 0 \|\| mobileBytesTx > 0 \|\| wifiBytesRx > 0 \|\| wifiBytesTx > 0
		\|\| mobilePacketsRx > 0 \|\| mobilePacketsTx > 0 \|\| wifiPacketsRx > 0
		\|\| wifiPacketsTx > 0 \|\| mobileActiveTime > 0 \|\| mobileActiveCount > 0
		\|\| btBytesRx > 0 \|\| btBytesTx > 0 \|\| mobileWakeup > 0 \|\| wifiWakeup > 0) {
		\|\| btBytesRx > 0 \|\| btBytesTx > 0 \|\| mobileWakeup > 0 \|\| wifiWakeup > 0
		\|\| mobileBytesBgRx > 0 \|\| mobileBytesBgTx > 0 \|\| wifiBytesBgRx > 0
		\|\| wifiBytesBgTx > 0
		\|\| mobilePacketsBgRx > 0 \|\| mobilePacketsBgTx > 0 \|\| wifiPacketsBgRx > 0
		\|\| wifiPacketsBgTx > 0) {
		dumpLine(pw, uid, category, NETWORK_DATA, mobileBytesRx, mobileBytesTx,
		wifiBytesRx, wifiBytesTx,
		mobilePacketsRx, mobilePacketsTx,
		wifiPacketsRx, wifiPacketsTx,
		mobileActiveTime, mobileActiveCount,
		btBytesRx, btBytesTx, mobileWakeup, wifiWakeup);
		btBytesRx, btBytesTx, mobileWakeup, wifiWakeup,
		mobileBytesBgRx, mobileBytesBgTx, wifiBytesBgRx, wifiBytesBgTx,
		mobilePacketsBgRx, mobilePacketsBgTx, wifiPacketsBgRx, wifiPacketsBgTx
		);
		}

		// Dump modem controller data, per UID.

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -8870,6 +8870,10 @@ public class BatteryStatsImpl extends BatteryStats {
		if (entry.rxBytes != 0) {
		u.noteNetworkActivityLocked(NETWORK_WIFI_RX_DATA, entry.rxBytes,
		entry.rxPackets);
		if (entry.set == NetworkStats.SET_DEFAULT) { // Background transfers
		u.noteNetworkActivityLocked(NETWORK_WIFI_BG_RX_DATA, entry.rxBytes,
		entry.rxPackets);
		}
		mNetworkByteActivityCounters[NETWORK_WIFI_RX_DATA].addCountLocked(
		entry.rxBytes);
		mNetworkPacketActivityCounters[NETWORK_WIFI_RX_DATA].addCountLocked(
		@@ -8885,6 +8889,10 @@ public class BatteryStatsImpl extends BatteryStats {
		if (entry.txBytes != 0) {
		u.noteNetworkActivityLocked(NETWORK_WIFI_TX_DATA, entry.txBytes,
		entry.txPackets);
		if (entry.set == NetworkStats.SET_DEFAULT) { // Background transfers
		u.noteNetworkActivityLocked(NETWORK_WIFI_BG_TX_DATA, entry.txBytes,
		entry.txPackets);
		}
		mNetworkByteActivityCounters[NETWORK_WIFI_TX_DATA].addCountLocked(
		entry.txBytes);
		mNetworkPacketActivityCounters[NETWORK_WIFI_TX_DATA].addCountLocked(
		@@ -9104,6 +9112,12 @@ public class BatteryStatsImpl extends BatteryStats {
		final Uid u = getUidStatsLocked(mapUid(entry.uid));
		u.noteNetworkActivityLocked(NETWORK_MOBILE_RX_DATA, entry.rxBytes, entry.rxPackets);
		u.noteNetworkActivityLocked(NETWORK_MOBILE_TX_DATA, entry.txBytes, entry.txPackets);
		if (entry.set == NetworkStats.SET_DEFAULT) { // Background transfers
		u.noteNetworkActivityLocked(NETWORK_MOBILE_BG_RX_DATA,
		entry.rxBytes, entry.rxPackets);
		u.noteNetworkActivityLocked(NETWORK_MOBILE_BG_TX_DATA,
		entry.txBytes, entry.txPackets);
		}

		mNetworkByteActivityCounters[NETWORK_MOBILE_RX_DATA].addCountLocked(
		entry.rxBytes);