[DO NOT MERGE] [Companion] Nullcheck if ListView is null

It's possible for it to be null if single device option was requested

Test: ensure attached bug is fixed
Fixes: 77963546
Change-Id: I4b94f4027cd9ec55a4cd558cf1d5522bfd0e46d7
(cherry picked from commit a6d548250e3830c356776651c918d5bf46d4f998)

1 files changed, 3 insertions, 1 deletions

diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java
index 1ca3c1dbe5be..cdaabdcda20f 100644
--- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java
@@ -234,7 +234,9 @@ public class DeviceDiscoveryService extends Service {
 
         DeviceChooserActivity activity = mActivity;
         if (activity != null) {
-            activity.mDeviceListView.removeFooterView(activity.mLoadingIndicator);
+            if (activity.mDeviceListView != null) {
+                activity.mDeviceListView.removeFooterView(activity.mLoadingIndicator);
+            }
             mActivity = null;
         }