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

Commit ca4efef0 authored by Guojing Yuan's avatar Guojing Yuan Committed by Automerger Merge Worker
Browse files

Merge "[CDM] Expose logs for devices found while discovering" into tm-qpr-dev... 

Merge "[CDM] Expose logs for devices found while discovering" into tm-qpr-dev am: 53d8e1ec am: ce26e959

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20190526



Change-Id: I011d8d6b8b46d07f3d2a5dc408c2133a484c7170
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ba17891 ce26e959

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

+3 −3
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ public class CompanionDeviceDiscoveryService extends Service { 
                }

                return;

            }

            if (DEBUG) Log.i(TAG, "onDeviceFound() " + device.toShortString() + " - New device.");

            Log.i(TAG, "onDeviceFound() " + device.toShortString() + " - New device.");



            // First: make change.

            mDevicesFound.add(device);
@@ -365,9 +365,9 @@ public class CompanionDeviceDiscoveryService extends Service { 
        });

    }



    private void onDeviceLost(@Nullable DeviceFilterPair<?> device) {

    private void onDeviceLost(@NonNull DeviceFilterPair<?> device) {

        runOnMainThread(() -> {

            if (DEBUG) Log.i(TAG, "onDeviceLost(), device=" + device.toShortString());

            Log.i(TAG, "onDeviceLost(), device=" + device.toShortString());



            // First: make change.

            mDevicesFound.remove(device);