Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6d54825 authored by Eugene Susla's avatar Eugene Susla
Browse files

[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
parent 225de56e

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java

+3 −3
Original line number Diff line number Diff line
@@ -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) {

            if (activity.mDeviceListView != null) {

                activity.mDeviceListView.removeFooterView(activity.mLoadingIndicator);

            }

            mActivity = null;

        }