commit c9334c79a9929717fba374a3f1c090251693af3e
author Junyu Lai <junyulai@google.com> Wed Mar 15 11:25:45 2023 +0800
committer Junyu Lai <junyulai@google.com> Wed Mar 15 12:05:43 2023 +0800
tree 9f658fb7e784915bbae552880475322d49ed2ed5
parent 193a7d6f8ffbcdef57189befc1619dd7d93d3e0f

[ST05.1] Fill legacy type for test network

For testing purpose, fill legacy type for NetworkStatsService
since it does not support transport types.

Test: atest android.net.NetworkStatsIntegrationTest
Bug: 139774492
Change-Id: I49b8b7b23c3b14e873698f81b09d3be3dcfc36c7

service/src/com/android/server/TestNetworkService.java

diff --git a/service/src/com/android/server/TestNetworkService.java b/service/src/com/android/server/TestNetworkService.java
index 5549fbe..843b7b3 100644
--- a/service/src/com/android/server/TestNetworkService.java
+++ b/service/src/com/android/server/TestNetworkService.java
@@ -310,9 +310,11 @@
                     NetworkStackConstants.IPV6_ADDR_ANY, 0), null, iface));
         }
 
+        // For testing purpose, fill legacy type for NetworkStatsService since it does not
+        // support transport types.
         final TestNetworkAgent agent = new TestNetworkAgent(context, looper, nc, lp,
-                new NetworkAgentConfig.Builder().build(), callingUid, binder,
-                mNetworkProvider);
+                new NetworkAgentConfig.Builder().setLegacyType(ConnectivityManager.TYPE_TEST)
+                        .build(), callingUid, binder, mNetworkProvider);
         agent.register();
         agent.markConnected();
         return agent;