From a6d548250e3830c356776651c918d5bf46d4f998 Mon Sep 17 00:00:00 2001
From: Eugene Susla <eugenesusla@google.com>
Date: Mon, 23 Apr 2018 11:16:47 -0700
Subject: [PATCH] [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
---
 .../companiondevicemanager/DeviceDiscoveryService.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java
index a5f0f24363a5c..3255778f3f579 100644
--- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java
@@ -65,9 +65,7 @@ import android.widget.TextView;
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.CollectionUtils;
 import com.android.internal.util.Preconditions;
-import com.android.internal.util.function.pooled.PooledLambda;
 
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -236,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;
         }