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

Commit 346aa875 authored by Varun Anand's avatar Varun Anand
Browse files

Move BatteryStats and StatsCompanionService to use NetworkStatsService. 

This CL is a manual merge of http://ag/c/6015966/3.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Test: manual test: verified that BatteryStats are correctly accounting
for VPN traffic.
Change-Id: I5b07ce70ac58bdcbebc3114bfe9fd411469d57af
Merged-In: I230c1edbf64cfeb3dbb560db368b5e420f7b79a4
parent 29d2ef2f

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

+10 −6
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.IntentFilter; 
import android.database.ContentObserver;

import android.hardware.usb.UsbManager;

import android.net.ConnectivityManager;

import android.net.INetworkStatsService;

import android.net.NetworkStats;

import android.net.Uri;

import android.net.wifi.WifiActivityEnergyInfo;
@@ -87,7 +88,6 @@ import android.view.Display; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.location.gnssmetrics.GnssMetrics;

import com.android.internal.net.NetworkStatsFactory;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.FastPrintWriter;

import com.android.internal.util.FastXmlSerializer;
@@ -11092,7 +11092,6 @@ public class BatteryStatsImpl extends BatteryStats { 
        }

    }













    private final NetworkStatsFactory mNetworkStatsFactory = new NetworkStatsFactory();















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





























    private final Object mWifiNetworkLock = new Object();









@@ -11114,11 +11113,16 @@ public class BatteryStatsImpl extends BatteryStats {













    private NetworkStats readNetworkStatsLocked(String[] ifaces) {















        try {















            if (!ArrayUtils.isEmpty(ifaces)) {













                return mNetworkStatsFactory.readNetworkStatsDetail(NetworkStats.UID_ALL, ifaces,













                        NetworkStats.TAG_NONE, mNetworkStatsPool.acquire());













                INetworkStatsService statsService = INetworkStatsService.Stub.asInterface(













                        ServiceManager.getService(Context.NETWORK_STATS_SERVICE));













                if (statsService != null) {













                    return statsService.getDetailedUidStats(ifaces);













                } else {













                    Slog.e(TAG, "Failed to get networkStatsService ");















                }













        } catch (IOException e) {













            Slog.e(TAG, "failed to read network stats for ifaces: " + Arrays.toString(ifaces));













            }













        } catch (RemoteException e) {













            Slog.e(TAG, "failed to read network stats for ifaces: " + Arrays.toString(ifaces) + e);















        }















        return null;















    }

































services/core/java/com/android/server/stats/StatsCompanionService.java



+28
−17




























Original line number
Diff line number
Diff line








@@ -32,6 +32,7 @@ import android.content.IntentSender;













import android.content.pm.PackageInfo;















import android.content.pm.PackageManager;















import android.content.pm.UserInfo;













import android.net.INetworkStatsService;















import android.net.NetworkStats;















import android.net.wifi.IWifiManager;















import android.net.wifi.WifiActivityEnergyInfo;










@@ -63,7 +64,6 @@ import android.util.Slog;













import android.util.StatsLog;































import com.android.internal.annotations.GuardedBy;













import com.android.internal.net.NetworkStatsFactory;















import com.android.internal.os.KernelCpuSpeedReader;















import com.android.internal.os.KernelUidCpuTimeReader;















import com.android.internal.os.KernelUidCpuClusterTimeReader;










@@ -123,6 +123,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {





























    private final Context mContext;















    private final AlarmManager mAlarmManager;













    private final INetworkStatsService mNetworkStatsService;















    @GuardedBy("sStatsdLock")















    private static IStatsManager sStatsd;















    private static final Object sStatsdLock = new Object();










@@ -162,6 +163,8 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {













        super();















        mContext = context;















        mAlarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);













        mNetworkStatsService = INetworkStatsService.Stub.asInterface(













              ServiceManager.getService(Context.NETWORK_STATS_SERVICE));































        mAnomalyAlarmIntent = PendingIntent.getBroadcast(mContext, 0,















                new Intent(mContext, AnomalyAlarmReceiver.class), 0);










@@ -651,13 +654,14 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {













            if (ifaces.length == 0) {















                return;















            }













            NetworkStatsFactory nsf = new NetworkStatsFactory();













            if (mNetworkStatsService == null) {













                Slog.e(TAG, "NetworkStats Service is not available!");













                return;













            }















            // Combine all the metrics per Uid into one record.













            NetworkStats stats =













                    nsf.readNetworkStatsDetail(NetworkStats.UID_ALL, ifaces, NetworkStats.TAG_NONE, null)













                            .groupedByUid();













            NetworkStats stats = mNetworkStatsService.getDetailedUidStats(ifaces).groupedByUid();















            addNetworkStats(tagId, pulledData, stats, false);













        } catch (java.io.IOException e) {













        } catch (RemoteException e) {















            Slog.e(TAG, "Pulling netstats for wifi bytes has error", e);















        } finally {















            Binder.restoreCallingIdentity(token);









@@ -672,11 +676,14 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {













            if (ifaces.length == 0) {















                return;















            }













            NetworkStatsFactory nsf = new NetworkStatsFactory();













            if (mNetworkStatsService == null) {













                Slog.e(TAG, "NetworkStats Service is not available!");













                return;













            }















            NetworkStats stats = rollupNetworkStatsByFGBG(













                    nsf.readNetworkStatsDetail(NetworkStats.UID_ALL, ifaces, NetworkStats.TAG_NONE, null));













                    mNetworkStatsService.getDetailedUidStats(ifaces));















            addNetworkStats(tagId, pulledData, stats, true);













        } catch (java.io.IOException e) {













        } catch (RemoteException e) {















            Slog.e(TAG, "Pulling netstats for wifi bytes w/ fg/bg has error", e);















        } finally {















            Binder.restoreCallingIdentity(token);









@@ -691,13 +698,14 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {













            if (ifaces.length == 0) {















                return;















            }













            NetworkStatsFactory nsf = new NetworkStatsFactory();













            if (mNetworkStatsService == null) {













                Slog.e(TAG, "NetworkStats Service is not available!");













                return;













            }















            // Combine all the metrics per Uid into one record.













            NetworkStats stats =













                    nsf.readNetworkStatsDetail(NetworkStats.UID_ALL, ifaces, NetworkStats.TAG_NONE, null)













                            .groupedByUid();













            NetworkStats stats = mNetworkStatsService.getDetailedUidStats(ifaces).groupedByUid();















            addNetworkStats(tagId, pulledData, stats, false);













        } catch (java.io.IOException e) {













        } catch (RemoteException e) {















            Slog.e(TAG, "Pulling netstats for mobile bytes has error", e);















        } finally {















            Binder.restoreCallingIdentity(token);










@@ -726,11 +734,14 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {













            if (ifaces.length == 0) {















                return;















            }













            NetworkStatsFactory nsf = new NetworkStatsFactory();













            if (mNetworkStatsService == null) {













                Slog.e(TAG, "NetworkStats Service is not available!");













                return;













            }















            NetworkStats stats = rollupNetworkStatsByFGBG(













                    nsf.readNetworkStatsDetail(NetworkStats.UID_ALL, ifaces, NetworkStats.TAG_NONE, null));













                    mNetworkStatsService.getDetailedUidStats(ifaces));















            addNetworkStats(tagId, pulledData, stats, true);













        } catch (java.io.IOException e) {













        } catch (RemoteException e) {















            Slog.e(TAG, "Pulling netstats for mobile bytes w/ fg/bg has error", e);















        } finally {















            Binder.restoreCallingIdentity(token);