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

Commit c87691c3 authored by Chiachang Wang's avatar Chiachang Wang Committed by Android (Google) Code Review
Browse files

Merge "Have the DataConnectionStat started from BSS"

parents 3cc89c0a 39c303a8

services/core/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ filegroup { 
        "java/com/android/server/TestNetworkService.java",

        "java/com/android/server/connectivity/AutodestructReference.java",

        "java/com/android/server/connectivity/ConnectivityConstants.java",

        "java/com/android/server/connectivity/DataConnectionStats.java",

        "java/com/android/server/connectivity/DnsManager.java",

        "java/com/android/server/connectivity/KeepaliveTracker.java",

        "java/com/android/server/connectivity/LingerMonitor.java",

services/core/java/com/android/server/ConnectivityService.java

+0 −4
Original line number Diff line number Diff line
@@ -203,7 +203,6 @@ import com.android.net.module.util.LinkPropertiesUtils.CompareResult; 
import com.android.net.module.util.PermissionUtils;

import com.android.server.am.BatteryStatsService;

import com.android.server.connectivity.AutodestructReference;

import com.android.server.connectivity.DataConnectionStats;

import com.android.server.connectivity.DnsManager;

import com.android.server.connectivity.DnsManager.PrivateDnsValidationUpdate;

import com.android.server.connectivity.KeepaliveTracker;
@@ -1213,9 +1212,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        mSettingsObserver = new SettingsObserver(mContext, mHandler);

        registerSettingsCallbacks();



        final DataConnectionStats dataConnectionStats = new DataConnectionStats(mContext, mHandler);

        dataConnectionStats.startMonitoring();



        mKeepaliveTracker = new KeepaliveTracker(mContext, mHandler);

        mNotifier = new NetworkNotificationManager(mContext, mTelephonyManager);

        mQosCallbackTracker = new QosCallbackTracker(mHandler, mNetworkRequestCounter);

services/core/java/com/android/server/am/BatteryStatsService.java

+4 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ import com.android.internal.util.ParseUtils; 
import com.android.internal.util.function.pooled.PooledLambda;

import com.android.server.LocalServices;

import com.android.server.Watchdog;

import com.android.server.connectivity.DataConnectionStats;

import com.android.server.net.BaseNetworkObserver;

import com.android.server.pm.UserManagerInternal;
@@ -346,6 +347,9 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
        }



        Watchdog.getInstance().addMonitor(this);



        final DataConnectionStats dataConnectionStats = new DataConnectionStats(mContext, mHandler);

        dataConnectionStats.startMonitoring();

    }



    private final class LocalService extends BatteryStatsInternal {