commit e4d25c42878477874a23bea783cae3d4a64d8d32
author Chalard Jean <jchalard@google.com> Thu Oct 29 12:31:03 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 29 12:31:03 2020 +0000
tree 569210ac05d8cc8b7bf7f1b6fb60df85b57b83cd
parent 04710577a44dc518e4c60e2cc08106b161c865cb
parent 3a7110e1606d04a4c92dd33126d73459718e70ea

Merge "Fix a bug where modern network agents start in UNKNOWN"

core/java/android/net/NetworkAgent.java

diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java
index 327e42b..44ebff9 100644
--- a/core/java/android/net/NetworkAgent.java
+++ b/core/java/android/net/NetworkAgent.java
@@ -353,10 +353,11 @@
 
     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.
+        // with 0 (TelephonyManager.NETWORK_TYPE_UNKNOWN) and an empty description.
         final NetworkInfo ni = new NetworkInfo(config.legacyType, 0, config.legacyTypeName, "");
         ni.setIsAvailable(true);
-        ni.setExtraInfo(config.getLegacyExtraInfo());
+        ni.setDetailedState(NetworkInfo.DetailedState.CONNECTING, null /* reason */,
+                config.getLegacyExtraInfo());
         return ni;
     }