From 23d813be73f0ff34632668cd3fa3ce30deb4eb79 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Thu, 23 Jan 2020 09:33:48 +0900 Subject: [PATCH] Always set NetworkInfo objects to available. For all networks, NetworkInfo.isAvailble has basically always been true for all connected networks. The new NetworkAgent API sets it to false, and this causes application breakage. Always set it to true. Bug: 148126438 Test: builds, boots, searching in maps works again Change-Id: Ia9876b0ce7f02120bd05cab526346cad22cf62b3 Merged-In: Ia9876b0ce7f02120bd05cab526346cad22cf62b3 (clean cherry-pick from internal branch) --- core/java/android/net/NetworkAgent.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java index 61a1484cef..4fa6ffd0bc 100644 --- a/core/java/android/net/NetworkAgent.java +++ b/core/java/android/net/NetworkAgent.java @@ -290,7 +290,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; } /**