Merge "[ST05.1] Fill legacy type for test network" am: 853c866d67

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2489216

Change-Id: Ie972420b42f198dfda47c5abfccd56b923a25a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -310,9 +310,11 @@ class TestNetworkService extends ITestNetworkManager.Stub {
                     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;