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

Add a disabled reason for recommendation providers am: a70bc57ef9

Browse Source 
am: df6f7b9388

Change-Id: Id69eccbba15a0eb20c48680204007ed5354bd734
This commit is contained in:
Amin Shaikh
2017-02-23 20:39:57 +00:00
committed by android-build-merger
parent 9bda68ffb7 df6f7b9388
commit 004a682135
3 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/res/values/strings.xml
View File

@@ -57,6 +57,8 @@
<string name="wifi_disabled_generic">Disabled</string> <string name="wifi_disabled_generic">Disabled</string>
<!-- Status for networked disabled from a DNS or DHCP failure --> <!-- Status for networked disabled from a DNS or DHCP failure -->
<string name="wifi_disabled_network_failure">IP Configuration Failure</string> <string name="wifi_disabled_network_failure">IP Configuration Failure</string>
<!-- Status for networks disabled by the network recommendation provider -->
<string name="wifi_disabled_by_recommendation_provider">Not connected due to low quality network</string>
<!-- Status for networked disabled from a wifi association failure --> <!-- Status for networked disabled from a wifi association failure -->
<string name="wifi_disabled_wifi_failure">WiFi Connection Failure</string> <string name="wifi_disabled_wifi_failure">WiFi Connection Failure</string>
<!-- Status for networks disabled from authentication failure (wrong password <!-- Status for networks disabled from authentication failure (wrong password

2
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -450,6 +450,8 @@ public class AccessPoint implements Comparable<AccessPoint> {
summary.append(mContext.getString(R.string.wifi_disabled_generic)); summary.append(mContext.getString(R.string.wifi_disabled_generic));
break; break;
} }
} else if (config != null && config.getNetworkSelectionStatus().isNotRecommended()) {
summary.append(mContext.getString(R.string.wifi_disabled_by_recommendation_provider));
} else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range } else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range
summary.append(mContext.getString(R.string.wifi_not_in_range)); summary.append(mContext.getString(R.string.wifi_not_in_range));
} else { // In range, not disabled. } else { // In range, not disabled.

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

@@ -851,6 +851,7 @@ public class WifiConfiguration implements Parcelable {
* This network is disabled because EAP-TLS failure * This network is disabled because EAP-TLS failure
*/ */
public static final int DISABLED_TLS_VERSION_MISMATCH = 7; public static final int DISABLED_TLS_VERSION_MISMATCH = 7;
// Values above are for temporary disablement; values below are for permanent disablement.
/** /**
* This network is disabled due to absence of user credentials * This network is disabled due to absence of user credentials
*/ */
@@ -974,6 +975,28 @@ public class WifiConfiguration implements Parcelable {
*/ */
private boolean mHasEverConnected; private boolean mHasEverConnected;
/**
* Boolean indicating whether {@link com.android.server.wifi.RecommendedNetworkEvaluator}
* chose not to connect to this network in the last qualified network selection process.
*/
private boolean mNotRecommended;
/**
* Set whether {@link com.android.server.wifi.RecommendedNetworkEvaluator} does not
* recommend connecting to this network.
*/
public void setNotRecommended(boolean notRecommended) {
mNotRecommended = notRecommended;
}
/**
* Returns whether {@link com.android.server.wifi.RecommendedNetworkEvaluator} does not
* recommend connecting to this network.
*/
public boolean isNotRecommended() {
return mNotRecommended;
}
/** /**
* set whether this network is visible in latest Qualified Network Selection * set whether this network is visible in latest Qualified Network Selection
* @param seen value set to candidate * @param seen value set to candidate
@@ -1297,6 +1320,7 @@ public class WifiConfiguration implements Parcelable {
dest.writeInt(CONNECT_CHOICE_NOT_EXISTS); dest.writeInt(CONNECT_CHOICE_NOT_EXISTS);
} }
dest.writeInt(getHasEverConnected() ? 1 : 0); dest.writeInt(getHasEverConnected() ? 1 : 0);
dest.writeInt(isNotRecommended() ? 1 : 0);
} }
public void readFromParcel(Parcel in) { public void readFromParcel(Parcel in) {
@@ -1316,6 +1340,7 @@ public class WifiConfiguration implements Parcelable {
setConnectChoiceTimestamp(INVALID_NETWORK_SELECTION_DISABLE_TIMESTAMP); setConnectChoiceTimestamp(INVALID_NETWORK_SELECTION_DISABLE_TIMESTAMP);
} }
setHasEverConnected(in.readInt() != 0); setHasEverConnected(in.readInt() != 0);
setNotRecommended(in.readInt() != 0);
} }
} }