Merge "Clear liveData when startForRequest" into tm-dev

This commit is contained in:
TreeHugger Robot
2022-05-12 04:15:10 +00:00
committed by Android (Google) Code Review

View File

@@ -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 =