Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix spinner not shows up" into tm-dev

Browse Source
This commit is contained in:
Evan Chen
2022-05-04 19:43:48 +00:00
committed by Android (Google) Code Review
parent 5f8a0114b1 b567ff7c40
commit 2caa7236e5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java
View File

@@ -150,8 +150,6 @@ public class CompanionDeviceDiscoveryService extends Service {
mBtAdapter = mBtManager.getAdapter(); mBtAdapter = mBtManager.getAdapter();
mBleScanner = mBtAdapter.getBluetoothLeScanner(); mBleScanner = mBtAdapter.getBluetoothLeScanner();
mWifiManager = getSystemService(WifiManager.class); mWifiManager = getSystemService(WifiManager.class);
sScanResultsLiveData.setValue(Collections.emptyList());
} }
@Override @Override
@@ -175,6 +173,7 @@ public class CompanionDeviceDiscoveryService extends Service {
@Override @Override
public void onDestroy() { public void onDestroy() {
sScanResultsLiveData.setValue(Collections.emptyList());
super.onDestroy(); super.onDestroy();
if (DEBUG) Log.d(TAG, "onDestroy()"); if (DEBUG) Log.d(TAG, "onDestroy()");
} }
@@ -188,6 +187,7 @@ public class CompanionDeviceDiscoveryService extends Service {
mStopAfterFirstMatch = request.isSingleDevice(); mStopAfterFirstMatch = request.isSingleDevice();
mDiscoveryStarted = true; mDiscoveryStarted = true;
sStateLiveData.setValue(DiscoveryState.DISCOVERY_IN_PROGRESS); sStateLiveData.setValue(DiscoveryState.DISCOVERY_IN_PROGRESS);
sScanResultsLiveData.setValue(Collections.emptyList());
final List<DeviceFilter<?>> allFilters = request.getDeviceFilters(); final List<DeviceFilter<?>> allFilters = request.getDeviceFilters();
final List<BluetoothDeviceFilter> btFilters = final List<BluetoothDeviceFilter> btFilters =