Fix crash when scanner gets results that don't match the request

Before this, when WifiScanningService processed single scan results from
supplicant that only contained results that did not match a request the
filter code would return null indicating that the results should not be
delivered, causing a NPE later. This change updates the meaning of the
bucket index that the single scan code provides to the filtering code to
instead force it to always include scan results.

Change-Id: I65cd57b14abacec3f407991188c570601d05ac77
Fixes: 28794598

1 files changed, 7 insertions, 3 deletions

diff --git a/service/java/com/android/server/wifi/scanner/ScanScheduleUtil.java b/service/java/com/android/server/wifi/scanner/ScanScheduleUtil.java
index 01418b91c..9267aa0f5 100644
--- a/service/java/com/android/server/wifi/scanner/ScanScheduleUtil.java
+++ b/service/java/com/android/server/wifi/scanner/ScanScheduleUtil.java
@@ -94,7 +94,8 @@ public class ScanScheduleUtil {
      * Check if the specified bucket was scanned. If not all information is available then this
      * method will return true.
      *
-     * @param scheduledBucket Index of the bucket to check for, zero indexed, or -1 if unavailable
+     * @param scheduledBucket Index of the bucket to check for, zero indexed, or -1 if any scan
+     *                        should be treated as scanning this bucket.
      * @param bucketsScannedBitSet The bitset of all buckets scanned, 0 if unavailable
      */
     private static boolean isBucketMaybeScanned(int scheduledBucket, int bucketsScannedBitSet) {
@@ -109,11 +110,14 @@ public class ScanScheduleUtil {
      * Check if the specified bucket was scanned. If not all information is available then this
      * method will return false.
      *
-     * @param scheduledBucket Index of the bucket to check for, zero indexed, or -1 if unavailable
+     * @param scheduledBucket Index of the bucket to check for, zero indexed, or -1 if any scan
+     *                        should be treated as scanning this bucket.
      * @param bucketsScannedBitSet The bitset of all buckets scanned, 0 if unavailable
      */
     private static boolean isBucketDefinitlyScanned(int scheduledBucket, int bucketsScannedBitSet) {
-        if (bucketsScannedBitSet == 0 || scheduledBucket < 0) {
+        if (scheduledBucket < 0) {
+            return true;
+        } else if (bucketsScannedBitSet == 0) {
             return false;
         } else {
             return (bucketsScannedBitSet & (1 << scheduledBucket)) != 0;