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

Commit 01f9b471 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge "Revert "WifiConfiguration: Add a new temp blacklist reason for disconnect""

parents cddc4131 33798c77

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

+9 −20
Original line number Diff line number Diff line
@@ -1171,49 +1171,39 @@ public class WifiConfiguration implements Parcelable { 
         * This network is disabled because EAP-TLS failure

         */

        public static final int DISABLED_TLS_VERSION_MISMATCH = 8;

        /**

         * This network is disabled due to WifiManager.disconnect() call.

         */

        public static final int DISABLED_BY_WIFI_MANAGER_DISCONNECT = 9;



        // Values above are for temporary disablement; values below are for permanent disablement.

        /**

         * The starting index for permanent network selection disabled reasons

         */

        public static final int NETWORK_SELECTION_DISABLED_PERMANENT_STARTING_INDEX = 10;

        /**

         * This network is disabled due to absence of user credentials

         */

        public static final int DISABLED_AUTHENTICATION_NO_CREDENTIALS = 10;

        public static final int DISABLED_AUTHENTICATION_NO_CREDENTIALS = 9;

        /**

         * This network is permanently disabled because it has no Internet access and user does not

         * want to stay connected.

         */

        public static final int DISABLED_NO_INTERNET_PERMANENT = 11;

        public static final int DISABLED_NO_INTERNET_PERMANENT = 10;

        /**

         * This network is disabled due to WifiManager.disable() call.

         * This network is disabled due to WifiManager disable it explicitly

         */

        public static final int DISABLED_BY_WIFI_MANAGER = 12;

        public static final int DISABLED_BY_WIFI_MANAGER = 11;

        /**

         * This network is disabled due to user switching

         */

        public static final int DISABLED_DUE_TO_USER_SWITCH = 13;

        public static final int DISABLED_DUE_TO_USER_SWITCH = 12;

        /**

         * This network is disabled due to wrong password

         */

        public static final int DISABLED_BY_WRONG_PASSWORD = 14;

        public static final int DISABLED_BY_WRONG_PASSWORD = 13;

        /**

         * This network is disabled because service is not subscribed

         */

        public static final int DISABLED_AUTHENTICATION_NO_SUBSCRIPTION = 15;

        public static final int DISABLED_AUTHENTICATION_NO_SUBSCRIPTION = 14;

        /**

         * This Maximum disable reason value

         */

        public static final int NETWORK_SELECTION_DISABLED_MAX = 16;

        public static final int NETWORK_SELECTION_DISABLED_MAX = 15;



        /**

         * Quality network selection disable reason String (for debug purposes & configuration

         * storage)

         * Quality network selection disable reason String (for debug purpose)

         */

        public static final String[] QUALITY_NETWORK_SELECTION_DISABLE_REASON = {

                "NETWORK_SELECTION_ENABLE",
@@ -1225,7 +1215,6 @@ public class WifiConfiguration implements Parcelable { 
                "NETWORK_SELECTION_DISABLED_NO_INTERNET_TEMPORARY",

                "NETWORK_SELECTION_DISABLED_WPS_START",

                "NETWORK_SELECTION_DISABLED_TLS_VERSION",

                "NETWORK_SELECTION_DISABLED_BY_WIFI_MANAGER_DISCONNECT",

                "NETWORK_SELECTION_DISABLED_AUTHENTICATION_NO_CREDENTIALS",

                "NETWORK_SELECTION_DISABLED_NO_INTERNET_PERMANENT",

                "NETWORK_SELECTION_DISABLED_BY_WIFI_MANAGER",