commit 45aaca98120baf57b452fb62f216655e6f5243be
author Junyu Lai <junyulai@google.com> Mon Feb 28 07:04:28 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 28 07:04:28 2022 +0000
tree 9be0422c8cec80853ef598a8e928c949a5907e09
parent 0eb1037a53a6bebbabd8c298426a038a2fc984d1
parent ef74878ca24553f03a5b291e339c1f7e7ec15356

[MS62.1] Start NetworkStatsService from the module am: 01a87ca336 am: ef74878ca2

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

Change-Id: Id02c10cf56a14768cff58b585915668ddc97d0f9

framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java

diff --git a/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java b/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java
index 577ac54..9bffbfb 100644
--- a/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java
+++ b/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java
@@ -18,6 +18,7 @@
 
 import android.annotation.SystemApi;
 import android.app.SystemServiceRegistry;
+import android.app.usage.NetworkStatsManager;
 import android.content.Context;
 import android.net.nsd.INsdManager;
 import android.net.nsd.NsdManager;
@@ -57,5 +58,15 @@
                     return new IpSecManager(context, service);
                 }
         );
+
+        SystemServiceRegistry.registerContextAwareService(
+                Context.NETWORK_STATS_SERVICE,
+                NetworkStatsManager.class,
+                (context, serviceBinder) -> {
+                    INetworkStatsService service =
+                            INetworkStatsService.Stub.asInterface(serviceBinder);
+                    return new NetworkStatsManager(context, service);
+                }
+        );
     }
 }