commit 9434252a9b9d4f99e077d9d73e064076b99a594f
author android-build-team Robot <android-build-team-robot@google.com> Wed Jul 29 04:05:49 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jul 29 04:05:49 2020 +0000
tree ec6f235bda06442ebb68cfc5ae10ec8c889805bd
parent 87a6fd7acd7ad2b128026082884e584ade5d95ed
parent e95a490dd1fdeeb64a2e19e71f5b7685a10040be

Merge cherrypicks of [12257241, 12257478, 12257643, 12257707, 12257297, 12257742, 12257668, 12257743, 12257513, 12257278, 12257279, 12257514, 12257644, 12257669, 12257670, 12257671] into rvc-release

Change-Id: I3669363c1b98ac139f341e0bd898cbbff15cb061

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;