Merge \"Perform a null-check in getMatchingConfig\" into mnc-dev

am: e3c37daf73

Change-Id: Ic33a155d3f19e39279a7d8b47ee63da217539c47

1 files changed, 3 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index d6e41a13d..76a1ca5b8 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();