Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4be9a47a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Always set NetworkInfo objects to available." am: ac916d6e 

Change-Id: I89b53d1a254ca43566286b1309ce88b8a1518c4a
parents b8f0a92e ac916d6e

core/java/android/net/NetworkAgent.java

+4 −1
Original line number Diff line number Diff line
@@ -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;

    }



    /**