summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2020-07-28 18:46:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-28 18:46:51 +0000
commitb40e2d2048acbb3b2ed3162342f23a66c204a1cb (patch)
tree1e73aa0954bfcb975a5cb9e8b8acc2eff65a7ee5
parentd5be65f2817e4236511293cfe187c64343419d92 (diff)
parente90c22ad7bdc46831692b076b9873fc1c21aad18 (diff)
Set the NetworkInfo subtype to 0. am: a40ff70cad am: 4034ddfa74 am: e90c22ad7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826 Change-Id: Ieaa50d69279868c4a7bf068e24094881ae7baf1e
-rw-r--r--core/java/android/net/NetworkAgent.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java
index 482d2d2192b8..327e42bdd2f7 100644
--- a/core/java/android/net/NetworkAgent.java
+++ b/core/java/android/net/NetworkAgent.java
@@ -354,8 +354,7 @@ 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.
- final NetworkInfo ni = new NetworkInfo(config.legacyType, config.legacyType,
- config.legacyTypeName, "");
+ final NetworkInfo ni = new NetworkInfo(config.legacyType, 0, config.legacyTypeName, "");
ni.setIsAvailable(true);
ni.setExtraInfo(config.getLegacyExtraInfo());
return ni;