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

Commit 2303c1a6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clear liveData when startForRequest" into tm-dev am: 265b2c56 am:... 

Merge "Clear liveData when startForRequest" into tm-dev am: 265b2c56 am: 342ae27d am: 21e1b72a

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



Change-Id: Ifc973b7b63826f9329c46a12df928af85a04f3dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 094ffc82 21e1b72a

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

+1 −2
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ public class CompanionDeviceDiscoveryService extends Service { 
        intent.setAction(ACTION_START_DISCOVERY);

        intent.putExtra(EXTRA_ASSOCIATION_REQUEST, associationRequest);

        sStateLiveData.setValue(DiscoveryState.STARTING);

        sScanResultsLiveData.setValue(Collections.emptyList());



        context.startService(intent);

    }
@@ -173,7 +174,6 @@ public class CompanionDeviceDiscoveryService extends Service { 


    @Override

    public void onDestroy() {

        sScanResultsLiveData.setValue(Collections.emptyList());

        super.onDestroy();

        if (DEBUG) Log.d(TAG, "onDestroy()");

    }
@@ -187,7 +187,6 @@ public class CompanionDeviceDiscoveryService extends Service { 
        mStopAfterFirstMatch = request.isSingleDevice();

        mDiscoveryStarted = true;

        sStateLiveData.setValue(DiscoveryState.DISCOVERY_IN_PROGRESS);

        sScanResultsLiveData.setValue(Collections.emptyList());



        final List<DeviceFilter<?>> allFilters = request.getDeviceFilters();

        final List<BluetoothDeviceFilter> btFilters =