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

Commit 72baa1de authored by Roshan Pius's avatar Roshan Pius Committed by Mitchell Wills
Browse files

WifiConfiguration: Add new selection disable reasons 

1. Add a new "permanently" disabled network selection status for disabling
networks after a user switch.
2. Add a new "temporarily" disabled network selection status for disabling
networks when WPS is enabled.

BUG: 28219928
Change-Id: I4ab7333ebaa830dadf73f317fd6bb81a02054235
(cherry picked from commit a6fac3eb)
parent 5e680daa

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

+18 −7
Original line number Diff line number Diff line
@@ -836,26 +836,34 @@ public class WifiConfiguration implements Parcelable { 
         * This network is disabled because of security network but no credentials

         */

        public static final int DISABLED_DNS_FAILURE = 5;

        /**

         * This network is disabled because we started WPS

         */

        public static final int DISABLED_WPS_START = 6;

        /**

         * This network is disabled because EAP-TLS failure

         */

        public static final int DISABLED_TLS_VERSION_MISMATCH = 6;

        public static final int DISABLED_TLS_VERSION_MISMATCH = 7;

        /**

         * This network is disabled due to WifiManager disable it explicitly

         * This network is disabled due to absence of user credentials

         */

        public static final int DISABLED_AUTHENTICATION_NO_CREDENTIALS = 7;

        public static final int DISABLED_AUTHENTICATION_NO_CREDENTIALS = 8;

        /**

         * This network is disabled because no Internet connected and user do not want

         */

        public static final int DISABLED_NO_INTERNET = 8;

        public static final int DISABLED_NO_INTERNET = 9;

        /**

         * This network is disabled due to WifiManager disable it explicitly

         */

        public static final int DISABLED_BY_WIFI_MANAGER = 9;

        public static final int DISABLED_BY_WIFI_MANAGER = 10;

        /**

         * This network is disabled due to user switching

         */

        public static final int DISABLED_DUE_TO_USER_SWITCH = 11;

        /**

         * This Maximum disable reason value

         */

        public static final int NETWORK_SELECTION_DISABLED_MAX = 10;

        public static final int NETWORK_SELECTION_DISABLED_MAX = 12;



        /**

         * Quality network selection disable reason String (for debug purpose)
@@ -867,10 +875,13 @@ public class WifiConfiguration implements Parcelable { 
                "NETWORK_SELECTION_DISABLED_AUTHENTICATION_FAILURE",

                "NETWORK_SELECTION_DISABLED_DHCP_FAILURE",

                "NETWORK_SELECTION_DISABLED_DNS_FAILURE",

                "NETWORK_SELECTION_DISABLED_WPS_START",

                "NETWORK_SELECTION_DISABLED_TLS_VERSION",

                "NETWORK_SELECTION_DISABLED_AUTHENTICATION_NO_CREDENTIALS",

                "NETWORK_SELECTION_DISABLED_NO_INTERNET",

                "NETWORK_SELECTION_DISABLED_BY_WIFI_MANAGER"};

                "NETWORK_SELECTION_DISABLED_BY_WIFI_MANAGER",

                "NETWORK_SELECTION_DISABLED_BY_USER_SWITCH"

        };



        /**

         * Invalid time stamp for network selection disable