commit ebb3339846e45ae1420cac013c44ec7ef9b8a13e
author Xinyi Zhou <zxy@google.com> Fri May 13 15:24:13 2022 -0700
committer Xinyi Zhou <zxy@google.com> Sat May 14 19:48:23 2022 +0000
tree 58a061655f1ecd261a27d16a451360e9232be6ad
parent 1fc5b2a6d7188a5528c10f536dbdc5de3d98b31f

Add null checker for ServiceDataMap

Test: -m
Fix: 232446720
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Ida38a15bde5fec85469fc5aaeb9151efde883e07

nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java

diff --git a/nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java b/nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java
index 4cb6d8d..e8aea79 100644
--- a/nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java
+++ b/nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java
@@ -74,13 +74,15 @@
                             builder.setName(record.getDeviceName());
                         }
                         Map<ParcelUuid, byte[]> serviceDataMap = record.getServiceData();
-                        byte[] fastPairData = serviceDataMap.get(FAST_PAIR_UUID);
-                        if (fastPairData != null) {
-                            builder.setData(serviceDataMap.get(FAST_PAIR_UUID));
-                        } else {
-                            byte [] presenceData = serviceDataMap.get(PRESENCE_UUID);
-                            if (presenceData != null) {
-                                builder.setData(serviceDataMap.get(PRESENCE_UUID));
+                        if (serviceDataMap != null) {
+                            byte[] fastPairData = serviceDataMap.get(FAST_PAIR_UUID);
+                            if (fastPairData != null) {
+                                builder.setData(serviceDataMap.get(FAST_PAIR_UUID));
+                            } else {
+                                byte[] presenceData = serviceDataMap.get(PRESENCE_UUID);
+                                if (presenceData != null) {
+                                    builder.setData(serviceDataMap.get(PRESENCE_UUID));
+                                }
                             }
                         }
                     }