Set the NetworkInfo subtype to 0. am: a40ff70cad am: 4034ddfa74

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826

Change-Id: I7f2ad14c428043cd0ee7ec8e0e3ea608e1ce4985
This commit is contained in:
Lorenzo Colitti
2020-07-28 18:28:44 +00:00
committed by Automerger Merge Worker

View File

@@ -354,8 +354,7 @@ public abstract class NetworkAgent {
private static NetworkInfo getLegacyNetworkInfo(final NetworkAgentConfig config) { private static NetworkInfo getLegacyNetworkInfo(final NetworkAgentConfig config) {
// The subtype can be changed with (TODO) setLegacySubtype, but it starts // The subtype can be changed with (TODO) setLegacySubtype, but it starts
// with the type and an empty description. // with the type and an empty description.
final NetworkInfo ni = new NetworkInfo(config.legacyType, config.legacyType, final NetworkInfo ni = new NetworkInfo(config.legacyType, 0, config.legacyTypeName, "");
config.legacyTypeName, "");
ni.setIsAvailable(true); ni.setIsAvailable(true);
ni.setExtraInfo(config.getLegacyExtraInfo()); ni.setExtraInfo(config.getLegacyExtraInfo());
return ni; return ni;