BpfNetMaps: check if map is null to prevent crash on BPF-less devices
Change-Id: I46a949a80e7de0c2d75743445289a778a881a27e
Signed-off-by: Dmitrii <bankersenator@gmail.com>
Signed-off-by: Jis G Jacob <studiokeys@blissroms.org>
diff --git a/service/src/com/android/server/BpfNetMaps.java b/service/src/com/android/server/BpfNetMaps.java
index 029c1e2..fae518c 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -936,7 +936,9 @@
// deletion. netd and skDestroyListener could delete CookieTagMap entry concurrently.
// So using Set to count the number of entry in the map.
Set<K> keySet = new ArraySet<>();
- map.forEach((k, v) -> keySet.add(k));
+ if (map != null) {
+ map.forEach((k, v) -> keySet.add(k));
+ }
return keySet.size();
}