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

Commit 991351f5 authored by Frank Li's avatar Frank Li Committed by Automerger Merge Worker
Browse files

Merge "[DU07]Remove BatteryStatsImpl NetworkStats.subtract dependences" am: a078c73c 

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

Change-Id: I1c9d81559b8b1b4cc6dff8bb722f32fe0b0500e9
parents df562898 a078c73c

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

+2 −17
Original line number Original line Diff line number Diff line
@@ -83,7 +83,6 @@ import android.util.Log; 
import android.util.LongSparseArray;

import android.util.LongSparseArray;

import android.util.LongSparseLongArray;

import android.util.LongSparseLongArray;

import android.util.MutableInt;

import android.util.MutableInt;

import android.util.Pools;

import android.util.PrintWriterPrinter;

import android.util.PrintWriterPrinter;

import android.util.Printer;

import android.util.Printer;

import android.util.Slog;

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();







    private final Object mWifiNetworkLock = new Object();



























    @GuardedBy("mWifiNetworkLock")







    @GuardedBy("mWifiNetworkLock")










@@ -11566,18 +11563,13 @@ public class BatteryStatsImpl extends BatteryStats {









        synchronized (mWifiNetworkLock) {







        synchronized (mWifiNetworkLock) {











            final NetworkStats latestStats = readWifiNetworkStatsLocked(networkStatsManager);







            final NetworkStats latestStats = readWifiNetworkStatsLocked(networkStatsManager);











            if (latestStats != null) {







            if (latestStats != null) {











                delta = NetworkStats.subtract(latestStats, mLastWifiNetworkStats, null, null,







                delta = latestStats.subtract(mLastWifiNetworkStats);











                        mNetworkStatsPool.acquire());














                mNetworkStatsPool.release(mLastWifiNetworkStats);














                mLastWifiNetworkStats = latestStats;







                mLastWifiNetworkStats = latestStats;











            }







            }











        }







        }



























        synchronized (this) {







        synchronized (this) {











            if (!mOnBatteryInternal || mIgnoreNextExternalStats) {







            if (!mOnBatteryInternal || mIgnoreNextExternalStats) {











                if (delta != null) {














                    mNetworkStatsPool.release(delta);














                }














                if (mIgnoreNextExternalStats) {







                if (mIgnoreNextExternalStats) {











                    // TODO: Strictly speaking, we should re-mark all 5 timers for each uid (and the







                    // 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







                    //  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));







                                        uidRunningMs, uidScanMs, uidBatchScanMs));











                    }







                    }











                }







                }











                mNetworkStatsPool.release(delta);














                delta = null;







                delta = null;











            }







            }


























@@ -11933,18 +11924,13 @@ public class BatteryStatsImpl extends BatteryStats {









        synchronized (mModemNetworkLock) {







        synchronized (mModemNetworkLock) {











            final NetworkStats latestStats = readMobileNetworkStatsLocked(networkStatsManager);







            final NetworkStats latestStats = readMobileNetworkStatsLocked(networkStatsManager);











            if (latestStats != null) {







            if (latestStats != null) {











                delta = NetworkStats.subtract(latestStats, mLastModemNetworkStats, null, null,







                delta = latestStats.subtract(mLastModemNetworkStats);











                        mNetworkStatsPool.acquire());














                mNetworkStatsPool.release(mLastModemNetworkStats);














                mLastModemNetworkStats = latestStats;







                mLastModemNetworkStats = latestStats;











            }







            }











        }







        }



























        synchronized (this) {







        synchronized (this) {











            if (!mOnBatteryInternal || mIgnoreNextExternalStats) {







            if (!mOnBatteryInternal || mIgnoreNextExternalStats) {











                if (delta != null) {














                    mNetworkStatsPool.release(delta);














                }














                return;







                return;











            }







            }


























@@ -12146,7 +12132,6 @@ public class BatteryStatsImpl extends BatteryStats {









                            totalEstimatedConsumptionMah);







                            totalEstimatedConsumptionMah);











                }







                }



























                mNetworkStatsPool.release(delta);














                delta = null;







                delta = null;











            }







            }











        }







        }