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

Merge "Fix testRegisterUsageCallback failure in setUp"

Browse Source 
am: 3e4562b391

Change-Id: I516bab9b9b6c5f48845f18d0e2ab8b47f0f809de
This commit is contained in:
Remi NGUYEN VAN
2018-08-17 01:48:48 -07:00
committed by android-build-merger
parent 7a5bf4e2dd 3e4562b391
commit 7026ccd445
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -324,6 +324,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
wakeLock, getDefaultClock(), TelephonyManager.getDefault(), wakeLock, getDefaultClock(), TelephonyManager.getDefault(),
new DefaultNetworkStatsSettings(context), new NetworkStatsObservers(), new DefaultNetworkStatsSettings(context), new NetworkStatsObservers(),
getDefaultSystemDir(), getDefaultBaseDir()); getDefaultSystemDir(), getDefaultBaseDir());
service.registerLocalService();
HandlerThread handlerThread = new HandlerThread(TAG); HandlerThread handlerThread = new HandlerThread(TAG);
Handler.Callback callback = new HandlerCallback(service); Handler.Callback callback = new HandlerCallback(service);
@@ -333,6 +334,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
return service; return service;
} }
// This must not be called outside of tests, even within the same package, as this constructor
// does not register the local service. Use the create() helper above.
@VisibleForTesting @VisibleForTesting
NetworkStatsService(Context context, INetworkManagementService networkManager, NetworkStatsService(Context context, INetworkManagementService networkManager,
AlarmManager alarmManager, PowerManager.WakeLock wakeLock, Clock clock, AlarmManager alarmManager, PowerManager.WakeLock wakeLock, Clock clock,
@@ -349,7 +352,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
mSystemDir = checkNotNull(systemDir, "missing systemDir"); mSystemDir = checkNotNull(systemDir, "missing systemDir");
mBaseDir = checkNotNull(baseDir, "missing baseDir"); mBaseDir = checkNotNull(baseDir, "missing baseDir");
mUseBpfTrafficStats = new File("/sys/fs/bpf/traffic_uid_stats_map").exists(); mUseBpfTrafficStats = new File("/sys/fs/bpf/traffic_uid_stats_map").exists();
}
private void registerLocalService() {
LocalServices.addService(NetworkStatsManagerInternal.class, LocalServices.addService(NetworkStatsManagerInternal.class,
new NetworkStatsManagerInternalImpl()); new NetworkStatsManagerInternalImpl());
} }