Merge "Show security info in saved network list" into oc-dev am: ecd1df1076

am: 183aed6dd6 Change-Id: Ib479ee98d5c6500954e5dede317f46c19bc2aca6
2017-05-16 15:39:57 +00:00
parent 470503e984 183aed6dd6
commit b8548f762c
2 changed files with 16 additions and 5 deletions
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -372,7 +372,11 @@ public class WifiConfigController implements TextWatcher,
        group.addView(row);
    }

-    private String getSignalString() {
+    @VisibleForTesting
+    String getSignalString() {
+        if (!mAccessPoint.isReachable()) {
+            return null;
+        }
        final int level = mAccessPoint.getLevel();

        return (level > -1 && level < mLevels.length) ? mLevels[level] : null;