Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77fb00dd authored by Frank's avatar Frank
Browse files

[DU07]Remove BatteryStatsImpl NetworkStats.subtract dependences 

BatteryStatsImpl is using INetworkStatsService APIs, which
cannot be accessed after moving into the mainline module. So, replace
and remove those hidden API usages.

Bug: 213523117
Test: atest BatteryStatsImplTest WifiPowerCalculatorTest
            MobileRadioPowerCalculatorTest
Change-Id: I9e8d94259ad9845d94bfd78d971ff1a2cd7bb38e
parent 8e2a6f76

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;
@@ -11522,8 +11521,6 @@ public class BatteryStatsImpl extends BatteryStats { 
        }

    }













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



























    private final Object mWifiNetworkLock = new Object();





























    @GuardedBy("mWifiNetworkLock")










@@ -11567,18 +11564,13 @@ public class BatteryStatsImpl extends BatteryStats {













            final NetworkStats latestStats = readNetworkStatsLocked(networkStatsManager,















                    mWifiIfaces);















            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










@@ -11685,7 +11677,6 @@ public class BatteryStatsImpl extends BatteryStats {













                                        uidRunningMs, uidScanMs, uidBatchScanMs));















                    }















                }













                mNetworkStatsPool.release(delta);















                delta = null;















            }
























@@ -11935,18 +11926,13 @@ public class BatteryStatsImpl extends BatteryStats {













            final NetworkStats latestStats = readNetworkStatsLocked(networkStatsManager,















                    mModemIfaces);















            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;















            }
























@@ -12148,7 +12134,6 @@ public class BatteryStatsImpl extends BatteryStats {













                            totalEstimatedConsumptionMah);















                }



























                mNetworkStatsPool.release(delta);















                delta = null;















            }















        }