LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MS33.1] Remove NetdService dependency

Browse Source 
This change pass INetd to NetworkStatsFactory to replace
NetdService#getNetdInstance.

Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: I39b278989cea06dd316f21214380b5c4b54d2d50
This commit is contained in:
Junyu Lai
2022-01-03 12:30:03 +00:00
parent e0d31a072d
commit 544e5836c0
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
service-t/src/com/android/server/net/NetworkStatsFactory.java
View File

@@ -24,11 +24,11 @@ import static android.net.NetworkStats.UID_ALL;
import static com.android.server.NetworkManagementSocketTagger.kernelToTag; import static com.android.server.NetworkManagementSocketTagger.kernelToTag;
import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.net.INetd; import android.net.INetd;
import android.net.NetworkStats; import android.net.NetworkStats;
import android.net.UnderlyingNetworkInfo; import android.net.UnderlyingNetworkInfo;
import android.net.util.NetdService;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.StrictMode; import android.os.StrictMode;
import android.os.SystemClock; import android.os.SystemClock;
@@ -70,7 +70,7 @@ public class NetworkStatsFactory {
private final boolean mUseBpfStats; private final boolean mUseBpfStats;
private INetd mNetdService; private final INetd mNetd;
/** /**
* Guards persistent data access in this class * Guards persistent data access in this class
@@ -158,12 +158,12 @@ public class NetworkStatsFactory {
NetworkStats.apply464xlatAdjustments(baseTraffic, stackedTraffic, mStackedIfaces); NetworkStats.apply464xlatAdjustments(baseTraffic, stackedTraffic, mStackedIfaces);
} }
public NetworkStatsFactory() { public NetworkStatsFactory(@NonNull INetd netd) {
this(new File("/proc/"), true); this(new File("/proc/"), true, netd);
} }
@VisibleForTesting @VisibleForTesting
public NetworkStatsFactory(File procRoot, boolean useBpfStats) { public NetworkStatsFactory(File procRoot, boolean useBpfStats, @NonNull INetd netd) {
mStatsXtIfaceAll = new File(procRoot, "net/xt_qtaguid/iface_stat_all"); mStatsXtIfaceAll = new File(procRoot, "net/xt_qtaguid/iface_stat_all");
mStatsXtIfaceFmt = new File(procRoot, "net/xt_qtaguid/iface_stat_fmt"); mStatsXtIfaceFmt = new File(procRoot, "net/xt_qtaguid/iface_stat_fmt");
mStatsXtUid = new File(procRoot, "net/xt_qtaguid/stats"); mStatsXtUid = new File(procRoot, "net/xt_qtaguid/stats");
@@ -172,6 +172,7 @@ public class NetworkStatsFactory {
mPersistSnapshot = new NetworkStats(SystemClock.elapsedRealtime(), -1); mPersistSnapshot = new NetworkStats(SystemClock.elapsedRealtime(), -1);
mTunAnd464xlatAdjustedStats = new NetworkStats(SystemClock.elapsedRealtime(), -1); mTunAnd464xlatAdjustedStats = new NetworkStats(SystemClock.elapsedRealtime(), -1);
} }
mNetd = netd;
} }
public NetworkStats readBpfNetworkStatsDev() throws IOException { public NetworkStats readBpfNetworkStatsDev() throws IOException {
@@ -298,10 +299,7 @@ public class NetworkStatsFactory {
// Ask netd to do a active map stats swap. When the binder call successfully returns, // Ask netd to do a active map stats swap. When the binder call successfully returns,
// the system server should be able to safely read and clean the inactive map // the system server should be able to safely read and clean the inactive map
// without race problem. // without race problem.
if (mNetdService == null) { mNetd.trafficSwapActiveStatsMap();
mNetdService = NetdService.getInstance();
}
mNetdService.trafficSwapActiveStatsMap();
} }
/** /**

6
service-t/src/com/android/server/net/NetworkStatsService.java
View File

@@ -89,6 +89,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.net.DataUsageRequest; import android.net.DataUsageRequest;
import android.net.INetd;
import android.net.INetworkManagementEventObserver; import android.net.INetworkManagementEventObserver;
import android.net.INetworkStatsService; import android.net.INetworkStatsService;
import android.net.INetworkStatsSession; import android.net.INetworkStatsSession;
@@ -410,10 +411,11 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
PowerManager.WakeLock wakeLock = PowerManager.WakeLock wakeLock =
powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG); powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
final INetd netd = INetd.Stub.asInterface(
(IBinder) context.getSystemService(Context.NETD_SERVICE));
final NetworkStatsService service = new NetworkStatsService(context, networkManager, final NetworkStatsService service = new NetworkStatsService(context, networkManager,
alarmManager, wakeLock, getDefaultClock(), alarmManager, wakeLock, getDefaultClock(),
new DefaultNetworkStatsSettings(context), new NetworkStatsFactory(), new DefaultNetworkStatsSettings(context), new NetworkStatsFactory(netd),
new NetworkStatsObservers(), getDefaultSystemDir(), getDefaultBaseDir(), new NetworkStatsObservers(), getDefaultSystemDir(), getDefaultBaseDir(),
new Dependencies()); new Dependencies());
service.registerLocalService(); service.registerLocalService();