summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2020-07-28 18:05:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-28 18:05:12 +0000
commit4034ddfa749baef10ac02851d1f0c31b676fe85b (patch)
treec06d82fe297019e6261a735d5c146e4e6f7a0878 /core/java
parent70441941ec1a5732046185ce4d0da43ac98a3378 (diff)
parenta40ff70cad00a6c298e07c2c38e95d58074a7157 (diff)
Set the NetworkInfo subtype to 0. am: a40ff70cad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826 Change-Id: If570350574c5113763bb86943a27b9330db6b9ad
Diffstat (limited to 'core/java')
-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;