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

Commit a6775236 authored by Evan Chen's avatar Evan Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix RecyclerView crash in device discovery list" into main

parents 3dc09e3e b6917b09

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

+2 −2
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ public class CompanionDeviceDiscoveryService extends Service { 
            // First: make change.

            mDevicesFound.add(device);

            // Then: notify observers.

            sScanResultsLiveData.setValue(mDevicesFound);

            sScanResultsLiveData.setValue(new ArrayList<>(mDevicesFound));

            // Stop discovery when there's one device found for singleDevice.

            if (mStopAfterFirstMatch) {

                stopDiscoveryAndFinish();
@@ -408,7 +408,7 @@ public class CompanionDeviceDiscoveryService extends Service { 
            // First: make change.

            mDevicesFound.remove(device);

            // Then: notify observers.

            sScanResultsLiveData.setValue(mDevicesFound);

            sScanResultsLiveData.setValue(new ArrayList<>(mDevicesFound));

        });

    }

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

+9 −1
Original line number Diff line number Diff line
@@ -100,8 +100,16 @@ class DeviceListAdapter extends RecyclerView.Adapter<DeviceListAdapter.ViewHolde 
    }



    void setDevices(List<DeviceFilterPair<?>> devices) {

        final int oldSize = mDevices == null ? 0 : mDevices.size();

        mDevices = devices;

        notifyItemRangeInserted(devices.size(), mDevices.size());

        final int newSize = mDevices.size();

        if (newSize > oldSize) {

            notifyItemRangeInserted(oldSize, newSize - oldSize);

        } else if (newSize < oldSize) {

            // Items were removed. simply refresh the whole list.

            notifyDataSetChanged();

        }

        // If newSize == oldSize, nothing has changed, so no notification is needed.

    }



    static class ViewHolder extends RecyclerView.ViewHolder {