commit 0bbe8b85183f9ad6fb7ca27509ca850529c65c26
author Xinyi Zhou <zxy@google.com> Wed Apr 06 17:45:48 2022 -0700
committer Xinyi Zhou <zxy@google.com> Wed Apr 06 20:49:01 2022 -0700
tree 870beee836de6cc7f4cc841e494a4ee30aeb9486
parent 3899e18c8d19771fb9c48397c54b9202ddb2a88c

Add null check for scancallback

fix: 228059372
Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I0bb99100d0c07d886762aec1c1567b4f94a6a63f

nearby/framework/java/android/nearby/NearbyManager.java

diff --git a/nearby/framework/java/android/nearby/NearbyManager.java b/nearby/framework/java/android/nearby/NearbyManager.java
index 8dee1f0..3dd08da 100644
--- a/nearby/framework/java/android/nearby/NearbyManager.java
+++ b/nearby/framework/java/android/nearby/NearbyManager.java
@@ -302,23 +302,33 @@
         @Override
         public void onDiscovered(NearbyDeviceParcelable nearbyDeviceParcelable)
                 throws RemoteException {
-            mExecutor.execute(() -> mScanCallback.onDiscovered(
-                    toClientNearbyDevice(nearbyDeviceParcelable, mScanType)));
+            mExecutor.execute(() -> {
+                if (mScanCallback != null) {
+                    mScanCallback.onDiscovered(
+                            toClientNearbyDevice(nearbyDeviceParcelable, mScanType));
+                }
+            });
         }
 
         @Override
         public void onUpdated(NearbyDeviceParcelable nearbyDeviceParcelable)
                 throws RemoteException {
-            mExecutor.execute(
-                    () -> mScanCallback.onUpdated(
-                            toClientNearbyDevice(nearbyDeviceParcelable, mScanType)));
+            mExecutor.execute(() -> {
+                if (mScanCallback != null) {
+                    mScanCallback.onUpdated(
+                            toClientNearbyDevice(nearbyDeviceParcelable, mScanType));
+                }
+            });
         }
 
         @Override
         public void onLost(NearbyDeviceParcelable nearbyDeviceParcelable) throws RemoteException {
-            mExecutor.execute(
-                    () -> mScanCallback.onLost(
-                            toClientNearbyDevice(nearbyDeviceParcelable, mScanType)));
+            mExecutor.execute(() -> {
+                if (mScanCallback != null) {
+                    mScanCallback.onLost(
+                            toClientNearbyDevice(nearbyDeviceParcelable, mScanType));
+                }
+            });
         }
     }