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

Commit c6651664 authored by Evan Chen's avatar Evan Chen Committed by Automerger Merge Worker
Browse files

Merge "Fix spinner not shows up" into tm-dev am: 2caa7236 am: a7dfb0b2 am:... 

Merge "Fix spinner not shows up" into tm-dev am: 2caa7236 am: a7dfb0b2 am: ed38c123 am: 363dec11

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



Change-Id: I6ec80c8a14a91c540ed4ecb6f5abbf7ef074979d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2100ebed 363dec11

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

+2 −2
Original line number Diff line number Diff line
@@ -150,8 +150,6 @@ public class CompanionDeviceDiscoveryService extends Service { 
        mBtAdapter = mBtManager.getAdapter();

        mBleScanner = mBtAdapter.getBluetoothLeScanner();

        mWifiManager = getSystemService(WifiManager.class);



        sScanResultsLiveData.setValue(Collections.emptyList());

    }



    @Override
@@ -175,6 +173,7 @@ public class CompanionDeviceDiscoveryService extends Service { 


    @Override

    public void onDestroy() {

        sScanResultsLiveData.setValue(Collections.emptyList());

        super.onDestroy();

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

    }
@@ -188,6 +187,7 @@ 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 =