diff options
| author | 2016-01-20 19:27:12 +0000 | |
|---|---|---|
| committer | 2016-01-20 19:27:12 +0000 | |
| commit | 77eb57976e67c36b33d1e3ad17ec9f4033b09398 (patch) | |
| tree | 1d4fec2c2087cae65219085057ee081ebc136d48 | |
| parent | e2b73804f375a2d98ca21d4d1821a44dd3c52289 (diff) | |
| parent | 90a3841994b40aeb1c3a7a6b78dd804e49eb5e13 (diff) | |
Merge "Phone reboots after connect-disconnect-reconnect to GoPro" into mm-wireless-dev
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 0c06ae8300cd..8838f3fe2871 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -760,7 +760,8 @@ public class WifiConfiguration implements Parcelable { * selection status value as index to extec the corresponding debug string */ private static final String[] QUALITY_NETWORK_SELECTION_STATUS = { - "NETWORK_SELECTION_ENABLED", "NETWORK_SELECTION_TEMPORARY_DISABLED", + "NETWORK_SELECTION_ENABLED", + "NETWORK_SELECTION_TEMPORARY_DISABLED", "NETWORK_SELECTION_PERMANENTLY_DISABLED"}; //Quality Network disabled reasons @@ -813,12 +814,15 @@ public class WifiConfiguration implements Parcelable { * Quality network selection disable reason String (for debug purpose) */ private static final String[] QUALITY_NETWORK_SELECTION_DISABLE_REASON = { - "NETWORK_SELECTION_ENABLE", "NETWORK_SELECTION_DISABLED_BAD_LINK", + "NETWORK_SELECTION_ENABLE", + "NETWORK_SELECTION_DISABLED_BAD_LINK", "NETWORK_SELECTION_DISABLED_ASSOCIATION_REJECTION ", "NETWORK_SELECTION_DISABLED_AUTHENTICATION_FAILURE", "NETWORK_SELECTION_DISABLED_DHCP_FAILURE", - "NETWORK_SELECTION_DISABLED_DNS_FAILURE", "NETWORK_SELECTION_DISABLED_TLS_VERSION", + "NETWORK_SELECTION_DISABLED_DNS_FAILURE", + "NETWORK_SELECTION_DISABLED_TLS_VERSION", "NETWORK_SELECTION_DISABLED_AUTHENTICATION_NO_CREDENTIALS", + "NETWORK_SELECTION_DISABLED_NO_INTERNET", "NETWORK_SELECTION_DISABLED_BY_WIFI_MANAGER"}; /** |