resolve merge conflicts of 6da17ca to nyc-dev am: 073c371dbc am: c405929e28

am: 690f824fae

Change-Id: I3330e71e2dc74829b7bd4fb949a0431783d1336b

1 files changed, 3 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 4e55061c7..6070ed73a 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -514,7 +514,9 @@ public class WifiConfigManager {
      * 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();