Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3396b385 authored by Randy Pan's avatar Randy Pan Committed by Christine Hallstrom
Browse files

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 7d82f98b)
parent f5243cce

wifi/java/android/net/wifi/WifiConfiguration.java

+2 −1
Original line number Diff line number Diff line
@@ -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",