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

Merge "Phone reboots after connect-disconnect-reconnect to GoPro" into mm-wireless-dev

Browse Source
This commit is contained in:
xin He
2016-01-20 19:27:12 +00:00
committed by Android Partner Code Review
parent e2b73804f3 90a3841994
commit 77eb57976e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -760,7 +760,8 @@ public class WifiConfiguration implements Parcelable {
* selection status value as index to extec the corresponding debug string * selection status value as index to extec the corresponding debug string
*/ */
private static final String[] QUALITY_NETWORK_SELECTION_STATUS = { 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"}; "NETWORK_SELECTION_PERMANENTLY_DISABLED"};
//Quality Network disabled reasons //Quality Network disabled reasons
@@ -813,12 +814,15 @@ public class WifiConfiguration implements Parcelable {
* Quality network selection disable reason String (for debug purpose) * Quality network selection disable reason String (for debug purpose)
*/ */
private static final String[] QUALITY_NETWORK_SELECTION_DISABLE_REASON = { 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_ASSOCIATION_REJECTION ",
"NETWORK_SELECTION_DISABLED_AUTHENTICATION_FAILURE", "NETWORK_SELECTION_DISABLED_AUTHENTICATION_FAILURE",
"NETWORK_SELECTION_DISABLED_DHCP_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_AUTHENTICATION_NO_CREDENTIALS",
"NETWORK_SELECTION_DISABLED_NO_INTERNET",
"NETWORK_SELECTION_DISABLED_BY_WIFI_MANAGER"}; "NETWORK_SELECTION_DISABLED_BY_WIFI_MANAGER"};
/** /**