Merge \\\"Perform a null-check in getMatchingConfig\\\" into mnc-dev am: e3c37daf73 am: e180938097

am: 96cc486099

Change-Id: Iae9d523d364079407f500d00f96db951c3d7f994

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 41926b079..fe78b4df1 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();