OSDN Git Service

fix ArrayIndexOutOfBoundsException while starting WifiScannerScan
authorNavtej Singh Mann <navtejsingh@google.com>
Thu, 11 Jun 2015 23:53:11 +0000 (16:53 -0700)
committerNavtej Singh Mann <navtejsingh@google.com>
Fri, 12 Jun 2015 00:04:15 +0000 (17:04 -0700)
bug: 21663831
Change-Id: I9aea30907aae00c98d8fb1dc1fff3f4935108fa4

core/java/com/android/internal/os/BatteryStatsImpl.java

index 087db78..07d1fc8 100644 (file)
@@ -4634,7 +4634,7 @@ public final class BatteryStatsImpl extends BatteryStats {
         @Override
         public void noteWifiBatchedScanStartedLocked(int csph, long elapsedRealtimeMs) {
             int bin = 0;
-            while (csph > 8 && bin < NUM_WIFI_BATCHED_SCAN_BINS) {
+            while (csph > 8 && bin < NUM_WIFI_BATCHED_SCAN_BINS-1) {
                 csph = csph >> 3;
                 bin++;
             }