Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Companion] Nullcheck if ListView is null"

Browse Source
This commit is contained in:
Eugene Susla
2018-05-03 20:51:40 +00:00
committed by Android (Google) Code Review
parent bf3cc2db69 a6d548250e
commit 96a06904c8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java
View File

@@ -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;
}