diff options
author | Yuhao Zheng <yuhaozheng@google.com> | 2014-01-07 19:39:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-07 19:39:13 +0000 |
commit | f20f5ce89a69df864b2e2a7437c3154c03c4d48d (patch) | |
tree | eb325ccf7a16eaec8a517d9616d53dc4c6b74fa6 | |
parent | ecc1730a9ca968bd16cf1e16e819ffd0d43c4321 (diff) | |
parent | 6c81d90be3cc2b36b5ccdb8f5f9911778fd0971b (diff) | |
download | packages_apps_Settings-f20f5ce89a69df864b2e2a7437c3154c03c4d48d.zip packages_apps_Settings-f20f5ce89a69df864b2e2a7437c3154c03c4d48d.tar.gz packages_apps_Settings-f20f5ce89a69df864b2e2a7437c3154c03c4d48d.tar.bz2 |
Merge "Make wifi dialog persist after orientation change"
-rw-r--r-- | src/com/android/settings/wifi/AccessPoint.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java index c4d1f7c..81706c9 100644 --- a/src/com/android/settings/wifi/AccessPoint.java +++ b/src/com/android/settings/wifi/AccessPoint.java @@ -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; } |