From 3396b385145ad5af32c70dd2f9e582dd3800be1c Mon Sep 17 00:00:00 2001 From: Randy Pan Date: Wed, 27 Jul 2016 13:20:51 -0700 Subject: [PATCH] DO NOT MERGE ANYWHERE: Deprecate QNS network disable reason BAD_LINK WifiNetworkAgent#unwanted no longer disables the network. Note: this CL is a cherry-pick of ag/1292017, as that CL cannot be submitted until after N DR cutoff date (expect submission on 8/18). Bug: 28558417 Change-Id: I2e7ed99ae4cb952f124c673376d967eeee2b4ece (cherry picked from commit 7d82f98b8f2d8bd7b46e35599e4994cd6e23c03e) --- wifi/java/android/net/wifi/WifiConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 9d0c20ce4c5d1..d3d5ea05c1af5 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -817,6 +817,7 @@ public class WifiConfiguration implements Parcelable { */ public static final int NETWORK_SELECTION_ENABLE = 0; /** + * @deprecated it is not used any more. * This network is disabled because higher layer (>2) network is bad */ public static final int DISABLED_BAD_LINK = 1; @@ -862,7 +863,7 @@ public class WifiConfiguration implements Parcelable { */ private static final String[] QUALITY_NETWORK_SELECTION_DISABLE_REASON = { "NETWORK_SELECTION_ENABLE", - "NETWORK_SELECTION_DISABLED_BAD_LINK", + "NETWORK_SELECTION_DISABLED_BAD_LINK", // deprecated "NETWORK_SELECTION_DISABLED_ASSOCIATION_REJECTION ", "NETWORK_SELECTION_DISABLED_AUTHENTICATION_FAILURE", "NETWORK_SELECTION_DISABLED_DHCP_FAILURE",