From 4ab8ee5e3ecfdc107892396178efa9176a72438f Mon Sep 17 00:00:00 2001
From: Paul Stewart <pstew@google.com>
Date: Wed, 1 Jun 2016 07:32:46 -0700
Subject: Perform a null-check in getMatchingConfig

Ensure the scanResult parameter is non-null.

BUG: 29061312
Change-Id: I9b9d1c5d10b7a2776c3f5fed4b942fb7924bb5b3
---
 service/java/com/android/server/wifi/WifiConfigStore.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'service')

diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index 02ddd0005..dd47b0805 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -790,7 +790,9 @@ public class WifiConfigStore extends IpConfigStore {
      * Find matching network for this scanResult
      */
     WifiConfiguration getMatchingConfig(ScanResult scanResult) {
-
+        if (scanResult == null) {
+            return null;
+        }
         for (Map.Entry entry : mScanDetailCaches.entrySet()) {
             Integer netId = (Integer) entry.getKey();
             ScanDetailCache cache = (ScanDetailCache) entry.getValue();
-- 
cgit v1.2.3