Merge "[DU07]Remove BatteryStatsImpl NetworkStats.subtract dependences" (a078c73c) · Commits · e / os / android_frameworks_base

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

+2 −17

Original line number	Diff line number	Diff line
		@@ -83,7 +83,6 @@ import android.util.Log;
		import android.util.LongSparseArray;
		import android.util.LongSparseLongArray;
		import android.util.MutableInt;
		import android.util.Pools;
		import android.util.PrintWriterPrinter;
		import android.util.Printer;
		import android.util.Slog;
		@@ -11520,8 +11519,6 @@ public class BatteryStatsImpl extends BatteryStats {
		}
		}

		private final Pools.Pool<NetworkStats> mNetworkStatsPool = new Pools.SynchronizedPool<>(6);

		private final Object mWifiNetworkLock = new Object();

		@GuardedBy("mWifiNetworkLock")
		@@ -11566,18 +11563,13 @@ public class BatteryStatsImpl extends BatteryStats {
		synchronized (mWifiNetworkLock) {
		final NetworkStats latestStats = readWifiNetworkStatsLocked(networkStatsManager);
		if (latestStats != null) {
		delta = NetworkStats.subtract(latestStats, mLastWifiNetworkStats, null, null,
		mNetworkStatsPool.acquire());
		mNetworkStatsPool.release(mLastWifiNetworkStats);
		delta = latestStats.subtract(mLastWifiNetworkStats);
		mLastWifiNetworkStats = latestStats;
		}
		}

		synchronized (this) {
		if (!mOnBatteryInternal \|\| mIgnoreNextExternalStats) {
		if (delta != null) {
		mNetworkStatsPool.release(delta);
		}
		if (mIgnoreNextExternalStats) {
		// TODO: Strictly speaking, we should re-mark all 5 timers for each uid (and the
		// global one) here like we do for display. But I'm not sure it's worth the
		@@ -11684,7 +11676,6 @@ public class BatteryStatsImpl extends BatteryStats {
		uidRunningMs, uidScanMs, uidBatchScanMs));
		}
		}
		mNetworkStatsPool.release(delta);
		delta = null;
		}

		@@ -11933,18 +11924,13 @@ public class BatteryStatsImpl extends BatteryStats {
		synchronized (mModemNetworkLock) {
		final NetworkStats latestStats = readMobileNetworkStatsLocked(networkStatsManager);
		if (latestStats != null) {
		delta = NetworkStats.subtract(latestStats, mLastModemNetworkStats, null, null,
		mNetworkStatsPool.acquire());
		mNetworkStatsPool.release(mLastModemNetworkStats);
		delta = latestStats.subtract(mLastModemNetworkStats);
		mLastModemNetworkStats = latestStats;
		}
		}

		synchronized (this) {
		if (!mOnBatteryInternal \|\| mIgnoreNextExternalStats) {
		if (delta != null) {
		mNetworkStatsPool.release(delta);
		}
		return;
		}

		@@ -12146,7 +12132,6 @@ public class BatteryStatsImpl extends BatteryStats {
		totalEstimatedConsumptionMah);
		}

		mNetworkStatsPool.release(delta);
		delta = null;
		}
		}