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

Commit 08f47dae authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Clear liveData when startForRequest" into tm-dev am: 265b2c56 am: 342ae27d" into tm-d1-dev-plus-aosp
parents d7154541 709e6079

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 =