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

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

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

Change-Id: Ie4726b5810d34baadbb6911ca66475f365c6d294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-12 05:09:15 +00:00
committed by Automerger Merge Worker
parent 3057d5fbd7 265b2c56ac
commit 342ae27d53
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,6 +123,7 @@ public class CompanionDeviceDiscoveryService extends Service {
intent.setAction(ACTION_START_DISCOVERY); intent.setAction(ACTION_START_DISCOVERY);
intent.putExtra(EXTRA_ASSOCIATION_REQUEST, associationRequest); intent.putExtra(EXTRA_ASSOCIATION_REQUEST, associationRequest);
sStateLiveData.setValue(DiscoveryState.STARTING); sStateLiveData.setValue(DiscoveryState.STARTING);
sScanResultsLiveData.setValue(Collections.emptyList());
context.startService(intent); context.startService(intent);
} }
@@ -173,7 +174,6 @@ 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()");
} }
@@ -187,7 +187,6 @@ 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 =