commit fa974c590955e9ff21f8f85209d9b28b0f467458
author Robert Greenwalt <rgreenwalt@google.com> Mon Sep 13 15:53:26 2010 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Mon Sep 13 15:53:26 2010 -0700
tree e40c1335d0f916d3a031b635dd7eccc14d8bf443
parent cc5494c9996f809e36539b24e8b6b67683383d29

Fix statusbar display of wifi signalstrength

When turning a 1d array into a 2d, be sure and adjust length-checks.
bug:2995809

Change-Id: I9ff53f75958ea7808eb9f44bc05497e86f1807a2

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
index b4e0d3a..5dedcc9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
@@ -718,7 +718,6 @@
                     iconId = sWifiSignalImages[mLastWifiInetConnectivityState]
                             [mLastWifiSignalLevel];
                 }
-
                 mService.setIcon("wifi", iconId, 0);
                 // Show the icon since wi-fi is connected
                 mService.setIconVisibility("wifi", true);
@@ -1101,7 +1100,7 @@
             int iconId;
             final int newRssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200);
             int newSignalLevel = WifiManager.calculateSignalLevel(newRssi,
-                                                                  sWifiSignalImages.length);
+                                                                  sWifiSignalImages[0].length);
             if (newSignalLevel != mLastWifiSignalLevel) {
                 mLastWifiSignalLevel = newSignalLevel;
                 if (mIsWifiConnected) {