Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE ANYWHERE: Deprecate QNS network disable reason BAD_LINK

Browse Source 
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 7d82f98b8f)
This commit is contained in:
Randy Pan
2016-07-27 13:20:51 -07:00
committed by Christine Hallstrom
parent f5243ccef0
commit 3396b38514
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -817,6 +817,7 @@ public class WifiConfiguration implements Parcelable {
*/ */
public static final int NETWORK_SELECTION_ENABLE = 0; 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 * This network is disabled because higher layer (>2) network is bad
*/ */
public static final int DISABLED_BAD_LINK = 1; 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 = { private static final String[] QUALITY_NETWORK_SELECTION_DISABLE_REASON = {
"NETWORK_SELECTION_ENABLE", "NETWORK_SELECTION_ENABLE",
"NETWORK_SELECTION_DISABLED_BAD_LINK", "NETWORK_SELECTION_DISABLED_BAD_LINK", // deprecated
"NETWORK_SELECTION_DISABLED_ASSOCIATION_REJECTION ", "NETWORK_SELECTION_DISABLED_ASSOCIATION_REJECTION ",
"NETWORK_SELECTION_DISABLED_AUTHENTICATION_FAILURE", "NETWORK_SELECTION_DISABLED_AUTHENTICATION_FAILURE",
"NETWORK_SELECTION_DISABLED_DHCP_FAILURE", "NETWORK_SELECTION_DISABLED_DHCP_FAILURE",