summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAaron Huang <huangaaron@google.com>2020-03-02 04:53:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-03-02 04:53:10 +0000
commitac916d6e2bf940f712b284951e9d29a896f89888 (patch)
treeed3b62aa77e53ea63da01eb202c20db4f6ab172c /core/java/android
parent6bd37ba78809a4741c9e3ef87c977406e4d124a6 (diff)
parentbb2bdb87a8a0c282e0a6f9c7a3102d7214bc02c4 (diff)
Merge "Always set NetworkInfo objects to available."
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/NetworkAgent.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java
index 7ab981adae8b..c063b396aa19 100644
--- a/core/java/android/net/NetworkAgent.java
+++ b/core/java/android/net/NetworkAgent.java
@@ -301,7 +301,10 @@ public abstract class NetworkAgent {
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.
- return new NetworkInfo(config.legacyType, config.legacyType, config.legacyTypeName, "");
+ final NetworkInfo ni = new NetworkInfo(config.legacyType, config.legacyType,
+ config.legacyTypeName, "");
+ ni.setIsAvailable(true);
+ return ni;
}
/**