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

Commit 96fbbcae authored by Eugene Susla's avatar Eugene Susla Committed by android-build-merger
Browse files

Merge "[DO NOT MERGE] [Companion] Nullcheck if ListView is null" into pi-dev 

am: 8df7766b

Change-Id: Ia63928128a95f88872cfcee1dad5f87850cc66a4
parents 12215060 8df7766b

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

+3 −1
Original line number Diff line number Diff line
@@ -234,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;

        }