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

am: ecd1df1076 Change-Id: I068abbefd82c0447e474d6db6c38a56ea4703217
2017-05-16 15:33:36 +00:00
parent 1f21e7f325 ecd1df1076
commit 183aed6dd6
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;