commit 37db1eb217ae36885abf2c060d69a511524e30b9
author Xin Li <delphij@google.com> Wed Sep 02 12:34:03 2020 -0700
committer Xin Li <delphij@google.com> Wed Sep 02 12:34:37 2020 -0700
tree 5c8d95fe6f21c171ada293529476ac332cd7acd9
parent 6d805206facbe90406db631b13226a6716497280
parent 0fd54d232458354c3f5367fc6d8b96dc56d7306f

Merge RP1A.200720.011

Bug: 167588565
Merged-In: Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c
Change-Id: Ia8f5f008bc1f77115b644ab996aedc892fab68e7

core/java/android/net/NetworkAgent.java

diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java
index 482d2d2..327e42b 100644
--- a/core/java/android/net/NetworkAgent.java
+++ b/core/java/android/net/NetworkAgent.java
@@ -354,8 +354,7 @@
     private static NetworkInfo getLegacyNetworkInfo(final NetworkAgentConfig config) {
         // The subtype can be changed with (TODO) setLegacySubtype, but it starts
         // with the type and an empty description.
-        final NetworkInfo ni = new NetworkInfo(config.legacyType, config.legacyType,
-                config.legacyTypeName, "");
+        final NetworkInfo ni = new NetworkInfo(config.legacyType, 0, config.legacyTypeName, "");
         ni.setIsAvailable(true);
         ni.setExtraInfo(config.getLegacyExtraInfo());
         return ni;