PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make wifi dialog persist after orientation change"

Browse Source
This commit is contained in:
Yuhao Zheng
2014-01-07 19:39:13 +00:00
committed by Android (Google) Code Review
parent ecc1730a9c 6c81d90be3
commit f20f5ce89a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/wifi/AccessPoint.java
View File

@@ -60,7 +60,7 @@ class AccessPoint extends Preference {
String ssid;
String bssid;
int security;
int networkId;
int networkId = -1;
boolean wpsAvailable = false;
PskType pskType = PskType.UNKNOWN;
@@ -68,7 +68,7 @@ class AccessPoint extends Preference {
private WifiConfiguration mConfig;
/* package */ScanResult mScanResult;
private int mRssi;
private int mRssi = Integer.MAX_VALUE;
private WifiInfo mInfo;
private DetailedState mState;
@@ -187,7 +187,6 @@ class AccessPoint extends Preference {
bssid = config.BSSID;
security = getSecurity(config);
networkId = config.networkId;
mRssi = Integer.MAX_VALUE;
mConfig = config;
}
@@ -198,7 +197,6 @@ class AccessPoint extends Preference {
wpsAvailable = security != SECURITY_EAP && result.capabilities.contains("WPS");
if (security == SECURITY_PSK)
pskType = getPskType(result);
networkId = -1;
mRssi = result.level;
mScanResult = result;
}
@@ -276,6 +274,7 @@ class AccessPoint extends Preference {
if (security == SECURITY_PSK) {
pskType = getPskType(result);
}
mScanResult = result;
refresh();
return true;
}