From 8f060d7148d5c7cdc4de4df9fdf7536c4e6afaae Mon Sep 17 00:00:00 2001
From: Sundeep Ghuman <sghuman@google.com>
Date: Mon, 13 Mar 2017 15:52:40 -0700
Subject: [PATCH] Fix calculation of Access Point Level.

Bug: b/35854026
Test: make RunSettingsRoboTests
Change-Id: I5287e8c7b46a463cfa25659c756f6ca9175cb68c
---
 res/values/arrays.xml                           | 1 +
 src/com/android/settings/wifi/WifiSettings.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 8b172fa4104..89805689e85 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -319,6 +319,7 @@
     <!-- Match this with drawable.wifi_signal. --> <skip />
     <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
     <string-array name="wifi_signal">
+        <item>Poor</item>
         <item>Poor</item>
         <item>Fair</item>
         <item>Good</item>
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 91676a13ecc..320819b338f 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -642,7 +642,7 @@ public class WifiSettings extends RestrictedSettingsFragment
                 for (; index < numAccessPointsToShow; index++) {
                     AccessPoint accessPoint = accessPoints.get(index);
                     // Ignore access points that are out of range.
-                    if (accessPoint.getLevel() != -1) {
+                    if (accessPoint.isReachable()) {
                         String key = accessPoint.getBssid();
                         if (TextUtils.isEmpty(key)) {
                             key = accessPoint.getSsidStr();