Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[DU07]Remove BatteryStatsImpl NetworkStats.subtract dependences" am: a078c73c47 am: 991351f546 am: 3edf76ed6a am: c8e0e63e44

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956076

Change-Id: Ideb09004826ade4184eb5bd3095ad72e862c725e
This commit is contained in:
Frank Li
2022-01-21 10:33:21 +00:00
committed by Automerger Merge Worker
parent bc4058d49d c8e0e63e44
commit b1a5111269
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -84,7 +84,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;
@@ -12688,8 +12687,6 @@ public class BatteryStatsImpl extends BatteryStats {
}
}
private final Pools.Pool<NetworkStats> mNetworkStatsPool = new Pools.SynchronizedPool<>(6);
private final Object mWifiNetworkLock = new Object();
@GuardedBy("mWifiNetworkLock")
@@ -12737,18 +12734,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
@@ -12854,7 +12846,6 @@ public class BatteryStatsImpl extends BatteryStats {
uidRunningMs, uidScanMs, uidBatchScanMs));
}
}
mNetworkStatsPool.release(delta);
delta = null;
}
@@ -13105,18 +13096,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;
}
@@ -13322,7 +13308,6 @@ public class BatteryStatsImpl extends BatteryStats {
totalEstimatedConsumptionMah, elapsedRealtimeMs);
}
mNetworkStatsPool.release(delta);
delta = null;
}
}