commit 2edd18881cfa2ca3e08e50ce50f80150ee1178cf
author Xinyi Zhou <zxy@google.com> Thu Jul 21 04:38:08 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 21 04:38:08 2022 +0000
tree 79ed068061dfed9a3cd7629dd58c5dbc1f3fa6b2
parent 629b81bd4fc21966c81e6024ec86a56f4fe202a2
parent 4750eebbc89d21d3bd56fa06b35d00f5718a9dc7

Merge "Null check for advertisement in scanner"

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 a5aa1aa..9ca4778 100644
--- a/nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java
+++ b/nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java
@@ -87,7 +87,12 @@
                                     byte[] data = serviceDataMap.get(PRESENCE_UUID);
                                     ExtendedAdvertisement advertisement =
                                             ExtendedAdvertisement.fromBytes(data);
-                                    builder.setPresenceDevice(getPresenceDevice(advertisement));
+                                    if (advertisement == null) {
+                                        Log.w(TAG, "Failed to parse PresenceDevice from "
+                                                + "advertisement.");
+                                    } else {
+                                        builder.setPresenceDevice(getPresenceDevice(advertisement));
+                                    }
                                 }
                             }
                         }